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
@@ -21,12 +21,12 @@
|
||||
target mb_5blgp
|
||||
mainboard asi/mb_5blgp
|
||||
|
||||
option ROM_SIZE = 256 * 1024
|
||||
option CONFIG_ROM_SIZE = 256 * 1024
|
||||
|
||||
option MAINBOARD_VENDOR = "ASI"
|
||||
option MAINBOARD_PART_NUMBER = "MB-5BLGP"
|
||||
option CONFIG_MAINBOARD_VENDOR = "ASI"
|
||||
option CONFIG_MAINBOARD_PART_NUMBER = "MB-5BLGP"
|
||||
|
||||
option IRQ_SLOT_COUNT = 3
|
||||
option CONFIG_IRQ_SLOT_COUNT = 3
|
||||
|
||||
## Enable VGA with a splash screen (only 640x480 to run on most monitors).
|
||||
## We want to support up to 1024x768@16 so we need 2MiB video memory.
|
||||
@@ -36,19 +36,19 @@ option CONFIG_GX1_VIDEOMODE = 0
|
||||
option CONFIG_SPLASH_GRAPHIC = 1
|
||||
option CONFIG_VIDEO_MB = 2
|
||||
|
||||
option DEFAULT_CONSOLE_LOGLEVEL = 9
|
||||
option MAXIMUM_CONSOLE_LOGLEVEL = 9
|
||||
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
|
||||
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
|
||||
|
||||
romimage "normal"
|
||||
option USE_FALLBACK_IMAGE = 0
|
||||
option CONFIG_USE_FALLBACK_IMAGE = 0
|
||||
option COREBOOT_EXTRA_VERSION = ".0Normal"
|
||||
payload ../payload.elf
|
||||
end
|
||||
|
||||
romimage "fallback"
|
||||
option USE_FALLBACK_IMAGE = 1
|
||||
option CONFIG_USE_FALLBACK_IMAGE = 1
|
||||
option COREBOOT_EXTRA_VERSION = ".0Fallback"
|
||||
payload ../payload.elf
|
||||
end
|
||||
|
||||
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
|
||||
|
@@ -21,23 +21,23 @@
|
||||
target mb_5blmp
|
||||
mainboard asi/mb_5blmp
|
||||
|
||||
option ROM_SIZE = (256 * 1024)
|
||||
# option ROM_SIZE = (256 * 1024) - (32 * 1024)
|
||||
# option FALLBACK_SIZE = (256 * 1024) - (32 * 1024)
|
||||
option CONFIG_ROM_SIZE = (256 * 1024)
|
||||
# option CONFIG_ROM_SIZE = (256 * 1024) - (32 * 1024)
|
||||
# option CONFIG_FALLBACK_SIZE = (256 * 1024) - (32 * 1024)
|
||||
|
||||
romimage "normal"
|
||||
option USE_FALLBACK_IMAGE = 0
|
||||
option ROM_IMAGE_SIZE = 64 * 1024
|
||||
option CONFIG_USE_FALLBACK_IMAGE = 0
|
||||
option CONFIG_ROM_IMAGE_SIZE = 64 * 1024
|
||||
option COREBOOT_EXTRA_VERSION = ".0Normal"
|
||||
payload /tmp/filo.elf
|
||||
end
|
||||
|
||||
romimage "fallback"
|
||||
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 = ".0Fallback"
|
||||
payload /tmp/filo.elf
|
||||
end
|
||||
|
||||
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
|
||||
# buildrom ./coreboot.rom ROM_SIZE "fallback"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
|
||||
# buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"
|
||||
|
Reference in New Issue
Block a user