This patch unifies the use of config options in v2 to all start with CONFIG_
It's basically done with the following script and some manual fixup: VARS=`grep ^define src/config/Options.lb | cut -f2 -d\ | grep -v ^CONFIG | grep -v ^COREBOOT |grep -v ^CC` for VAR in $VARS; do find . -name .svn -prune -o -type f -exec perl -pi -e "s/(^|[^0-9a-zA-Z_]+)$VAR($|[^0-9a-zA-Z_]+)/\1CONFIG_$VAR\2/g" {} \; done Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4381 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
committed by
Stefan Reinauer
parent
9702b6bf7e
commit
0867062412
@@ -4,11 +4,11 @@
|
||||
target frontrunner
|
||||
mainboard lippert/frontrunner
|
||||
|
||||
option ROM_SIZE=256*1024
|
||||
option CONFIG_ROM_SIZE=256*1024
|
||||
|
||||
romimage "normal"
|
||||
option USE_FALLBACK_IMAGE=0
|
||||
option ROM_IMAGE_SIZE=0x16000
|
||||
option CONFIG_USE_FALLBACK_IMAGE=0
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x16000
|
||||
option COREBOOT_EXTRA_VERSION=".0Normal"
|
||||
# payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
|
||||
# payload ../../../../tg3--ide_disk.zelf
|
||||
@@ -19,8 +19,8 @@ romimage "normal"
|
||||
end
|
||||
|
||||
romimage "fallback"
|
||||
option USE_FALLBACK_IMAGE=1
|
||||
option ROM_IMAGE_SIZE=0x16000
|
||||
option CONFIG_USE_FALLBACK_IMAGE=1
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x16000
|
||||
option COREBOOT_EXTRA_VERSION=".0Fallback"
|
||||
# payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
|
||||
# payload ../../../../tg3--ide_disk.zelf
|
||||
@@ -30,4 +30,4 @@ romimage "fallback"
|
||||
payload /tmp/filo.elf
|
||||
end
|
||||
|
||||
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
|
||||
|
@@ -35,28 +35,28 @@ option CONFIG_COMPRESSED_PAYLOAD_LZMA = 0
|
||||
#option CONFIG_IDE = 1
|
||||
#option CONFIG_FS_PAYLOAD = 1
|
||||
#option CONFIG_FS_EXT2 = 1
|
||||
#option AUTOBOOT_DELAY = 0
|
||||
#option AUTOBOOT_CMDLINE = "hda1:/payload.elf"
|
||||
#option CONFIG_AUTOBOOT_DELAY = 0
|
||||
#option CONFIG_AUTOBOOT_CMDLINE = "hda1:/payload.elf"
|
||||
|
||||
# Leave 36k for VSA. Usually board is equipped with a 512 KB FWH (LPC) flash,
|
||||
# however it can be replaced with a 1 MB chip.
|
||||
option ROM_SIZE = (512 * 1024) - (36 * 1024)
|
||||
#option ROM_SIZE = (1024 * 1024) - (36 * 1024)
|
||||
option FALLBACK_SIZE = ROM_SIZE
|
||||
option CONFIG_ROM_SIZE = (512 * 1024) - (36 * 1024)
|
||||
#option CONFIG_ROM_SIZE = (1024 * 1024) - (36 * 1024)
|
||||
option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
|
||||
|
||||
#option DEFAULT_CONSOLE_LOGLEVEL = 4
|
||||
#option MAXIMUM_CONSOLE_LOGLEVEL = 4
|
||||
#option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 4
|
||||
#option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 4
|
||||
|
||||
# Saves space on ROM_IMAGE_SIZE, but decompression costs a second on boot.
|
||||
# Saves space on CONFIG_ROM_IMAGE_SIZE, but decompression costs a second on boot.
|
||||
option CONFIG_COMPRESS = 1
|
||||
|
||||
romimage "image"
|
||||
option USE_FALLBACK_IMAGE = 1
|
||||
option ROM_IMAGE_SIZE = 64 * 1024
|
||||
option CONFIG_USE_FALLBACK_IMAGE = 1
|
||||
option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
|
||||
option COREBOOT_EXTRA_VERSION = ".0"
|
||||
payload ../payload.elf
|
||||
# If getting payload from IDE
|
||||
# payload /dev/null
|
||||
end
|
||||
|
||||
buildrom ./coreboot.rom ROM_SIZE "image"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
|
||||
|
@@ -36,27 +36,27 @@ option CONFIG_COMPRESSED_PAYLOAD_LZMA = 0
|
||||
#option CONFIG_IDE = 1
|
||||
#option CONFIG_FS_PAYLOAD = 1
|
||||
#option CONFIG_FS_EXT2 = 1
|
||||
#option AUTOBOOT_DELAY = 0
|
||||
#option AUTOBOOT_CMDLINE = "hda1:/payload.elf"
|
||||
#option CONFIG_AUTOBOOT_DELAY = 0
|
||||
#option CONFIG_AUTOBOOT_CMDLINE = "hda1:/payload.elf"
|
||||
|
||||
# Leave 36k for VSA. Board is equipped with a 1 MB SPI flash, however, due to
|
||||
# limitations of the IT8712F Super I/O, only the top 512 KB are directly mapped.
|
||||
option ROM_SIZE = (512 * 1024) - (36 * 1024)
|
||||
option FALLBACK_SIZE = ROM_SIZE
|
||||
option CONFIG_ROM_SIZE = (512 * 1024) - (36 * 1024)
|
||||
option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
|
||||
|
||||
#option DEFAULT_CONSOLE_LOGLEVEL = 4
|
||||
#option MAXIMUM_CONSOLE_LOGLEVEL = 4
|
||||
#option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 4
|
||||
#option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 4
|
||||
|
||||
# Saves space on ROM_IMAGE_SIZE, but decompression costs a second on boot.
|
||||
# Saves space on CONFIG_ROM_IMAGE_SIZE, but decompression costs a second on boot.
|
||||
option CONFIG_COMPRESS = 1
|
||||
|
||||
romimage "image"
|
||||
option USE_FALLBACK_IMAGE = 1
|
||||
option ROM_IMAGE_SIZE = 64 * 1024
|
||||
option CONFIG_USE_FALLBACK_IMAGE = 1
|
||||
option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
|
||||
option COREBOOT_EXTRA_VERSION = ".0"
|
||||
payload ../payload.elf
|
||||
# If getting payload from IDE
|
||||
# payload /dev/null
|
||||
end
|
||||
|
||||
buildrom ./coreboot.rom ROM_SIZE "image"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "image"
|
||||
|
Reference in New Issue
Block a user