Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Partially fix up the OpenBIOS PPC build. While the code technically works, even with this fix in place the PPC console output

Browse Source 
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 <mark.cave-ayland@siriusit.co.uk>


git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@734 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Mark Cave-Ayland
2010-04-05 18:41:11 +00:00
committed by Mark Cave-Ayland
parent a757d43d04
commit f21a9ceb00
6 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/ppc/qemu/init.c
View File

@@ -472,6 +472,7 @@ go( void )
{ {
ucell addr; ucell addr;
feval("saved-program-state >sps.entry @");
addr = POP(); addr = POP();
call_elf( 0, 0, addr); call_elf( 0, 0, addr);

2
arch/ppc/qemu/ofmem.c
View File

@@ -162,8 +162,6 @@ realloc( void *ptr, size_t size )
/* misc */ /* misc */
/************************************************************************/ /************************************************************************/
extern char _start[], _end[];
ucell ofmem_arch_default_translation_mode( ucell phys ) ucell ofmem_arch_default_translation_mode( ucell phys )
{ {
/* XXX: Guard bit not set as it should! */ /* XXX: Guard bit not set as it should! */

2
config/examples/cross-ppc_config.xml
View File

@@ -42,7 +42,7 @@
<option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/>
<option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/>
<option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/>
<option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/>
<option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/>
<option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/>
<option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/> <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/>

2
config/examples/ppc_config.xml
View File

@@ -42,7 +42,7 @@
<option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/>
<option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/>
<option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/>
<option name="CONFIG_LOADER_ELF" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/>
<option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/>
<option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/>
<option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/> <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/>

1
include/arch/ppc/io.h
View File

@@ -6,6 +6,7 @@
#define NO_QEMU_PROTOS #define NO_QEMU_PROTOS
#include "arch/common/fw_cfg.h" #include "arch/common/fw_cfg.h"
extern char _start, _end;
extern unsigned long virt_offset; extern unsigned long virt_offset;
#define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset))

4
include/arch/ppc/types.h
View File

@@ -40,6 +40,10 @@ typedef uint64_t ducell;
#define FMT_ucellx "%08x" #define FMT_ucellx "%08x"
#define FMT_ucellX "%08X" #define FMT_ucellX "%08X"
#define FMT_elf "%#x"
#define FMT_sizet "%lx"
#define FMT_aout_ehdr "%lx"
#define bitspercell (sizeof(cell)<<3) #define bitspercell (sizeof(cell)<<3)
#define bitsperdcell (sizeof(dcell)<<3) #define bitsperdcell (sizeof(dcell)<<3)