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,29 +21,29 @@
|
||||
target ga-6bxc
|
||||
mainboard gigabyte/ga-6bxc
|
||||
|
||||
option ROM_SIZE = 256 * 1024
|
||||
option CONFIG_ROM_SIZE = 256 * 1024
|
||||
|
||||
option MAINBOARD_VENDOR = "GIGABYTE"
|
||||
option MAINBOARD_PART_NUMBER = "GA-6BXC"
|
||||
option CONFIG_MAINBOARD_VENDOR = "GIGABYTE"
|
||||
option CONFIG_MAINBOARD_PART_NUMBER = "GA-6BXC"
|
||||
|
||||
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"
|
||||
|
@@ -23,39 +23,39 @@ 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__
|
||||
|
||||
option ROM_SIZE = 512*1024
|
||||
option CONFIG_ROM_SIZE = 512*1024
|
||||
|
||||
romimage "normal"
|
||||
option USE_FAILOVER_IMAGE=0
|
||||
option USE_FALLBACK_IMAGE=0
|
||||
option ROM_IMAGE_SIZE=0x28000
|
||||
option XIP_ROM_SIZE=0x40000
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=0
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x28000
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
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 XIP_ROM_SIZE=0x40000
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=1
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
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
|
||||
option COREBOOT_EXTRA_VERSION=".0-Failover"
|
||||
end
|
||||
|
||||
|
||||
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
|
||||
|
@@ -26,33 +26,33 @@ mainboard gigabyte/ga_2761gxdk
|
||||
|
||||
romimage "normal"
|
||||
# 32K for VGA BIOS
|
||||
option ROM_SIZE = (512*1024 - 32*1024)
|
||||
option CONFIG_ROM_SIZE = (512*1024 - 32*1024)
|
||||
|
||||
option USE_FAILOVER_IMAGE=0
|
||||
option ROM_IMAGE_SIZE=0x20000
|
||||
option XIP_ROM_SIZE=0x40000
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
|
||||
# payload ../../../../payloads/filo_uda1.elf
|
||||
payload ../payload.elf
|
||||
end
|
||||
|
||||
romimage "fallback"
|
||||
option USE_FAILOVER_IMAGE=0
|
||||
option USE_FALLBACK_IMAGE=1
|
||||
option ROM_IMAGE_SIZE=0x20000
|
||||
option XIP_ROM_SIZE=0x40000
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=1
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
|
||||
# payload ../../../../payloads/filo_uda1.elf
|
||||
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="$(shell cat ../../VERSION)_Failover"
|
||||
end
|
||||
|
||||
# buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
|
||||
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
|
||||
# buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
|
||||
|
@@ -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"
|
||||
|
@@ -24,26 +24,26 @@
|
||||
target m57sli
|
||||
mainboard gigabyte/m57sli
|
||||
|
||||
option ROM_SIZE=0x100000
|
||||
option FALLBACK_SIZE=(ROM_SIZE-0x1000)
|
||||
option CONFIG_ROM_SIZE=0x100000
|
||||
option CONFIG_FALLBACK_SIZE=(CONFIG_ROM_SIZE-0x1000)
|
||||
|
||||
romimage "fallback"
|
||||
option USE_FAILOVER_IMAGE=0
|
||||
option USE_FALLBACK_IMAGE=1
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=1
|
||||
option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
|
||||
option CONFIG_PRECOMPRESSED_PAYLOAD=1
|
||||
option ROM_IMAGE_SIZE=0x17000
|
||||
option XIP_ROM_SIZE=0x40000
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x17000
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
|
||||
payload ../payload.elf.lzma
|
||||
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="$(shell cat ../../VERSION)_Failover"
|
||||
end
|
||||
|
||||
buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" "failover"
|
||||
|
@@ -25,20 +25,20 @@ mainboard gigabyte/m57sli
|
||||
# serengeti_leopard
|
||||
romimage "normal"
|
||||
# 48K for SCSI FW
|
||||
# option ROM_SIZE = 475136
|
||||
# option CONFIG_ROM_SIZE = 475136
|
||||
# 48K for SCSI FW and 48K for ATI ROM
|
||||
# option ROM_SIZE = 425984
|
||||
# option CONFIG_ROM_SIZE = 425984
|
||||
# 64K for Etherboot
|
||||
# option ROM_SIZE = 458752
|
||||
# option CONFIG_ROM_SIZE = 458752
|
||||
# 44k for atixx.rom
|
||||
# option ROM_SIZE = 479232
|
||||
option USE_FAILOVER_IMAGE=0
|
||||
option USE_FALLBACK_IMAGE=0
|
||||
# option ROM_IMAGE_SIZE=0x13800
|
||||
# option ROM_IMAGE_SIZE=0x18800
|
||||
option ROM_IMAGE_SIZE=0x20000
|
||||
# option ROM_IMAGE_SIZE=0x15800
|
||||
option XIP_ROM_SIZE=0x40000
|
||||
# option CONFIG_ROM_SIZE = 479232
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=0
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x13800
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x18800
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x15800
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
|
||||
# payload ../../../payloads/tg3--ide_disk.zelf
|
||||
# payload ../../../payloads/filo.elf
|
||||
@@ -61,13 +61,13 @@ romimage "normal"
|
||||
end
|
||||
|
||||
romimage "fallback"
|
||||
option USE_FAILOVER_IMAGE=0
|
||||
option USE_FALLBACK_IMAGE=1
|
||||
# option ROM_IMAGE_SIZE=0x13800
|
||||
# option ROM_IMAGE_SIZE=0x19800
|
||||
option ROM_IMAGE_SIZE=0x20000
|
||||
# option ROM_IMAGE_SIZE=0x15800
|
||||
option XIP_ROM_SIZE=0x40000
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=1
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x13800
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x19800
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x20000
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x15800
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
|
||||
# payload ../../../payloads/tg3--ide_disk.zelf
|
||||
# payload ../../../payloads/filo.elf
|
||||
@@ -95,12 +95,12 @@ romimage "fallback"
|
||||
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="$(shell cat ../../VERSION)_Failover"
|
||||
end
|
||||
|
||||
#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
|
||||
buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
|
||||
#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback" "failover"
|
||||
|
@@ -24,19 +24,19 @@
|
||||
target m57sli
|
||||
mainboard gigabyte/m57sli
|
||||
|
||||
option ROM_SIZE=0x200000
|
||||
option FALLBACK_SIZE=(ROM_SIZE-0x1000)
|
||||
option CONFIG_ROM_SIZE=0x200000
|
||||
option CONFIG_FALLBACK_SIZE=(CONFIG_ROM_SIZE-0x1000)
|
||||
|
||||
romimage "fallback"
|
||||
option USE_FAILOVER_IMAGE=0
|
||||
option USE_FALLBACK_IMAGE=1
|
||||
option CONFIG_USE_FAILOVER_IMAGE=0
|
||||
option CONFIG_USE_FALLBACK_IMAGE=1
|
||||
option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
|
||||
option CONFIG_PRECOMPRESSED_PAYLOAD=1
|
||||
# option ROM_IMAGE_SIZE=0x19800
|
||||
option ROM_IMAGE_SIZE=0x17000
|
||||
# option ROM_IMAGE_SIZE=0x15800
|
||||
# option ROM_IMAGE_SIZE=0x13800
|
||||
option XIP_ROM_SIZE=0x40000
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x19800
|
||||
option CONFIG_ROM_IMAGE_SIZE=0x17000
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x15800
|
||||
# option CONFIG_ROM_IMAGE_SIZE=0x13800
|
||||
option CONFIG_XIP_ROM_SIZE=0x40000
|
||||
option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
|
||||
# payload ../../../payloads/tg3--ide_disk.zelf
|
||||
# payload ../../../payloads/filo.elf
|
||||
@@ -65,13 +65,13 @@ romimage "fallback"
|
||||
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="$(shell cat ../../VERSION)_Failover"
|
||||
end
|
||||
|
||||
|
||||
buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
|
||||
#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
|
||||
buildrom ./coreboot.rom CONFIG_ROM_SIZE "fallback" "failover"
|
||||
#buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"
|
||||
|
Reference in New Issue
Block a user