the tool chain settings should not be in renamed (as they will never live in

Kconfig)
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@4384 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

src/arch/i386/Config.lb

@@ -54,7 +54,7 @@ end
 
 makerule nrv2b 
 	depends	"$(TOP)/util/nrv2b/nrv2b.c"
-	action	"$(CONFIG_HOSTCC) -O2 -DENCODE -DDECODE -DMAIN -DVERBOSE -DNDEBUG -DBITSIZE=32 -DENDIAN=0 $< -o $@"
+	action	"$(HOSTCC) -O2 -DENCODE -DDECODE -DMAIN -DVERBOSE -DNDEBUG -DBITSIZE=32 -DENDIAN=0 $< -o $@"
 end
 
 makerule payload

src/config/Config.lb

@@ -136,7 +136,7 @@ end
 # the buildrom tool
 makerule buildrom 
 	depends	"$(TOP)/util/buildrom/buildrom.c" 
-	action	"$(CONFIG_HOSTCC) -o $@ $<"
+	action	"$(HOSTCC) -o $@ $<"
 end
 
 # Force crt0.s (which has build time version code in it to rebuild every time)
@@ -178,13 +178,13 @@ end
 # be in a correct and valid state if it exists because the move is atomic.
 makerule ../romcc   
 	depends	"$(TOP)/util/romcc/romcc.c" 
-	action	"$(CONFIG_HOSTCC) -g $(HOSTCFLAGS) $< -o romcc.tmpfile"
+	action	"$(HOSTCC) -g $(HOSTCFLAGS) $< -o romcc.tmpfile"
 	action	"mv romcc.tmpfile $@"
 end
 
 makerule build_opt_tbl   
 	depends	"$(TOP)/util/options/build_opt_tbl.c $(TOP)/src/include/pc80/mc146818rtc.h $(TOP)/src/include/boot/coreboot_tables.h Makefile.settings Makefile"
-	action	"$(CONFIG_HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) $< -o $@" 
+	action	"$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) $< -o $@" 
 end
 
 makerule option_table.h option_table.c

src/config/Options.lb

@@ -86,7 +86,7 @@ define CC
 	export always
 	comment "Target C Compiler"
 end
-define CONFIG_HOSTCC
+define HOSTCC
 	default "gcc"
 	export always
 	comment "Host C Compiler"

src/mainboard/a-trend/atc-6220/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/a-trend/atc-6240/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/abit/be6-ii_v2_0/Options.lb

@@ -52,7 +52,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -88,7 +88,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/advantech/pcm-5820/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -95,7 +95,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc "
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/amd/db800/Options.lb

@@ -33,7 +33,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -136,7 +136,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/amd/dbm690t/Options.lb

@@ -72,7 +72,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -240,7 +240,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/amd/norwich/Options.lb

@@ -33,7 +33,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -136,7 +136,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/amd/pistachio/Options.lb

@@ -72,7 +72,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -240,7 +240,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/amd/rumba/Options.lb

@@ -32,7 +32,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -115,7 +115,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/amd/serengeti_cheetah/Options.lb

@@ -56,7 +56,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -274,7 +274,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/amd/serengeti_cheetah_fam10/Options.lb

@@ -75,7 +75,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -308,7 +308,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/arima/hdama/Options.lb

@@ -48,7 +48,7 @@ uses CONFIG_HAVE_INIT_TIMER
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -186,7 +186,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/artecgroup/dbe61/Options.lb

@@ -33,7 +33,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -136,7 +136,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/asi/mb_5blgp/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -95,7 +95,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc "
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/asi/mb_5blmp/Options.lb

@@ -30,7 +30,7 @@ uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -112,7 +112,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/asus/a8n_e/Options.lb

@@ -65,7 +65,7 @@ uses CONFIG_RAMBASE
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
@@ -156,7 +156,7 @@ default CONFIG_USE_OPTION_TABLE = (!CONFIG_USE_FALLBACK_IMAGE) && (!CONFIG_USE_F
 default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_GDB_STUB = 0
 default CONFIG_USE_PRINTK_IN_CAR=1
 default CONFIG_CONSOLE_SERIAL8250 = 1

src/mainboard/asus/a8v-e_se/Options.lb

@@ -61,7 +61,7 @@ uses CONFIG_RAMBASE
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
@@ -157,7 +157,7 @@ default CONFIG_RAMBASE = 0x00004000
 # default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
 default CONFIG_ROM_PAYLOAD = 1
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_GDB_STUB = 0
 default CONFIG_USE_PRINTK_IN_CAR = 1
 default CONFIG_CONSOLE_SERIAL8250 = 1

src/mainboard/asus/m2v-mx_se/Options.lb

@@ -63,7 +63,7 @@ uses CONFIG_RAMBASE
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
@@ -160,7 +160,7 @@ default CONFIG_RAMBASE = 0x1F00000
 # default CONFIG_USE_OPTION_TABLE = !CONFIG_USE_FALLBACK_IMAGE
 default CONFIG_ROM_PAYLOAD = 1
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_GDB_STUB = 0
 default CONFIG_USE_PRINTK_IN_CAR=1
 default CONFIG_CONSOLE_SERIAL8250 = 1

src/mainboard/asus/mew-am/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/asus/mew-vm/Options.lb

@@ -32,7 +32,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -112,7 +112,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/asus/p2b-d/Options.lb

@@ -52,7 +52,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -94,7 +94,7 @@ default CONFIG_MAX_CPUS = 2
 default CONFIG_IOAPIC = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/asus/p2b-ds/Options.lb

@@ -52,7 +52,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -94,7 +94,7 @@ default CONFIG_MAX_CPUS = 2
 default CONFIG_IOAPIC = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/asus/p2b-f/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/asus/p2b/Options.lb

@@ -52,7 +52,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -88,7 +88,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/asus/p3b-f/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/axus/tc320/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -95,7 +95,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc "
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/azza/pt-6ibd/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/bcom/winnet100/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -95,7 +95,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc "
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/bcom/winnetp680/Options.lb

@@ -55,7 +55,7 @@ uses CONFIG_HAVE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -94,7 +94,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32 -fno-stack-protector"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 
 ##
 ## Set this to the max PCI bus number you would ever use for PCI config I/O.

src/mainboard/biostar/m6tba/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/broadcom/blast/Options.lb

@@ -52,7 +52,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -206,7 +206,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/compaq/deskpro_en_sff_p600/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/dell/s1850/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_BTEXT
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 
@@ -168,7 +168,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/digitallogic/adl855pc/Options.lb

@@ -33,7 +33,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
@@ -111,7 +111,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 
 

src/mainboard/digitallogic/msm586seg/Options.lb

@@ -34,7 +34,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 
 uses CONFIG_CONSOLE_SERIAL8250
@@ -119,7 +119,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 
 

src/mainboard/digitallogic/msm800sev/Options.lb

@@ -33,7 +33,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -136,7 +136,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/eaglelion/5bcm/Options.lb

@@ -32,7 +32,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -118,7 +118,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/embeddedplanet/ep405pc/Options.lb

@@ -50,7 +50,7 @@ uses CONFIG_MAINBOARD_PART_NUMBER
 uses COREBOOT_EXTRA_VERSION
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 
 ##

src/mainboard/emulation/qemu-x86/Options.lb

@@ -34,7 +34,7 @@ uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_HAVE_HIGH_TABLES
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_PCI_ROM_RUN
 uses CONFIG_PCI_OPTION_ROM_RUN_REALMODE
@@ -129,7 +129,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## known-good settings for qemu

src/mainboard/gigabyte/ga-6bxc/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/gigabyte/ga_2761gxdk/Options.lb

@@ -80,7 +80,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_USBDEBUG_DIRECT
@@ -298,7 +298,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/gigabyte/m57sli/Options.lb

@@ -78,7 +78,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_USBDEBUG_DIRECT
@@ -307,7 +307,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/hp/dl145_g3/Options.lb

@@ -77,7 +77,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -271,7 +271,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/ibm/e325/Options.lb

@@ -44,7 +44,7 @@ uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_SERIAL8250
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_USE_DCACHE_RAM
 uses CONFIG_DCACHE_RAM_BASE
@@ -170,7 +170,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 default CONFIG_USE_PRINTK_IN_CAR=1
 

src/mainboard/ibm/e326/Options.lb

@@ -44,7 +44,7 @@ uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_SERIAL8250
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -176,7 +176,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 default CONFIG_USE_PRINTK_IN_CAR=1
 

src/mainboard/iei/juki-511p/Options.lb

@@ -35,7 +35,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_SERIAL8250
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
@@ -141,7 +141,7 @@ default CONFIG_TTYS0_LCS=0x3
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 default CONFIG_VIDEO_MB = 0
 

src/mainboard/iei/nova4899r/Options.lb

@@ -30,7 +30,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -125,7 +125,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/iei/pcisa-lx-800-r10/Options.lb

@@ -54,7 +54,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -98,7 +98,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/intel/jarrell/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_BTEXT
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 uses CONFIG_MAX_REBOOT_CNT
@@ -182,7 +182,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/intel/mtarvon/Options.lb

@@ -64,7 +64,7 @@ uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 
@@ -171,7 +171,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/intel/truxton/Options.lb

@@ -64,7 +64,7 @@ uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 
@@ -171,7 +171,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/intel/xe7501devkit/Options.lb

@@ -39,7 +39,7 @@ uses CONFIG_HAVE_INIT_TIMER
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -180,7 +180,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/iwill/dk8_htx/Options.lb

@@ -56,7 +56,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -273,7 +273,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/iwill/dk8s2/Options.lb

@@ -48,7 +48,7 @@ uses CONFIG_HAVE_INIT_TIMER
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_USE_DCACHE_RAM
 uses CONFIG_DCACHE_RAM_BASE
@@ -172,7 +172,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 #default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-#default CONFIG_HOSTCC="gcc"
+#default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/iwill/dk8x/Options.lb

@@ -48,7 +48,7 @@ uses CONFIG_HAVE_INIT_TIMER
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_USE_DCACHE_RAM
 uses CONFIG_DCACHE_RAM_BASE
@@ -171,7 +171,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 #default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-#default CONFIG_HOSTCC="gcc"
+#default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/jetway/j7f24/Options.lb

@@ -55,7 +55,7 @@ uses CONFIG_HAVE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -95,7 +95,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32 -fno-stack-protector"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 
 ##
 ## Set this to the max PCI bus number you would ever use for PCI config I/O.

src/mainboard/kontron/986lcd-m/Options.lb

@@ -95,7 +95,7 @@ uses CONFIG_PCI_ROM_RUN
 uses CONFIG_DEBUG
 # Toolchain
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 # Tweaks
@@ -269,7 +269,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/lippert/frontrunner/Options.lb

@@ -32,7 +32,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -115,7 +115,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/lippert/roadrunner-lx/Options.lb

@@ -61,7 +61,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEBUG
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
@@ -164,7 +164,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ##
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 
 ##
 ## The Serial Console

src/mainboard/lippert/spacerunner-lx/Options.lb

@@ -61,7 +61,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEBUG
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
@@ -164,7 +164,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ##
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 
 ##
 ## The Serial Console

src/mainboard/motorola/sandpoint/Options.lb

@@ -47,7 +47,7 @@ uses CONFIG_MAINBOARD_PART_NUMBER
 uses COREBOOT_EXTRA_VERSION
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 
 ##
@@ -65,7 +65,7 @@ default CONFIG_IO_BASE=CONFIG_ISA_IO_BASE
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 ## use a cross compiler
 #default CONFIG_CROSS_COMPILE="powerpc-eabi-"
 #default CONFIG_CROSS_COMPILE="ppc_74xx-"

src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb

@@ -43,7 +43,7 @@ uses CONFIG_MAINBOARD_PART_NUMBER
 uses COREBOOT_EXTRA_VERSION
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 
 ##
@@ -61,7 +61,7 @@ default CONFIG_IO_BASE=CONFIG_ISA_IO_BASE
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 ## use a cross compiler
 #default CONFIG_CROSS_COMPILE="powerpc-eabi-"
 #default CONFIG_CROSS_COMPILE="ppc_74xx-"

src/mainboard/msi/ms6119/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/msi/ms6147/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/msi/ms6178/Options.lb

@@ -52,7 +52,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -85,7 +85,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/msi/ms7135/Options.lb

@@ -65,7 +65,7 @@ uses CONFIG_RAMBASE
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
@@ -265,7 +265,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/msi/ms7260/Options.lb

@@ -72,7 +72,7 @@ uses CONFIG_CONSOLE_SERIAL8250
 uses CONFIG_HAVE_INIT_TIMER			# ?
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -176,7 +176,7 @@ default CONFIG_USE_OPTION_TABLE = (!CONFIG_USE_FALLBACK_IMAGE) && (!CONFIG_USE_F
 default CONFIG_RAMBASE = 0x00100000
 default CONFIG_ROM_PAYLOAD = 1
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_USE_PRINTK_IN_CAR = 1
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200

src/mainboard/msi/ms9185/Options.lb

@@ -77,7 +77,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -275,7 +275,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/msi/ms9282/Options.lb

@@ -63,7 +63,7 @@ uses CONFIG_RAMBASE
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
@@ -254,7 +254,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/nec/powermate2000/Options.lb

@@ -52,7 +52,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -84,7 +84,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/newisys/khepri/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_HAVE_INIT_TIMER
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -189,7 +189,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/nvidia/l1_2pvv/Options.lb

@@ -78,7 +78,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_USBDEBUG_DIRECT
@@ -296,7 +296,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/olpc/btest/Options.lb

@@ -33,7 +33,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -116,7 +116,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/olpc/rev_a/Options.lb

@@ -33,7 +33,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -116,7 +116,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/pcengines/alix1c/Options.lb

@@ -53,7 +53,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -154,7 +154,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ##
 default CONFIG_CROSS_COMPILE=""
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## The Serial Console

src/mainboard/rca/rm4100/Options.lb

@@ -41,7 +41,7 @@ uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_HAVE_OPTION_TABLE
 uses CONFIG_HAVE_PIRQ_TABLE
 uses CONFIG_HEAP_SIZE
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_IRQ_SLOT_COUNT
 uses COREBOOT_EXTRA_VERSION
 uses CONFIG_MAINBOARD
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_USE_OPTION_TABLE = 0
 default CONFIG_ROM_PAYLOAD = 1
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/soyo/sy-6ba-plus-iii/Options.lb

@@ -51,7 +51,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/sunw/ultra40/Options.lb

@@ -41,7 +41,7 @@ uses CONFIG_RAMBASE
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
@@ -222,7 +222,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/supermicro/h8dme/Options.lb

@@ -80,7 +80,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -298,7 +298,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/supermicro/h8dmr/Options.lb

@@ -78,7 +78,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -293,7 +293,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/supermicro/x6dai_g/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_BTEXT
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 
@@ -168,7 +168,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/supermicro/x6dhe_g/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_BTEXT
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 
@@ -168,7 +168,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/supermicro/x6dhe_g2/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_BTEXT
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 
@@ -168,7 +168,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/supermicro/x6dhr_ig/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_BTEXT
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 
@@ -168,7 +168,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/supermicro/x6dhr_ig2/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_BTEXT
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_CROSS_COMPILE
 uses CONFIG_OBJCOPY
 
@@ -168,7 +168,7 @@ default CONFIG_ROM_PAYLOAD=1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/technexion/tim8690/Options.lb

@@ -72,7 +72,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -241,7 +241,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/technologic/ts5300/Options.lb

@@ -34,7 +34,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
@@ -134,7 +134,7 @@ default CONFIG_ROM_PAYLOAD     = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 #
 # CBFS

src/mainboard/televideo/tc7020/Options.lb

@@ -49,7 +49,7 @@ uses CONFIG_XIP_ROM_SIZE
 uses CONFIG_XIP_ROM_BASE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -96,7 +96,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc "
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/thomson/ip1000/Options.lb

@@ -41,7 +41,7 @@ uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_HAVE_OPTION_TABLE
 uses CONFIG_HAVE_PIRQ_TABLE
 uses CONFIG_HEAP_SIZE
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_IRQ_SLOT_COUNT
 uses COREBOOT_EXTRA_VERSION
 uses CONFIG_MAINBOARD
@@ -87,7 +87,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_USE_OPTION_TABLE = 0
 default CONFIG_ROM_PAYLOAD = 1
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/totalimpact/briq/Options.lb

@@ -44,7 +44,7 @@ uses CONFIG_MAINBOARD_PART_NUMBER
 uses COREBOOT_EXTRA_VERSION
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 
 ##
@@ -69,7 +69,7 @@ default CONFIG_TTYS0_BASE=0x3f8
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 ## use a cross compiler
 #default CONFIG_CROSS_COMPILE="powerpc-eabi-"
 #default CONFIG_CROSS_COMPILE="ppc_74xx-"

src/mainboard/tyan/s1846/Options.lb

@@ -52,7 +52,7 @@ uses CONFIG_XIP_ROM_BASE
 uses CONFIG_HAVE_MP_TABLE
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -88,7 +88,7 @@ default CONFIG_RAMBASE = 0x00004000
 default CONFIG_ROM_PAYLOAD = 1
 default CONFIG_CROSS_COMPILE = ""
 default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC = "gcc"
+default HOSTCC = "gcc"
 default CONFIG_CONSOLE_SERIAL8250 = 1
 default CONFIG_TTYS0_BAUD = 115200
 default CONFIG_TTYS0_BASE = 0x3f8

src/mainboard/tyan/s2735/Options.lb

@@ -43,7 +43,7 @@ uses CONFIG_RAMBASE
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_TTYS0_BASE
@@ -202,7 +202,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/tyan/s2850/Options.lb

@@ -50,7 +50,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -190,7 +190,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/tyan/s2875/Options.lb

@@ -50,7 +50,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -191,7 +191,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/tyan/s2880/Options.lb

@@ -50,7 +50,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -190,7 +190,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/tyan/s2881/Options.lb

@@ -50,7 +50,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -207,7 +207,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default

src/mainboard/tyan/s2882/Options.lb

@@ -50,7 +50,7 @@ uses CONFIG_GDB_STUB
 uses CONFIG_GDB_STUB
 uses CONFIG_CROSS_COMPILE
 uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
 uses CONFIG_OBJCOPY
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
@@ -190,7 +190,7 @@ default CONFIG_ROM_PAYLOAD = 1
 ## The default compiler
 ##
 default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
 
 ##
 ## Disable the gdb stub by default