From f21a9ceb00cbd4b0c65bb4643d85fe746aa17a5e Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Mon, 5 Apr 2010 18:41:11 +0000 Subject: [PATCH] Partially fix up the OpenBIOS PPC build. While the code technically works, even with this fix in place the PPC console output disappears when booting a FC12 test ISO directly. Interestingly enough, if the equivalent "load" and "go" commands are entered manually then the console output works fine and the ISO can boot?! So there is still an issue with the console not being initialised correctly somewhere. Signed-off-by: Mark Cave-Ayland git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@734 f158a5a8-5612-0410-a976-696ce0be7e32 --- arch/ppc/qemu/init.c | 1 + arch/ppc/qemu/ofmem.c | 2 -- config/examples/cross-ppc_config.xml | 2 +- config/examples/ppc_config.xml | 2 +- include/arch/ppc/io.h | 1 + include/arch/ppc/types.h | 4 ++++ 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index fa7c59e..c4d1106 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -472,6 +472,7 @@ go( void ) { ucell addr; + feval("saved-program-state >sps.entry @"); addr = POP(); call_elf( 0, 0, addr); diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index 93c432f..d4d5519 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -162,8 +162,6 @@ realloc( void *ptr, size_t size ) /* misc */ /************************************************************************/ -extern char _start[], _end[]; - ucell ofmem_arch_default_translation_mode( ucell phys ) { /* XXX: Guard bit not set as it should! */ diff --git a/config/examples/cross-ppc_config.xml b/config/examples/cross-ppc_config.xml index 1df7305..d5e63db 100644 --- a/config/examples/cross-ppc_config.xml +++ b/config/examples/cross-ppc_config.xml @@ -42,7 +42,7 @@