Author: mcayland Date: Fri Jun 28 23:08:08 2013 New Revision: 1165 URL: http://tracker.coreboot.org/trac/openbios/changeset/1165
Log: PPC: Fix quik bootloader on New World Macs
Currently quik assumes a fixed load-base of 0x3f4000, and only worked on Old World Macs because of a special exception in bootcode_load.c. Since quik seems to be the only user of %BOOT known to date, widen the check to all Apple machines as per conversation with Alex. PReP machines will continue to use the standard value of load-base as normal.
Signed-off-by: Mark Cave-Ayland mark.cave-ayland@ilande.co.uk
Modified: trunk/openbios-devel/libopenbios/bootcode_load.c
Modified: trunk/openbios-devel/libopenbios/bootcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/bootcode_load.c Wed Jun 26 04:04:35 2013 (r1164) +++ trunk/openbios-devel/libopenbios/bootcode_load.c Fri Jun 28 23:08:08 2013 (r1165) @@ -33,8 +33,12 @@ loadbase = POP();
#ifdef CONFIG_PPC - /* However Old World Macs need to load to a different address */ - if (is_oldworld()) { + /* ...except that QUIK (the only known user of %BOOT to date) is built + with a hard-coded address of 0x3f4000. Let's just use this for the + moment on both New World and Old World Macs, allowing QUIK to also + work under a New World Mac. If we find another user of %BOOT we can + rethink this later. PReP machines should be left unaffected. */ + if (is_apple()) { loadbase = OLDWORLD_BOOTCODE_BASEADDR; } #endif