diff options
Diffstat (limited to 'board-qemu')
| -rw-r--r-- | board-qemu/config | 2 | ||||
| -rw-r--r-- | board-qemu/include/southbridge.h | 1 | ||||
| -rw-r--r-- | board-qemu/llfw/Makefile | 2 | ||||
| -rw-r--r-- | board-qemu/slof/Makefile | 1 | ||||
| -rw-r--r-- | board-qemu/slof/qemu-bootlist.fs | 14 | ||||
| -rw-r--r-- | board-qemu/slof/rtas-nvram.fs | 48 | ||||
| -rw-r--r-- | board-qemu/slof/tree.fs | 3 |
7 files changed, 63 insertions, 8 deletions
diff --git a/board-qemu/config b/board-qemu/config index 63976a0..a381f19 100644 --- a/board-qemu/config +++ b/board-qemu/config @@ -1,6 +1,6 @@ BOARD=qemu TARG=ppc64 -export FLAG="-DDISABLE_NVRAM" +export FLAG=-DRTAS_NVRAM export CPUARCH=ppcp7 export CPUARCHDEF=-DCPU_PPCP7 #export SNK_BIOSEMU_APPS=1 diff --git a/board-qemu/include/southbridge.h b/board-qemu/include/southbridge.h index 3ca4e04..1cdb422 100644 --- a/board-qemu/include/southbridge.h +++ b/board-qemu/include/southbridge.h @@ -13,7 +13,6 @@ /* Not used */ #define SB_NVRAM_adr 0 #define SB_FLASH_adr 0 -#define NVRAM_LENGTH 0x10000 #define FLASH_LENGTH 0 #define SB_MAILBOX_adr 0 diff --git a/board-qemu/llfw/Makefile b/board-qemu/llfw/Makefile index e40472c..89f17f8 100644 --- a/board-qemu/llfw/Makefile +++ b/board-qemu/llfw/Makefile @@ -14,7 +14,7 @@ include ../../make.rules CPPFLAGS = -I$(INCLBRDDIR) -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH) \ -I$(LIBCMNDIR)/libc/include -CFLAGS += -fno-builtin $(CPPFLAGS) -O2 -msoft-float $(MAMBO) +CFLAGS += -fno-builtin $(FLAG) $(CPPFLAGS) -O2 -msoft-float $(MAMBO) CFLAGS += $(BOOT) $(IOCONF) -Wa,-mregnames $(RELEASE) $(CPUARCHDEF) -Wall ASFLAGS = $(BOOT) $(IOCONF) $(RELEASE)$(CPUARCHDEF) -Wa,-mregnames LDFLAGS1 = -nostdlib -e__start -Tstage2.lds -N -Ttext=0x100 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 |