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:
Stefan Reinauer
2009-06-30 15:17:49 +00:00
committed by Stefan Reinauer
parent 9702b6bf7e
commit 0867062412
863 changed files with 14632 additions and 14632 deletions

View File

@@ -4,33 +4,33 @@ target VENDOR_MAINBOARD
mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CROSS_COMPILE="CROSS_PREFIX"
option HOSTCC="CROSS_HOSTCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
option CONFIG_HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
romimage "normal"
option USE_FAILOVER_IMAGE=0
option USE_FALLBACK_IMAGE=0
option ROM_IMAGE_SIZE=0x20000
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=0
option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
romimage "fallback"
option USE_FAILOVER_IMAGE=0
option USE_FALLBACK_IMAGE=1
option ROM_IMAGE_SIZE=0x20000
option CONFIG_USE_FAILOVER_IMAGE=0
option CONFIG_USE_FALLBACK_IMAGE=1
option CONFIG_ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
romimage "failover"
option USE_FAILOVER_IMAGE=1
option USE_FALLBACK_IMAGE=0
option ROM_IMAGE_SIZE=FAILOVER_SIZE
option XIP_ROM_SIZE=FAILOVER_SIZE
option CONFIG_USE_FAILOVER_IMAGE=1
option CONFIG_USE_FALLBACK_IMAGE=0
option CONFIG_ROM_IMAGE_SIZE=CONFIG_FAILOVER_SIZE
option CONFIG_XIP_ROM_SIZE=CONFIG_FAILOVER_SIZE
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"

View File

@@ -23,30 +23,30 @@ target asus_a8n_e
mainboard asus/a8n_e
romimage "normal"
option USE_FAILOVER_IMAGE = 0
option USE_FALLBACK_IMAGE = 0
option ROM_IMAGE_SIZE = 128 * 1024
option XIP_ROM_SIZE = 128 * 1024
option CONFIG_USE_FAILOVER_IMAGE = 0
option CONFIG_USE_FALLBACK_IMAGE = 0
option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
option CONFIG_XIP_ROM_SIZE = 128 * 1024
option COREBOOT_EXTRA_VERSION = "_Normal"
payload ../payload.elf
end
romimage "fallback"
option USE_FAILOVER_IMAGE = 0
option USE_FALLBACK_IMAGE = 1
option ROM_IMAGE_SIZE = 128 * 1024
option XIP_ROM_SIZE = 128 * 1024
option CONFIG_USE_FAILOVER_IMAGE = 0
option CONFIG_USE_FALLBACK_IMAGE = 1
option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
option CONFIG_XIP_ROM_SIZE = 128 * 1024
option COREBOOT_EXTRA_VERSION = "_Fallback"
payload ../payload.elf
end
romimage "failover"
option USE_FAILOVER_IMAGE = 1
option USE_FALLBACK_IMAGE = 0
option ROM_IMAGE_SIZE = FAILOVER_SIZE
option XIP_ROM_SIZE = FAILOVER_SIZE
option CONFIG_USE_FAILOVER_IMAGE = 1
option CONFIG_USE_FALLBACK_IMAGE = 0
option CONFIG_ROM_IMAGE_SIZE = CONFIG_FAILOVER_SIZE
option CONFIG_XIP_ROM_SIZE = CONFIG_FAILOVER_SIZE
option COREBOOT_EXTRA_VERSION = "_Failover"
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
# buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
# buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"

View File

@@ -21,18 +21,18 @@ target asus_a8v-e_se
mainboard asus/a8v-e_se
romimage "normal"
option ROM_SIZE = 512 * 1024
option USE_FALLBACK_IMAGE = 0
option ROM_IMAGE_SIZE = 128 * 1024
option CONFIG_ROM_SIZE = 512 * 1024
option CONFIG_USE_FALLBACK_IMAGE = 0
option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
option COREBOOT_EXTRA_VERSION=".0Normal"
payload ../payload.elf
end
romimage "fallback"
option USE_FALLBACK_IMAGE = 1
option ROM_IMAGE_SIZE = 128 * 1024
option CONFIG_USE_FALLBACK_IMAGE = 1
option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
option COREBOOT_EXTRA_VERSION=".0Fallback"
payload ../payload.elf
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"

View File

@@ -21,32 +21,32 @@ target asus_m2v-mx_se
mainboard asus/m2v-mx_se
option CC="CROSSCC"
option CROSS_COMPILE="CROSS_PREFIX"
option HOSTCC="CROSS_HOSTCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
option CONFIG_HOSTCC="CROSS_HOSTCC"
## ROM_SIZE is the total number of bytes allocated for coreboot use
## CONFIG_ROM_SIZE is the total number of bytes allocated for coreboot use
## (normal AND fallback images and payloads).
# The board comes with 512KB SPI flash (DIP8), 128KB is for coreboot binary
# 384KB of flash is for payload/roms.
option ROM_SIZE = 512 * 1024
option CONFIG_ROM_SIZE = 512 * 1024
## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
## not including any payload.
# Please note that 128KB is cached for (XIP) too
option ROM_IMAGE_SIZE = 128 * 1024
option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
## FALLBACK_SIZE is the amount of the ROM the complete fallback image
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image
## (including payload) will use.
option FALLBACK_SIZE = ROM_SIZE
option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
romimage "fallback"
option USE_FALLBACK_IMAGE=1
option CONFIG_USE_FALLBACK_IMAGE=1
payload __PAYLOAD__
end
buildrom ./coreboot.rom ROM_SIZE "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"

View File

@@ -20,35 +20,35 @@
target asus_m2v-mx_se
mainboard asus/m2v-mx_se
## ROM_SIZE is the total number of bytes allocated for coreboot use
## CONFIG_ROM_SIZE is the total number of bytes allocated for coreboot use
## (normal AND fallback images and payloads).
# The board comes with 512KB SPI flash (DIP8), 128KB is for coreboot binary
# 384KB of flash is for payload/roms.
option ROM_SIZE = 512 * 1024
option CONFIG_ROM_SIZE = 512 * 1024
# Use following line instead if you want to use onboard VGA -
# padd the rom size to 64KB or XIP won't work, complaining about
# not good base.
#option ROM_SIZE = (512 * 1024) - (64 * 1024)
#option CONFIG_ROM_SIZE = (512 * 1024) - (64 * 1024)
## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
## CONFIG_ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
## not including any payload.
# Please note that 128KB is cached for (XIP) too
option ROM_IMAGE_SIZE = 128 * 1024
option CONFIG_ROM_IMAGE_SIZE = 128 * 1024
## FALLBACK_SIZE is the amount of the ROM the complete fallback image
## CONFIG_FALLBACK_SIZE is the amount of the ROM the complete fallback image
## (including payload) will use.
option FALLBACK_SIZE = ROM_SIZE
option CONFIG_FALLBACK_SIZE = CONFIG_ROM_SIZE
romimage "fallback"
option USE_FALLBACK_IMAGE=1
option CONFIG_USE_FALLBACK_IMAGE=1
payload ../payload.elf
end
buildrom ./coreboot.rom ROM_SIZE "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback"

View File

@@ -21,29 +21,29 @@
target mew-am
mainboard asus/mew-am
option ROM_SIZE = 512 * 1024
option CONFIG_ROM_SIZE = 512 * 1024
option MAINBOARD_VENDOR = "ASUS"
option MAINBOARD_PART_NUMBER = "MEW-AM"
option CONFIG_MAINBOARD_VENDOR = "ASUS"
option CONFIG_MAINBOARD_PART_NUMBER = "MEW-AM"
option IRQ_SLOT_COUNT = 8
option CONFIG_IRQ_SLOT_COUNT = 8
option DEFAULT_CONSOLE_LOGLEVEL = 9
option MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_CONSOLE_VGA = 1
option CONFIG_PCI_ROM_RUN = 1
romimage "normal"
option USE_FALLBACK_IMAGE = 0
option CONFIG_USE_FALLBACK_IMAGE = 0
option COREBOOT_EXTRA_VERSION = ".0Normal"
payload /tmp/filo.elf
end
romimage "fallback"
option USE_FALLBACK_IMAGE = 1
option CONFIG_USE_FALLBACK_IMAGE = 1
option COREBOOT_EXTRA_VERSION = ".0Fallback"
payload /tmp/filo.elf
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"

View File

@@ -2,24 +2,24 @@ target mew-vm
mainboard asus/mew-vm
## Without VGA BIOS
option ROM_SIZE = 512 * 1024
option CONFIG_ROM_SIZE = 512 * 1024
## With VGA BIOS (32k)
#option ROM_SIZE = (512 * 1024) - (32 * 1024)
#option CONFIG_ROM_SIZE = (512 * 1024) - (32 * 1024)
romimage "normal"
option USE_FALLBACK_IMAGE=0
option ROM_IMAGE_SIZE=0x10000
option CONFIG_USE_FALLBACK_IMAGE=0
option CONFIG_ROM_IMAGE_SIZE=0x10000
option COREBOOT_EXTRA_VERSION=".0Normal"
# payload /etc/hosts
payload /home/amp/filo-0.5/filo.elf
end
romimage "fallback"
option USE_FALLBACK_IMAGE=1
option ROM_IMAGE_SIZE=0x10000
option CONFIG_USE_FALLBACK_IMAGE=1
option CONFIG_ROM_IMAGE_SIZE=0x10000
option COREBOOT_EXTRA_VERSION=".0Fallback"
# payload /etc/hosts
payload /home/amp/filo-0.5/filo.elf
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"

View File

@@ -21,29 +21,29 @@
target p2b-d
mainboard asus/p2b-d
option ROM_SIZE = 256 * 1024
option CONFIG_ROM_SIZE = 256 * 1024
option MAINBOARD_VENDOR = "ASUS"
option MAINBOARD_PART_NUMBER = "P2B-D"
option CONFIG_MAINBOARD_VENDOR = "ASUS"
option CONFIG_MAINBOARD_PART_NUMBER = "P2B-D"
option IRQ_SLOT_COUNT = 6
option CONFIG_IRQ_SLOT_COUNT = 6
option DEFAULT_CONSOLE_LOGLEVEL = 9
option MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_CONSOLE_VGA = 1
option CONFIG_PCI_ROM_RUN = 1
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"

View File

@@ -21,29 +21,29 @@
target p2b-ds
mainboard asus/p2b-ds
option ROM_SIZE = 256 * 1024
option CONFIG_ROM_SIZE = 256 * 1024
option MAINBOARD_VENDOR = "ASUS"
option MAINBOARD_PART_NUMBER = "P2B-DS"
option CONFIG_MAINBOARD_VENDOR = "ASUS"
option CONFIG_MAINBOARD_PART_NUMBER = "P2B-DS"
option IRQ_SLOT_COUNT = 7
option CONFIG_IRQ_SLOT_COUNT = 7
option DEFAULT_CONSOLE_LOGLEVEL = 9
option MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_CONSOLE_VGA = 1
option CONFIG_PCI_ROM_RUN = 1
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"

View File

@@ -21,29 +21,29 @@
target p2b-f
mainboard asus/p2b-f
option ROM_SIZE = 256 * 1024
option CONFIG_ROM_SIZE = 256 * 1024
option MAINBOARD_VENDOR = "ASUS"
option MAINBOARD_PART_NUMBER = "P2B-F"
option CONFIG_MAINBOARD_VENDOR = "ASUS"
option CONFIG_MAINBOARD_PART_NUMBER = "P2B-F"
option IRQ_SLOT_COUNT = 7
option CONFIG_IRQ_SLOT_COUNT = 7
option DEFAULT_CONSOLE_LOGLEVEL = 9
option MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_CONSOLE_VGA = 1
option CONFIG_PCI_ROM_RUN = 1
romimage "normal"
option USE_FALLBACK_IMAGE = 0
option CONFIG_USE_FALLBACK_IMAGE = 0
option COREBOOT_EXTRA_VERSION = ".0Normal"
payload /tmp/filo.elf
end
romimage "fallback"
option USE_FALLBACK_IMAGE = 1
option CONFIG_USE_FALLBACK_IMAGE = 1
option COREBOOT_EXTRA_VERSION = ".0Fallback"
payload /tmp/filo.elf
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"

View File

@@ -21,29 +21,29 @@
target p2b
mainboard asus/p2b
option ROM_SIZE = 256 * 1024
option CONFIG_ROM_SIZE = 256 * 1024
option MAINBOARD_VENDOR = "ASUS"
option MAINBOARD_PART_NUMBER = "P2B"
option CONFIG_MAINBOARD_VENDOR = "ASUS"
option CONFIG_MAINBOARD_PART_NUMBER = "P2B"
option IRQ_SLOT_COUNT = 6
option CONFIG_IRQ_SLOT_COUNT = 6
option DEFAULT_CONSOLE_LOGLEVEL = 9
option MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_CONSOLE_VGA = 1
option CONFIG_PCI_ROM_RUN = 1
romimage "normal"
option USE_FALLBACK_IMAGE = 0
option CONFIG_USE_FALLBACK_IMAGE = 0
option COREBOOT_EXTRA_VERSION = ".0Normal"
payload /tmp/filo.elf
end
romimage "fallback"
option USE_FALLBACK_IMAGE = 1
option CONFIG_USE_FALLBACK_IMAGE = 1
option COREBOOT_EXTRA_VERSION = ".0Fallback"
payload /tmp/filo.elf
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"

View File

@@ -21,29 +21,29 @@
target p3b-f
mainboard asus/p3b-f
option ROM_SIZE = 256 * 1024
option CONFIG_ROM_SIZE = 256 * 1024
option MAINBOARD_VENDOR = "ASUS"
option MAINBOARD_PART_NUMBER = "P3B-F"
option CONFIG_MAINBOARD_VENDOR = "ASUS"
option CONFIG_MAINBOARD_PART_NUMBER = "P3B-F"
option IRQ_SLOT_COUNT = 8
option CONFIG_IRQ_SLOT_COUNT = 8
option DEFAULT_CONSOLE_LOGLEVEL = 9
option MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
option CONFIG_CONSOLE_VGA = 1
option CONFIG_PCI_ROM_RUN = 1
romimage "normal"
option USE_FALLBACK_IMAGE = 0
option CONFIG_USE_FALLBACK_IMAGE = 0
option COREBOOT_EXTRA_VERSION = ".0Normal"
payload /tmp/filo.elf
end
romimage "fallback"
option USE_FALLBACK_IMAGE = 1
option CONFIG_USE_FALLBACK_IMAGE = 1
option COREBOOT_EXTRA_VERSION = ".0Fallback"
payload /tmp/filo.elf
end
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"