summaryrefslogtreecommitdiff
path: root/src/mainboard/intel
diff options
context:
space:
mode:
authorEd Swierk <eswierk@arastra.com>2006-12-15 12:56:28 +0000
committerStefan Reinauer <stepan@openbios.org>2006-12-15 12:56:28 +0000
commitbe13dc72d91bd3c5791fb2a3a18ee610860404ee (patch)
tree97e8702383a84bfb0cd22f337d70885ebe7713dc /src/mainboard/intel
parent8bb1dc5c776699d2037923c6594e2e998c7bec09 (diff)
downloadcoreboot-be13dc72d91bd3c5791fb2a3a18ee610860404ee.tar.xz
Apply linuxbios-rename-other-payload-options.patch
(Patch 2, refs #14) Signed-off-by: Ed Swierk <eswierk@arastra.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2529 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/intel')
-rw-r--r--src/mainboard/intel/jarrell/Config.lb4
-rw-r--r--src/mainboard/intel/jarrell/Options.lb6
-rw-r--r--src/mainboard/intel/xe7501devkit/Config.lb2
-rw-r--r--src/mainboard/intel/xe7501devkit/Options.lb6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/intel/jarrell/Config.lb b/src/mainboard/intel/jarrell/Config.lb
index 69795b0026..5cea22a5c7 100644
--- a/src/mainboard/intel/jarrell/Config.lb
+++ b/src/mainboard/intel/jarrell/Config.lb
@@ -20,12 +20,12 @@ end
## 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/intel/jarrell/Options.lb b/src/mainboard/intel/jarrell/Options.lb
index 507d51dd59..3d099f41a4 100644
--- a/src/mainboard/intel/jarrell/Options.lb
+++ b/src/mainboard/intel/jarrell/Options.lb
@@ -15,8 +15,8 @@ uses ROM_SECTION_SIZE
uses ROM_IMAGE_SIZE
uses ROM_SECTION_SIZE
uses ROM_SECTION_OFFSET
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD
+uses CONFIG_ROM_PAYLOAD_START
uses CONFIG_COMPRESSED_PAYLOAD_LZMA
uses PAYLOAD_SIZE
uses _ROMBASE
@@ -169,7 +169,7 @@ default _RAMBASE=0x00004000
##
## Load the payload from the ROM
##
-default CONFIG_ROM_STREAM=1
+default CONFIG_ROM_PAYLOAD=1
###
diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb
index 2e1986369e..fda810ff26 100644
--- a/src/mainboard/intel/xe7501devkit/Config.lb
+++ b/src/mainboard/intel/xe7501devkit/Config.lb
@@ -21,7 +21,7 @@ end
##
## 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/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb
index 3f100841b3..2fac701b8f 100644
--- a/src/mainboard/intel/xe7501devkit/Options.lb
+++ b/src/mainboard/intel/xe7501devkit/Options.lb
@@ -9,7 +9,7 @@ uses CONFIG_LOGICAL_CPUS
uses CONFIG_MAX_PHYSICAL_CPUS
uses CONFIG_IOAPIC
uses CONFIG_SMP
-uses CONFIG_ROM_STREAM
+uses CONFIG_ROM_PAYLOAD
uses CONFIG_COMPRESSED_PAYLOAD_LZMA
uses STACK_SIZE
uses HEAP_SIZE
@@ -46,7 +46,7 @@ uses DEBUG
uses CONFIG_IDE
## The default definitions are used for these
-uses CONFIG_ROM_STREAM_START
+uses CONFIG_ROM_PAYLOAD_START
uses PAYLOAD_SIZE
## These are defined in target Config.lb, don't add here
@@ -168,7 +168,7 @@ default _RAMBASE=0x00004000
##
## Load the payload from the ROM
##
-default CONFIG_ROM_STREAM = 1
+default CONFIG_ROM_PAYLOAD = 1
###
### Defaults of options that you may want to override in the target config file