summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2009-06-30 17:13:58 +0000
committerStefan Reinauer <stepan@openbios.org>2009-06-30 17:13:58 +0000
commit9dd27bc03a53f69b55c1c9718a5e44365019c082 (patch)
treecd5f148aa936f72914a5b3383cb404840a83f194 /src
parent36f230eefb5a072240447fdbe1aa81ad1bb80072 (diff)
downloadcoreboot-9dd27bc03a53f69b55c1c9718a5e44365019c082.tar.gz
coreboot-9dd27bc03a53f69b55c1c9718a5e44365019c082.tar.bz2
coreboot-9dd27bc03a53f69b55c1c9718a5e44365019c082.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/Config.lb2
-rw-r--r--src/config/Config.lb6
-rw-r--r--src/config/Options.lb2
-rw-r--r--src/mainboard/a-trend/atc-6220/Options.lb4
-rw-r--r--src/mainboard/a-trend/atc-6240/Options.lb4
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/Options.lb4
-rw-r--r--src/mainboard/advantech/pcm-5820/Options.lb4
-rw-r--r--src/mainboard/amd/db800/Options.lb4
-rw-r--r--src/mainboard/amd/dbm690t/Options.lb4
-rw-r--r--src/mainboard/amd/norwich/Options.lb4
-rw-r--r--src/mainboard/amd/pistachio/Options.lb4
-rw-r--r--src/mainboard/amd/rumba/Options.lb4
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Options.lb4
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/Options.lb4
-rw-r--r--src/mainboard/arima/hdama/Options.lb4
-rw-r--r--src/mainboard/artecgroup/dbe61/Options.lb4
-rw-r--r--src/mainboard/asi/mb_5blgp/Options.lb4
-rw-r--r--src/mainboard/asi/mb_5blmp/Options.lb4
-rw-r--r--src/mainboard/asus/a8n_e/Options.lb4
-rw-r--r--src/mainboard/asus/a8v-e_se/Options.lb4
-rw-r--r--src/mainboard/asus/m2v-mx_se/Options.lb4
-rw-r--r--src/mainboard/asus/mew-am/Options.lb4
-rw-r--r--src/mainboard/asus/mew-vm/Options.lb4
-rw-r--r--src/mainboard/asus/p2b-d/Options.lb4
-rw-r--r--src/mainboard/asus/p2b-ds/Options.lb4
-rw-r--r--src/mainboard/asus/p2b-f/Options.lb4
-rw-r--r--src/mainboard/asus/p2b/Options.lb4
-rw-r--r--src/mainboard/asus/p3b-f/Options.lb4
-rw-r--r--src/mainboard/axus/tc320/Options.lb4
-rw-r--r--src/mainboard/azza/pt-6ibd/Options.lb4
-rw-r--r--src/mainboard/bcom/winnet100/Options.lb4
-rw-r--r--src/mainboard/bcom/winnetp680/Options.lb4
-rw-r--r--src/mainboard/biostar/m6tba/Options.lb4
-rw-r--r--src/mainboard/broadcom/blast/Options.lb4
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/Options.lb4
-rw-r--r--src/mainboard/dell/s1850/Options.lb4
-rw-r--r--src/mainboard/digitallogic/adl855pc/Options.lb4
-rw-r--r--src/mainboard/digitallogic/msm586seg/Options.lb4
-rw-r--r--src/mainboard/digitallogic/msm800sev/Options.lb4
-rw-r--r--src/mainboard/eaglelion/5bcm/Options.lb4
-rw-r--r--src/mainboard/embeddedplanet/ep405pc/Options.lb2
-rw-r--r--src/mainboard/emulation/qemu-x86/Options.lb4
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/Options.lb4
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Options.lb4
-rw-r--r--src/mainboard/gigabyte/m57sli/Options.lb4
-rw-r--r--src/mainboard/hp/dl145_g3/Options.lb4
-rw-r--r--src/mainboard/ibm/e325/Options.lb4
-rw-r--r--src/mainboard/ibm/e326/Options.lb4
-rw-r--r--src/mainboard/iei/juki-511p/Options.lb4
-rw-r--r--src/mainboard/iei/nova4899r/Options.lb4
-rw-r--r--src/mainboard/iei/pcisa-lx-800-r10/Options.lb4
-rw-r--r--src/mainboard/intel/jarrell/Options.lb4
-rw-r--r--src/mainboard/intel/mtarvon/Options.lb4
-rw-r--r--src/mainboard/intel/truxton/Options.lb4
-rw-r--r--src/mainboard/intel/xe7501devkit/Options.lb4
-rw-r--r--src/mainboard/iwill/dk8_htx/Options.lb4
-rw-r--r--src/mainboard/iwill/dk8s2/Options.lb4
-rw-r--r--src/mainboard/iwill/dk8x/Options.lb4
-rw-r--r--src/mainboard/jetway/j7f24/Options.lb4
-rw-r--r--src/mainboard/kontron/986lcd-m/Options.lb4
-rw-r--r--src/mainboard/lippert/frontrunner/Options.lb4
-rw-r--r--src/mainboard/lippert/roadrunner-lx/Options.lb4
-rw-r--r--src/mainboard/lippert/spacerunner-lx/Options.lb4
-rw-r--r--src/mainboard/motorola/sandpoint/Options.lb4
-rw-r--r--src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb4
-rw-r--r--src/mainboard/msi/ms6119/Options.lb4
-rw-r--r--src/mainboard/msi/ms6147/Options.lb4
-rw-r--r--src/mainboard/msi/ms6178/Options.lb4
-rw-r--r--src/mainboard/msi/ms7135/Options.lb4
-rw-r--r--src/mainboard/msi/ms7260/Options.lb4
-rw-r--r--src/mainboard/msi/ms9185/Options.lb4
-rw-r--r--src/mainboard/msi/ms9282/Options.lb4
-rw-r--r--src/mainboard/nec/powermate2000/Options.lb4
-rw-r--r--src/mainboard/newisys/khepri/Options.lb4
-rw-r--r--src/mainboard/nvidia/l1_2pvv/Options.lb4
-rw-r--r--src/mainboard/olpc/btest/Options.lb4
-rw-r--r--src/mainboard/olpc/rev_a/Options.lb4
-rw-r--r--src/mainboard/pcengines/alix1c/Options.lb4
-rw-r--r--src/mainboard/rca/rm4100/Options.lb4
-rw-r--r--src/mainboard/soyo/sy-6ba-plus-iii/Options.lb4
-rw-r--r--src/mainboard/sunw/ultra40/Options.lb4
-rw-r--r--src/mainboard/supermicro/h8dme/Options.lb4
-rw-r--r--src/mainboard/supermicro/h8dmr/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dai_g/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Options.lb4
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Options.lb4
-rw-r--r--src/mainboard/technexion/tim8690/Options.lb4
-rw-r--r--src/mainboard/technologic/ts5300/Options.lb4
-rw-r--r--src/mainboard/televideo/tc7020/Options.lb4
-rw-r--r--src/mainboard/thomson/ip1000/Options.lb4
-rw-r--r--src/mainboard/totalimpact/briq/Options.lb4
-rw-r--r--src/mainboard/tyan/s1846/Options.lb4
-rw-r--r--src/mainboard/tyan/s2735/Options.lb4
-rw-r--r--src/mainboard/tyan/s2850/Options.lb4
-rw-r--r--src/mainboard/tyan/s2875/Options.lb4
-rw-r--r--src/mainboard/tyan/s2880/Options.lb4
-rw-r--r--src/mainboard/tyan/s2881/Options.lb4
-rw-r--r--src/mainboard/tyan/s2882/Options.lb4
-rw-r--r--src/mainboard/tyan/s2885/Options.lb4
-rw-r--r--src/mainboard/tyan/s2891/Options.lb4
-rw-r--r--src/mainboard/tyan/s2892/Options.lb4
-rw-r--r--src/mainboard/tyan/s2895/Options.lb4
-rw-r--r--src/mainboard/tyan/s2912/Options.lb4
-rw-r--r--src/mainboard/tyan/s2912_fam10/Options.lb4
-rw-r--r--src/mainboard/tyan/s4880/Options.lb4
-rw-r--r--src/mainboard/tyan/s4882/Options.lb4
-rw-r--r--src/mainboard/via/epia-cn/Options.lb4
-rw-r--r--src/mainboard/via/epia-m/Options.lb4
-rw-r--r--src/mainboard/via/epia-m700/Options.lb4
-rw-r--r--src/mainboard/via/epia/Options.lb4
-rw-r--r--src/mainboard/via/pc2500e/Options.lb4
-rw-r--r--src/mainboard/via/vt8454c/Options.lb4
-rw-r--r--src/northbridge/amd/amdk8/Config.lb4
-rw-r--r--src/northbridge/intel/e7520/Config.lb2
-rw-r--r--src/northbridge/intel/e7525/Config.lb2
117 files changed, 230 insertions, 230 deletions
diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb
index 6a851a5cb7a3..1691d29a7968 100644
--- a/src/arch/i386/Config.lb
+++ b/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
diff --git a/src/config/Config.lb b/src/config/Config.lb
index 5ca864db3fb4..25b2127bb9e1 100644
--- a/src/config/Config.lb
+++ b/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
diff --git a/src/config/Options.lb b/src/config/Options.lb
index 428e657a9d2d..08f983982399 100644
--- a/src/config/Options.lb
+++ b/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"
diff --git a/src/mainboard/a-trend/atc-6220/Options.lb b/src/mainboard/a-trend/atc-6220/Options.lb
index 4d927e1fb8a8..c1d5bfd3a42a 100644
--- a/src/mainboard/a-trend/atc-6220/Options.lb
+++ b/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
diff --git a/src/mainboard/a-trend/atc-6240/Options.lb b/src/mainboard/a-trend/atc-6240/Options.lb
index feb32318c7be..dfba9224f60c 100644
--- a/src/mainboard/a-trend/atc-6240/Options.lb
+++ b/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
diff --git a/src/mainboard/abit/be6-ii_v2_0/Options.lb b/src/mainboard/abit/be6-ii_v2_0/Options.lb
index 55255c120e52..108037a62cf2 100644
--- a/src/mainboard/abit/be6-ii_v2_0/Options.lb
+++ b/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
diff --git a/src/mainboard/advantech/pcm-5820/Options.lb b/src/mainboard/advantech/pcm-5820/Options.lb
index 43bbd6b3dd27..4031a060b1f4 100644
--- a/src/mainboard/advantech/pcm-5820/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/db800/Options.lb b/src/mainboard/amd/db800/Options.lb
index 06a0e386ceff..37453838563c 100644
--- a/src/mainboard/amd/db800/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/dbm690t/Options.lb b/src/mainboard/amd/dbm690t/Options.lb
index 8835d2997dd6..d2d9ea2fa9db 100644
--- a/src/mainboard/amd/dbm690t/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/norwich/Options.lb b/src/mainboard/amd/norwich/Options.lb
index fc71fdb24cd1..7f62ddb568c0 100644
--- a/src/mainboard/amd/norwich/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/pistachio/Options.lb b/src/mainboard/amd/pistachio/Options.lb
index 321c4d292dc1..539a2994f90d 100644
--- a/src/mainboard/amd/pistachio/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/rumba/Options.lb b/src/mainboard/amd/rumba/Options.lb
index eff01c10875c..57f31b0b84b9 100644
--- a/src/mainboard/amd/rumba/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/serengeti_cheetah/Options.lb b/src/mainboard/amd/serengeti_cheetah/Options.lb
index 68d3f10b2f3c..632c259ced63 100644
--- a/src/mainboard/amd/serengeti_cheetah/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
index cd5f586ca7ea..ecff75c91b9f 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
+++ b/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
diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb
index 6f8353154102..b7de4eb6d46a 100644
--- a/src/mainboard/arima/hdama/Options.lb
+++ b/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
diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb
index 3fa9ae27ce33..44b98e79c461 100644
--- a/src/mainboard/artecgroup/dbe61/Options.lb
+++ b/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
diff --git a/src/mainboard/asi/mb_5blgp/Options.lb b/src/mainboard/asi/mb_5blgp/Options.lb
index f5854b3b7f1e..74b0d2040e4a 100644
--- a/src/mainboard/asi/mb_5blgp/Options.lb
+++ b/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
diff --git a/src/mainboard/asi/mb_5blmp/Options.lb b/src/mainboard/asi/mb_5blmp/Options.lb
index de9cd83c43ad..05fd34e7b8d5 100644
--- a/src/mainboard/asi/mb_5blmp/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/a8n_e/Options.lb b/src/mainboard/asus/a8n_e/Options.lb
index 468286957703..54e28795f08f 100644
--- a/src/mainboard/asus/a8n_e/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/a8v-e_se/Options.lb b/src/mainboard/asus/a8v-e_se/Options.lb
index 75c404dd9267..bda99157d5eb 100644
--- a/src/mainboard/asus/a8v-e_se/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/m2v-mx_se/Options.lb b/src/mainboard/asus/m2v-mx_se/Options.lb
index d1a08e2c7f1b..75925ea88519 100644
--- a/src/mainboard/asus/m2v-mx_se/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/mew-am/Options.lb b/src/mainboard/asus/mew-am/Options.lb
index c0837b2dda9b..3b259f0d1e6b 100644
--- a/src/mainboard/asus/mew-am/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/mew-vm/Options.lb b/src/mainboard/asus/mew-vm/Options.lb
index 71f854d1270c..728a6e5f9570 100644
--- a/src/mainboard/asus/mew-vm/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p2b-d/Options.lb b/src/mainboard/asus/p2b-d/Options.lb
index 2409c14956a0..d8b2f7509a6d 100644
--- a/src/mainboard/asus/p2b-d/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p2b-ds/Options.lb b/src/mainboard/asus/p2b-ds/Options.lb
index c069939fc502..37f5db3b6ef8 100644
--- a/src/mainboard/asus/p2b-ds/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p2b-f/Options.lb b/src/mainboard/asus/p2b-f/Options.lb
index 4d927e1fb8a8..c1d5bfd3a42a 100644
--- a/src/mainboard/asus/p2b-f/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p2b/Options.lb b/src/mainboard/asus/p2b/Options.lb
index db9fcecb2988..55c8568e85f3 100644
--- a/src/mainboard/asus/p2b/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p3b-f/Options.lb b/src/mainboard/asus/p3b-f/Options.lb
index 4d927e1fb8a8..c1d5bfd3a42a 100644
--- a/src/mainboard/asus/p3b-f/Options.lb
+++ b/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
diff --git a/src/mainboard/axus/tc320/Options.lb b/src/mainboard/axus/tc320/Options.lb
index 3fc2088f03c9..e89468ed6fd1 100644
--- a/src/mainboard/axus/tc320/Options.lb
+++ b/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
diff --git a/src/mainboard/azza/pt-6ibd/Options.lb b/src/mainboard/azza/pt-6ibd/Options.lb
index 4d927e1fb8a8..c1d5bfd3a42a 100644
--- a/src/mainboard/azza/pt-6ibd/Options.lb
+++ b/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
diff --git a/src/mainboard/bcom/winnet100/Options.lb b/src/mainboard/bcom/winnet100/Options.lb
index 2d18d267dddb..fdeaa7a2f5c2 100644
--- a/src/mainboard/bcom/winnet100/Options.lb
+++ b/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
diff --git a/src/mainboard/bcom/winnetp680/Options.lb b/src/mainboard/bcom/winnetp680/Options.lb
index a6e1cfae005e..8af26370bbc6 100644
--- a/src/mainboard/bcom/winnetp680/Options.lb
+++ b/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.
diff --git a/src/mainboard/biostar/m6tba/Options.lb b/src/mainboard/biostar/m6tba/Options.lb
index 4d927e1fb8a8..c1d5bfd3a42a 100644
--- a/src/mainboard/biostar/m6tba/Options.lb
+++ b/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
diff --git a/src/mainboard/broadcom/blast/Options.lb b/src/mainboard/broadcom/blast/Options.lb
index 4f8e7b06d826..983ea7409c5b 100644
--- a/src/mainboard/broadcom/blast/Options.lb
+++ b/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
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb b/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
index 4d927e1fb8a8..c1d5bfd3a42a 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
+++ b/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
diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb
index b6f853242a6b..199394a28b90 100644
--- a/src/mainboard/dell/s1850/Options.lb
+++ b/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
diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb
index aed66c00e7b9..91a04a7a433f 100644
--- a/src/mainboard/digitallogic/adl855pc/Options.lb
+++ b/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"
diff --git a/src/mainboard/digitallogic/msm586seg/Options.lb b/src/mainboard/digitallogic/msm586seg/Options.lb
index 68914e963c5e..c9bf9a60b214 100644
--- a/src/mainboard/digitallogic/msm586seg/Options.lb
+++ b/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"
diff --git a/src/mainboard/digitallogic/msm800sev/Options.lb b/src/mainboard/digitallogic/msm800sev/Options.lb
index c18a7c7ff046..b996a9df3ec5 100644
--- a/src/mainboard/digitallogic/msm800sev/Options.lb
+++ b/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
diff --git a/src/mainboard/eaglelion/5bcm/Options.lb b/src/mainboard/eaglelion/5bcm/Options.lb
index ad8fd926776b..5605c729e7cb 100644
--- a/src/mainboard/eaglelion/5bcm/Options.lb
+++ b/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
diff --git a/src/mainboard/embeddedplanet/ep405pc/Options.lb b/src/mainboard/embeddedplanet/ep405pc/Options.lb
index c61cc6d2c425..3fe18e71a9e1 100644
--- a/src/mainboard/embeddedplanet/ep405pc/Options.lb
+++ b/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
##
diff --git a/src/mainboard/emulation/qemu-x86/Options.lb b/src/mainboard/emulation/qemu-x86/Options.lb
index 191c6c6a4180..bf416a239132 100644
--- a/src/mainboard/emulation/qemu-x86/Options.lb
+++ b/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
diff --git a/src/mainboard/gigabyte/ga-6bxc/Options.lb b/src/mainboard/gigabyte/ga-6bxc/Options.lb
index 4d927e1fb8a8..c1d5bfd3a42a 100644
--- a/src/mainboard/gigabyte/ga-6bxc/Options.lb
+++ b/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
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Options.lb b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
index b84498b65861..f9f57ac9fef7 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
+++ b/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
diff --git a/src/mainboard/gigabyte/m57sli/Options.lb b/src/mainboard/gigabyte/m57sli/Options.lb
index 7f962710694c..640116d22037 100644
--- a/src/mainboard/gigabyte/m57sli/Options.lb
+++ b/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
diff --git a/src/mainboard/hp/dl145_g3/Options.lb b/src/mainboard/hp/dl145_g3/Options.lb
index 283e37a3be79..8f5222db86e5 100644
--- a/src/mainboard/hp/dl145_g3/Options.lb
+++ b/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
diff --git a/src/mainboard/ibm/e325/Options.lb b/src/mainboard/ibm/e325/Options.lb
index 475863c2caa2..21e39f975c5e 100644
--- a/src/mainboard/ibm/e325/Options.lb
+++ b/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
diff --git a/src/mainboard/ibm/e326/Options.lb b/src/mainboard/ibm/e326/Options.lb
index 8406ecf84b21..1d81372c54b3 100644
--- a/src/mainboard/ibm/e326/Options.lb
+++ b/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
diff --git a/src/mainboard/iei/juki-511p/Options.lb b/src/mainboard/iei/juki-511p/Options.lb
index acedd0f76565..8d8b039abfbf 100644
--- a/src/mainboard/iei/juki-511p/Options.lb
+++ b/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
diff --git a/src/mainboard/iei/nova4899r/Options.lb b/src/mainboard/iei/nova4899r/Options.lb
index 5072017fd556..1144648c1425 100644
--- a/src/mainboard/iei/nova4899r/Options.lb
+++ b/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
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb b/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
index 8da41c1b0476..9dac6822f422 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
+++ b/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
diff --git a/src/mainboard/intel/jarrell/Options.lb b/src/mainboard/intel/jarrell/Options.lb
index efa594a9c215..665b7d09310f 100644
--- a/src/mainboard/intel/jarrell/Options.lb
+++ b/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
diff --git a/src/mainboard/intel/mtarvon/Options.lb b/src/mainboard/intel/mtarvon/Options.lb
index f1e76b000eef..17ccf4bc649b 100644
--- a/src/mainboard/intel/mtarvon/Options.lb
+++ b/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
diff --git a/src/mainboard/intel/truxton/Options.lb b/src/mainboard/intel/truxton/Options.lb
index 48160b42f4a6..0c8fc291ec3c 100644
--- a/src/mainboard/intel/truxton/Options.lb
+++ b/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
diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb
index 2420b6a1af94..20289a2ee32a 100644
--- a/src/mainboard/intel/xe7501devkit/Options.lb
+++ b/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
diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb
index 1f08f6a60371..346cc6e64c54 100644
--- a/src/mainboard/iwill/dk8_htx/Options.lb
+++ b/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
diff --git a/src/mainboard/iwill/dk8s2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb
index e9a3bafc34c8..99204c4192ce 100644
--- a/src/mainboard/iwill/dk8s2/Options.lb
+++ b/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
diff --git a/src/mainboard/iwill/dk8x/Options.lb b/src/mainboard/iwill/dk8x/Options.lb
index 5b6cd23ed4f2..9249ee79e7c8 100644
--- a/src/mainboard/iwill/dk8x/Options.lb
+++ b/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
diff --git a/src/mainboard/jetway/j7f24/Options.lb b/src/mainboard/jetway/j7f24/Options.lb
index 0bc79aa26109..17e92c058e83 100644
--- a/src/mainboard/jetway/j7f24/Options.lb
+++ b/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.
diff --git a/src/mainboard/kontron/986lcd-m/Options.lb b/src/mainboard/kontron/986lcd-m/Options.lb
index 07c139f98a6e..f3e626bd2553 100644
--- a/src/mainboard/kontron/986lcd-m/Options.lb
+++ b/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
diff --git a/src/mainboard/lippert/frontrunner/Options.lb b/src/mainboard/lippert/frontrunner/Options.lb
index eff01c10875c..57f31b0b84b9 100644
--- a/src/mainboard/lippert/frontrunner/Options.lb
+++ b/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
diff --git a/src/mainboard/lippert/roadrunner-lx/Options.lb b/src/mainboard/lippert/roadrunner-lx/Options.lb
index 530c43ea788d..4ab90578d671 100644
--- a/src/mainboard/lippert/roadrunner-lx/Options.lb
+++ b/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
diff --git a/src/mainboard/lippert/spacerunner-lx/Options.lb b/src/mainboard/lippert/spacerunner-lx/Options.lb
index 805148b7f2c0..363e3d405e12 100644
--- a/src/mainboard/lippert/spacerunner-lx/Options.lb
+++ b/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
diff --git a/src/mainboard/motorola/sandpoint/Options.lb b/src/mainboard/motorola/sandpoint/Options.lb
index 7d50c39ce18e..af110025e179 100644
--- a/src/mainboard/motorola/sandpoint/Options.lb
+++ b/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-"
diff --git a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
index 1a47974bf87b..8a77cd2d83fb 100644
--- a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Options.lb
+++ b/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-"
diff --git a/src/mainboard/msi/ms6119/Options.lb b/src/mainboard/msi/ms6119/Options.lb
index feb32318c7be..dfba9224f60c 100644
--- a/src/mainboard/msi/ms6119/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms6147/Options.lb b/src/mainboard/msi/ms6147/Options.lb
index 79efc55c9fff..47a6dcbebe1d 100644
--- a/src/mainboard/msi/ms6147/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms6178/Options.lb b/src/mainboard/msi/ms6178/Options.lb
index 67f52f37e54e..6c09ca9225bb 100644
--- a/src/mainboard/msi/ms6178/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms7135/Options.lb b/src/mainboard/msi/ms7135/Options.lb
index e5f8ead7e58a..5fe20447ea50 100644
--- a/src/mainboard/msi/ms7135/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms7260/Options.lb b/src/mainboard/msi/ms7260/Options.lb
index 9c657d4d0b86..ea1a867a55f0 100644
--- a/src/mainboard/msi/ms7260/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms9185/Options.lb b/src/mainboard/msi/ms9185/Options.lb
index f6567040d89d..c08ab918cf86 100644
--- a/src/mainboard/msi/ms9185/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms9282/Options.lb b/src/mainboard/msi/ms9282/Options.lb
index bbcd92e9cafc..08f95345a6d9 100644
--- a/src/mainboard/msi/ms9282/Options.lb
+++ b/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
diff --git a/src/mainboard/nec/powermate2000/Options.lb b/src/mainboard/nec/powermate2000/Options.lb
index eae7cb6444aa..1475d6e2ad34 100644
--- a/src/mainboard/nec/powermate2000/Options.lb
+++ b/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
diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb
index 2766076ea98b..d72780a9f7b7 100644
--- a/src/mainboard/newisys/khepri/Options.lb
+++ b/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
diff --git a/src/mainboard/nvidia/l1_2pvv/Options.lb b/src/mainboard/nvidia/l1_2pvv/Options.lb
index 4f032fb7cff0..7c415b3897ec 100644
--- a/src/mainboard/nvidia/l1_2pvv/Options.lb
+++ b/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
diff --git a/src/mainboard/olpc/btest/Options.lb b/src/mainboard/olpc/btest/Options.lb
index 10e30df264e9..910bad4aa7d6 100644
--- a/src/mainboard/olpc/btest/Options.lb
+++ b/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
diff --git a/src/mainboard/olpc/rev_a/Options.lb b/src/mainboard/olpc/rev_a/Options.lb
index 10e30df264e9..910bad4aa7d6 100644
--- a/src/mainboard/olpc/rev_a/Options.lb
+++ b/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
diff --git a/src/mainboard/pcengines/alix1c/Options.lb b/src/mainboard/pcengines/alix1c/Options.lb
index 2696ab9b1dba..e7fe6d7657f2 100644
--- a/src/mainboard/pcengines/alix1c/Options.lb
+++ b/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
diff --git a/src/mainboard/rca/rm4100/Options.lb b/src/mainboard/rca/rm4100/Options.lb
index 1e3835341b92..e388528c3cec 100644
--- a/src/mainboard/rca/rm4100/Options.lb
+++ b/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
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb b/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb
index 9166a9042a3e..cb086c322ef5 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Options.lb
+++ b/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
diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb
index 104ff1471037..c8e2e73fed85 100644
--- a/src/mainboard/sunw/ultra40/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/h8dme/Options.lb b/src/mainboard/supermicro/h8dme/Options.lb
index d10e4b330474..d057f3a562d3 100644
--- a/src/mainboard/supermicro/h8dme/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/h8dmr/Options.lb b/src/mainboard/supermicro/h8dmr/Options.lb
index 16c798c2f831..c7d50c55b2af 100644
--- a/src/mainboard/supermicro/h8dmr/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dai_g/Options.lb b/src/mainboard/supermicro/x6dai_g/Options.lb
index 68562efad4d1..73eb82646838 100644
--- a/src/mainboard/supermicro/x6dai_g/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhe_g/Options.lb b/src/mainboard/supermicro/x6dhe_g/Options.lb
index 47eac1d624e1..50b3da430e1c 100644
--- a/src/mainboard/supermicro/x6dhe_g/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhe_g2/Options.lb b/src/mainboard/supermicro/x6dhe_g2/Options.lb
index 47eac1d624e1..50b3da430e1c 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhr_ig/Options.lb b/src/mainboard/supermicro/x6dhr_ig/Options.lb
index b6f853242a6b..199394a28b90 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Options.lb b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
index b6f853242a6b..199394a28b90 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Options.lb
+++ b/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
diff --git a/src/mainboard/technexion/tim8690/Options.lb b/src/mainboard/technexion/tim8690/Options.lb
index 0f8753254d1a..133a21de48fd 100644
--- a/src/mainboard/technexion/tim8690/Options.lb
+++ b/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
diff --git a/src/mainboard/technologic/ts5300/Options.lb b/src/mainboard/technologic/ts5300/Options.lb
index 461264a474e8..5fb92c63e450 100644
--- a/src/mainboard/technologic/ts5300/Options.lb
+++ b/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
diff --git a/src/mainboard/televideo/tc7020/Options.lb b/src/mainboard/televideo/tc7020/Options.lb
index 96f8739cccb2..2690850eadbe 100644
--- a/src/mainboard/televideo/tc7020/Options.lb
+++ b/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
diff --git a/src/mainboard/thomson/ip1000/Options.lb b/src/mainboard/thomson/ip1000/Options.lb
index b80c53f2d88b..0be45e1f0c0e 100644
--- a/src/mainboard/thomson/ip1000/Options.lb
+++ b/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
diff --git a/src/mainboard/totalimpact/briq/Options.lb b/src/mainboard/totalimpact/briq/Options.lb
index 07c18e1eed19..92af3dfc8667 100644
--- a/src/mainboard/totalimpact/briq/Options.lb
+++ b/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-"
diff --git a/src/mainboard/tyan/s1846/Options.lb b/src/mainboard/tyan/s1846/Options.lb
index 9f3680c3912d..51d570ba65d9 100644
--- a/src/mainboard/tyan/s1846/Options.lb
+++ b/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
diff --git a/src/mainboard/tyan/s2735/Options.lb b/src/mainboard/tyan/s2735/Options.lb
index 7a5d39b0a52e..b04ac4b74cb7 100644
--- a/src/mainboard/tyan/s2735/Options.lb
+++ b/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
diff --git a/src/mainboard/tyan/s2850/Options.lb b/src/mainboard/tyan/s2850/Options.lb
index 37814240beea..2ae529e2d11d 100644
--- a/src/mainboard/tyan/s2850/Options.lb
+++ b/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
diff --git a/src/mainboard/tyan/s2875/Options.lb b/src/mainboard/tyan/s2875/Options.lb
index 5eaa91acc636..ed0ffa8077a2 100644
--- a/src/mainboard/tyan/s2875/Options.lb
+++ b/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
diff --git a/src/mainboard/tyan/s2880/Options.lb b/src/mainboard/tyan/s2880/Options.lb
index 0a1c746f20dc..f2c72a95f583 100644
--- a/src/mainboard/tyan/s2880/Options.lb
+++ b/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
diff --git a/src/mainboard/tyan/s2881/Options.lb b/src/mainboard/tyan/s2881/Options.lb
index 18087be3d349..0618e5bf286a 100644
--- a/src/mainboard/tyan/s2881/Options.lb
+++ b/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
diff --git a/src/mainboard/tyan/s2882/Options.lb b/src/mainboard/tyan/s2882/Options.lb
index cfa2b679b9fb..6a2e4dfdd549 100644
--- a/src/mainboard/tyan/s2882/Options.lb
+++ b/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
diff --git a/src/mainboard/tyan/s2885/Options.lb b/src/mainboard/tyan/s2885/Options.lb
index 2bb668105706..f713aa46ffb6 100644
--- a/src/mainboard/tyan/s2885/Options.lb
+++ b/src/mainboard/tyan/s2885/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
@@ -217,7 +217,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
diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb
index d3cc2c2effb5..b333a64e399b 100644
--- a/src/mainboard/tyan/s2891/Options.lb
+++ b/src/mainboard/tyan/s2891/Options.lb
@@ -46,7 +46,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
@@ -246,7 +246,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
diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb
index efc4cba7a54a..f3ae0f81848d 100644
--- a/src/mainboard/tyan/s2892/Options.lb
+++ b/src/mainboard/tyan/s2892/Options.lb
@@ -46,7 +46,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
@@ -234,7 +234,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
diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb
index 58878494cd66..e47c6d80e2d8 100644
--- a/src/mainboard/tyan/s2895/Options.lb
+++ b/src/mainboard/tyan/s2895/Options.lb
@@ -49,7 +49,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
@@ -253,7 +253,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
diff --git a/src/mainboard/tyan/s2912/Options.lb b/src/mainboard/tyan/s2912/Options.lb
index a2166dd8b0e6..7009da0a96f5 100644
--- a/src/mainboard/tyan/s2912/Options.lb
+++ b/src/mainboard/tyan/s2912/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
@@ -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
diff --git a/src/mainboard/tyan/s2912_fam10/Options.lb b/src/mainboard/tyan/s2912_fam10/Options.lb
index 5d250e82a482..561e43b703c7 100644
--- a/src/mainboard/tyan/s2912_fam10/Options.lb
+++ b/src/mainboard/tyan/s2912_fam10/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_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
diff --git a/src/mainboard/tyan/s4880/Options.lb b/src/mainboard/tyan/s4880/Options.lb
index 05760e668cde..8821dadaba62 100644
--- a/src/mainboard/tyan/s4880/Options.lb
+++ b/src/mainboard/tyan/s4880/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
@@ -199,7 +199,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
diff --git a/src/mainboard/tyan/s4882/Options.lb b/src/mainboard/tyan/s4882/Options.lb
index 3ae897bb7c08..877a23688ae2 100644
--- a/src/mainboard/tyan/s4882/Options.lb
+++ b/src/mainboard/tyan/s4882/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
@@ -198,7 +198,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
diff --git a/src/mainboard/via/epia-cn/Options.lb b/src/mainboard/via/epia-cn/Options.lb
index b80f2a3277f1..7d45f613e8ba 100644
--- a/src/mainboard/via/epia-cn/Options.lb
+++ b/src/mainboard/via/epia-cn/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.
diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb
index aeb9521c0bab..9084a3dd5bbf 100644
--- a/src/mainboard/via/epia-m/Options.lb
+++ b/src/mainboard/via/epia-m/Options.lb
@@ -35,7 +35,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
@@ -128,7 +128,7 @@ default CONFIG_ROM_PAYLOAD = 1
##
default CONFIG_CROSS_COMPILE=""
default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
##
## Set this to the max PCI bus number you
diff --git a/src/mainboard/via/epia-m700/Options.lb b/src/mainboard/via/epia-m700/Options.lb
index c0fc338df588..881471eee29f 100644
--- a/src/mainboard/via/epia-m700/Options.lb
+++ b/src/mainboard/via/epia-m700/Options.lb
@@ -53,7 +53,7 @@ uses CONFIG_HAVE_MP_TABLE
uses CONFIG_HAVE_ACPI_TABLES
uses CONFIG_CROSS_COMPILE
uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
uses CONFIG_OBJCOPY
uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
@@ -134,7 +134,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_CBFS = 0
##
diff --git a/src/mainboard/via/epia/Options.lb b/src/mainboard/via/epia/Options.lb
index dd1bfb0753cf..effa477180f0 100644
--- a/src/mainboard/via/epia/Options.lb
+++ b/src/mainboard/via/epia/Options.lb
@@ -41,7 +41,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
# logging
@@ -138,7 +138,7 @@ default CONFIG_ROM_PAYLOAD = 1
##
default CONFIG_CROSS_COMPILE=""
default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
diff --git a/src/mainboard/via/pc2500e/Options.lb b/src/mainboard/via/pc2500e/Options.lb
index ee217383e5eb..5713f0c1726e 100644
--- a/src/mainboard/via/pc2500e/Options.lb
+++ b/src/mainboard/via/pc2500e/Options.lb
@@ -56,7 +56,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
@@ -103,7 +103,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"
default CONFIG_MAX_PCI_BUSES = 3
default CONFIG_CONSOLE_SERIAL8250 = 1
default CONFIG_TTYS0_BAUD = 115200
diff --git a/src/mainboard/via/vt8454c/Options.lb b/src/mainboard/via/vt8454c/Options.lb
index d9ba74c01b7d..8f6dbed15ee0 100644
--- a/src/mainboard/via/vt8454c/Options.lb
+++ b/src/mainboard/via/vt8454c/Options.lb
@@ -60,7 +60,7 @@ uses CONFIG_CBFS
# compiler specifics
uses CONFIG_CROSS_COMPILE
uses CC
-uses CONFIG_HOSTCC
+uses HOSTCC
uses CONFIG_OBJCOPY
# Console specifics
@@ -185,7 +185,7 @@ default CONFIG_ROM_PAYLOAD = 1
##
default CONFIG_CROSS_COMPILE=""
default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
-default CONFIG_HOSTCC="gcc"
+default HOSTCC="gcc"
##
## Set this to the max PCI bus number you
diff --git a/src/northbridge/amd/amdk8/Config.lb b/src/northbridge/amd/amdk8/Config.lb
index 40de82e04ddb..149a5421b037 100644
--- a/src/northbridge/amd/amdk8/Config.lb
+++ b/src/northbridge/amd/amdk8/Config.lb
@@ -16,7 +16,7 @@ if CONFIG_K8_REV_F_SUPPORT
makerule raminit_test
depends "$(TOP)/src/northbridge/amd/amdk8/raminit_test.c"
depends "$(TOP)/src/northbridge/amd/amdk8/raminit_f.c"
- action "$(CONFIG_HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@"
+ action "$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@"
end
else
@@ -24,7 +24,7 @@ else
makerule raminit_test
depends "$(TOP)/src/northbridge/amd/amdk8/raminit_test.c"
depends "$(TOP)/src/northbridge/amd/amdk8/raminit.c"
- action "$(CONFIG_HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@"
+ action "$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@"
end
end
diff --git a/src/northbridge/intel/e7520/Config.lb b/src/northbridge/intel/e7520/Config.lb
index dbbd3aae24af..327b37942ab1 100644
--- a/src/northbridge/intel/e7520/Config.lb
+++ b/src/northbridge/intel/e7520/Config.lb
@@ -12,5 +12,5 @@ default CONFIG_HAVE_HIGH_TABLES=1
makerule raminit_test
depends "$(TOP)/src/northbridge/intel/e7520/raminit_test.c"
depends "$(TOP)/src/northbridge/intel/e7520/raminit.c"
- action "$(CONFIG_HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@"
+ action "$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@"
end
diff --git a/src/northbridge/intel/e7525/Config.lb b/src/northbridge/intel/e7525/Config.lb
index fc3253d0ff3a..3f2738bb1a06 100644
--- a/src/northbridge/intel/e7525/Config.lb
+++ b/src/northbridge/intel/e7525/Config.lb
@@ -12,5 +12,5 @@ default CONFIG_HAVE_HIGH_TABLES=1
makerule raminit_test
depends "$(TOP)/src/northbridge/intel/e7525/raminit_test.c"
depends "$(TOP)/src/northbridge/intel/e7525/raminit.c"
- action "$(CONFIG_HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@"
+ action "$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) -Wno-unused-function -I$(TOP)/src/include -g $< -o $@"
end