From be13dc72d91bd3c5791fb2a3a18ee610860404ee Mon Sep 17 00:00:00 2001 From: Ed Swierk Date: Fri, 15 Dec 2006 12:56:28 +0000 Subject: Apply linuxbios-rename-other-payload-options.patch (Patch 2, refs #14) Signed-off-by: Ed Swierk Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2529 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/emulation/qemu-i386/Config.lb | 4 ++-- src/mainboard/emulation/qemu-i386/Options.lb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mainboard/emulation') diff --git a/src/mainboard/emulation/qemu-i386/Config.lb b/src/mainboard/emulation/qemu-i386/Config.lb index bddc6e3c59..ff8fb705ab 100644 --- a/src/mainboard/emulation/qemu-i386/Config.lb +++ b/src/mainboard/emulation/qemu-i386/Config.lb @@ -11,12 +11,12 @@ default ROM_SECTION_OFFSET = 0 ## The linuxBIOS bootloader. ## default PAYLOAD_SIZE = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE ) -default CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) +default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) ## ## Compute where this copy of linuxBIOS will start in the boot rom ## -default _ROMBASE = ( CONFIG_ROM_STREAM_START + PAYLOAD_SIZE ) +default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE ) ## ## Compute a range of ROM that can cached to speed up linuxBIOS, diff --git a/src/mainboard/emulation/qemu-i386/Options.lb b/src/mainboard/emulation/qemu-i386/Options.lb index 3047b22e6d..62a8ddd8d2 100644 --- a/src/mainboard/emulation/qemu-i386/Options.lb +++ b/src/mainboard/emulation/qemu-i386/Options.lb @@ -9,7 +9,7 @@ uses CONFIG_COMPRESS uses CONFIG_COMPRESSED_PAYLOAD_NRV2B uses CONFIG_COMPRESSED_PAYLOAD_LZMA uses CONFIG_PRECOMPRESSED_PAYLOAD -uses CONFIG_ROM_STREAM +uses CONFIG_ROM_PAYLOAD uses IRQ_SLOT_COUNT uses MAINBOARD uses MAINBOARD_VENDOR @@ -24,7 +24,7 @@ uses ROM_SECTION_SIZE uses ROM_IMAGE_SIZE uses ROM_SECTION_SIZE uses ROM_SECTION_OFFSET -uses CONFIG_ROM_STREAM_START +uses CONFIG_ROM_PAYLOAD_START uses PAYLOAD_SIZE uses _ROMBASE uses _RAMBASE @@ -105,7 +105,7 @@ default USE_OPTION_TABLE = 0 default _RAMBASE = 0x00004000 -default CONFIG_ROM_STREAM = 1 +default CONFIG_ROM_PAYLOAD = 1 ## ## The default compiler -- cgit v1.2.3