aboutsummaryrefslogtreecommitdiff
path: root/board-qemu/slof
diff options
context:
space:
mode:
Diffstat (limited to 'board-qemu/slof')
-rw-r--r--board-qemu/slof/Makefile1
-rw-r--r--board-qemu/slof/qemu-bootlist.fs14
-rw-r--r--board-qemu/slof/rtas-nvram.fs48
-rw-r--r--board-qemu/slof/tree.fs3
4 files changed, 61 insertions, 5 deletions
diff --git a/board-qemu/slof/Makefile b/board-qemu/slof/Makefile
index 07d4916..036ad61 100644
--- a/board-qemu/slof/Makefile
+++ b/board-qemu/slof/Makefile
@@ -63,6 +63,7 @@ VIO_FFS_FILES = \
$(SLOFBRDDIR)/vio-vscsi.fs \
$(SLOFBRDDIR)/vio-vscsi-device.fs \
$(SLOFBRDDIR)/vio-veth.fs \
+ $(SLOFBRDDIR)/rtas-nvram.fs \
$(SLOFBRDDIR)/virtio-net.fs \
$(SLOFBRDDIR)/virtio-block.fs \
$(SLOFBRDDIR)/virtio-fs.fs
diff --git a/board-qemu/slof/qemu-bootlist.fs b/board-qemu/slof/qemu-bootlist.fs
index 6b52b97..0a1aaf3 100644
--- a/board-qemu/slof/qemu-bootlist.fs
+++ b/board-qemu/slof/qemu-bootlist.fs
@@ -16,11 +16,15 @@ defer add-boot-device
: qemu-read-bootlist ( -- )
0 0 set-boot-device
- \ check nvram
- " boot-device" evaluate swap drop 0 <> IF EXIT THEN
-
- \ check qemu boot list
- " qemu,boot-device" get-chosen not IF EXIT THEN
+ " qemu,boot-device" get-chosen not IF
+ \ No boot list set from qemu, so check nvram
+ " boot-device" evaluate swap drop 0= IF
+ \ Not set in nvram too, set default disk/cdrom alias
+ " disk" add-boot-device
+ " cdrom" add-boot-device
+ THEN
+ EXIT
+ THEN
0 ?DO
dup i + c@ CASE
diff --git a/board-qemu/slof/rtas-nvram.fs b/board-qemu/slof/rtas-nvram.fs
new file mode 100644
index 0000000..fdebfb2
--- /dev/null
+++ b/board-qemu/slof/rtas-nvram.fs
@@ -0,0 +1,48 @@
+\ *****************************************************************************
+\ * Copyright (c) 2012 IBM Corporation
+\ * All rights reserved.
+\ * This program and the accompanying materials
+\ * are made available under the terms of the BSD License
+\ * which accompanies this distribution, and is available at
+\ * http://www.opensource.org/licenses/bsd-license.php
+\ *
+\ * Contributors:
+\ * IBM Corporation - initial implementation
+\ ****************************************************************************/
+
+." Populating " pwd cr
+
+0 VALUE my-nvram-fetch
+0 VALUE my-nvram-store
+0 VALUE my-nvram-size
+0 VALUE nvram-addr
+
+: open true ;
+: close ;
+
+: write ( adr len -- actual )
+ nip
+;
+
+: read ( adr len -- actual )
+ nip
+;
+
+: setup-alias
+ " nvram" find-alias 0= IF
+ " nvram" get-node node>path set-alias
+ ELSE
+ drop
+ THEN
+;
+
+" #bytes" get-node get-package-property 0= IF
+ decode-int to my-nvram-size 2drop
+ " nvram-fetch" rtas-get-token to my-nvram-fetch
+ " nvram-store" rtas-get-token to my-nvram-store
+ my-nvram-size to nvram-size
+ nvram-size alloc-mem to nvram-addr
+ my-nvram-fetch my-nvram-store nvram-size nvram-addr internal-nvram-init
+THEN
+
+setup-alias
diff --git a/board-qemu/slof/tree.fs b/board-qemu/slof/tree.fs
index 533fc95..d00f5af 100644
--- a/board-qemu/slof/tree.fs
+++ b/board-qemu/slof/tree.fs
@@ -80,6 +80,9 @@ include fbuffer.fs
2dup " IBM,l-lan" strequal IF
" vio-veth.fs" included
THEN
+ 2dup " qemu,spapr-nvram" strequal IF
+ " rtas-nvram.fs" included
+ THEN
2drop
THEN
peer