aboutsummaryrefslogtreecommitdiff
path: root/slof
diff options
context:
space:
mode:
authorNikunj A Dadhania <nikunj@linux.vnet.ibm.com>2013-10-04 16:34:18 +0530
committerNikunj A Dadhania <nikunj@linux.vnet.ibm.com>2013-10-04 16:41:30 +0530
commit887e3b2089c3898a9df280feed72a13bcd6b3eaf (patch)
tree1896be7c583b0982db334666e6e3046dadfa36fc /slof
parentb30e4a4f8aaaa6b9dd12bbab3ec908e0d3cc3851 (diff)
downloadSLOF-887e3b2089c3898a9df280feed72a13bcd6b3eaf.zip
SLOF-887e3b2089c3898a9df280feed72a13bcd6b3eaf.tar.gz
SLOF-887e3b2089c3898a9df280feed72a13bcd6b3eaf.tar.bz2
Kernel parameter passed from qemu commandline ignored
Commit ec5c9e8b (Use root.fs on qemu as well) would set the bootargs/bootpath to null string even in case when the /chosen node exist, the /chosen and boot property were populated during fdt parsing so do not change in case its already set. Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Diffstat (limited to 'slof')
-rw-r--r--slof/fs/root.fs8
1 files changed, 4 insertions, 4 deletions
diff --git a/slof/fs/root.fs b/slof/fs/root.fs
index dd871d1..8154763 100644
--- a/slof/fs/root.fs
+++ b/slof/fs/root.fs
@@ -47,12 +47,12 @@ THEN
drop
new-device
s" chosen" device-name
+ s" " encode-string s" bootargs" property
+ s" " encode-string s" bootpath" property
+ finish-device
ELSE
- extend-device
+ drop
THEN
-s" " encode-string s" bootargs" property
-s" " encode-string s" bootpath" property
-finish-device
\ Create /aliases
new-device