summaryrefslogtreecommitdiff
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
parent36f230eefb5a072240447fdbe1aa81ad1bb80072 (diff)
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
-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
-rw-r--r--targets/amd/dbm690t/Config-abuild.lb2
-rw-r--r--targets/amd/pistachio/Config-abuild.lb2
-rw-r--r--targets/amd/serengeti_cheetah/Config-abuild.lb2
-rw-r--r--targets/amd/serengeti_cheetah_fam10/Config-abuild.lb2
-rw-r--r--targets/arima/hdama/Config-abuild.lb2
-rw-r--r--targets/asus/a8n_e/Config-abuild.lb2
-rw-r--r--targets/asus/m2v-mx_se/Config-abuild.lb2
-rw-r--r--targets/bcom/winnetp680/Config-abuild.lb2
-rw-r--r--targets/digitallogic/msm586seg/Config-abuild.lb2
-rw-r--r--targets/emulation/qemu-x86/Config-abuild.lb2
-rw-r--r--targets/gigabyte/ga_2761gxdk/Config-abuild.lb2
-rw-r--r--targets/gigabyte/m57sli/Config-abuild.lb2
-rw-r--r--targets/ibm/e326/Config-abuild.lb2
-rw-r--r--targets/iei/juki-511p/Config-abuild.lb2
-rw-r--r--targets/iwill/dk8_htx/Config-abuild.lb2
-rw-r--r--targets/jetway/j7f24/Config-abuild.lb2
-rw-r--r--targets/kontron/986lcd-m/Config-abuild.lb2
-rw-r--r--targets/msi/ms7135/Config-abuild.lb2
-rw-r--r--targets/msi/ms7260/Config-abuild.lb2
-rw-r--r--targets/msi/ms9185/Config-abuild.lb2
-rw-r--r--targets/msi/ms9282/Config-abuild.lb2
-rw-r--r--targets/nvidia/l1_2pvv/Config-abuild.lb2
-rw-r--r--targets/rca/rm4100/Config-abuild.lb2
-rw-r--r--targets/supermicro/h8dme/Config-abuild.lb2
-rw-r--r--targets/supermicro/h8dmr/Config-abuild.lb2
-rw-r--r--targets/technexion/tim8690/Config-abuild.lb2
-rw-r--r--targets/technologic/ts5300/Config-abuild.lb2
-rw-r--r--targets/thomson/ip1000/Config-abuild.lb2
-rw-r--r--targets/tyan/s2891/Config-abuild.lb2
-rw-r--r--targets/tyan/s2892/Config-abuild.lb2
-rw-r--r--targets/tyan/s2895/Config-abuild.lb2
-rw-r--r--targets/tyan/s2912/Config-abuild.lb2
-rw-r--r--targets/tyan/s2912_fam10/Config-abuild.lb2
-rw-r--r--targets/via/epia-cn/Config-abuild.lb2
-rw-r--r--targets/via/epia-m/Config-abuild.lb2
-rw-r--r--targets/via/pc2500e/Config-abuild.lb2
-rw-r--r--targets/via/vt8454c/Config-abuild.lb2
-rwxr-xr-xutil/abuild/abuild2
-rw-r--r--util/cbfstool/Makefile6
-rw-r--r--util/cbfstool/tools/Makefile2
157 files changed, 272 insertions, 272 deletions
diff --git a/src/arch/i386/Config.lb b/src/arch/i386/Config.lb
index 6a851a5cb7..1691d29a79 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 5ca864db3f..25b2127bb9 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 428e657a9d..08f9839823 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 4d927e1fb8..c1d5bfd3a4 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 feb32318c7..dfba9224f6 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 55255c120e..108037a62c 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 43bbd6b3dd..4031a060b1 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 06a0e386ce..3745383856 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 8835d2997d..d2d9ea2fa9 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 fc71fdb24c..7f62ddb568 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 321c4d292d..539a2994f9 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 eff01c1087..57f31b0b84 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 68d3f10b2f..632c259ced 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 cd5f586ca7..ecff75c91b 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 6f83531541..b7de4eb6d4 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 3fa9ae27ce..44b98e79c4 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 f5854b3b7f..74b0d2040e 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 de9cd83c43..05fd34e7b8 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 4682869577..54e28795f0 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 75c404dd92..bda99157d5 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 d1a08e2c7f..75925ea885 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 c0837b2dda..3b259f0d1e 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 71f854d127..728a6e5f95 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 2409c14956..d8b2f7509a 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 c069939fc5..37f5db3b6e 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 4d927e1fb8..c1d5bfd3a4 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 db9fcecb29..55c8568e85 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 4d927e1fb8..c1d5bfd3a4 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 3fc2088f03..e89468ed6f 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 4d927e1fb8..c1d5bfd3a4 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 2d18d267dd..fdeaa7a2f5 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 a6e1cfae00..8af26370bb 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 4d927e1fb8..c1d5bfd3a4 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 4f8e7b06d8..983ea7409c 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 4d927e1fb8..c1d5bfd3a4 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 b6f853242a..199394a28b 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 aed66c00e7..91a04a7a43 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 68914e963c..c9bf9a60b2 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 c18a7c7ff0..b996a9df3e 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 ad8fd92677..5605c729e7 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 c61cc6d2c4..3fe18e71a9 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 191c6c6a41..bf416a2391 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 4d927e1fb8..c1d5bfd3a4 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 b84498b658..f9f57ac9fe 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 7f96271069..640116d220 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 283e37a3be..8f5222db86 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 475863c2ca..21e39f975c 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 8406ecf84b..1d81372c54 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 acedd0f765..8d8b039abf 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 5072017fd5..1144648c14 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 8da41c1b04..9dac6822f4 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 efa594a9c2..665b7d0931 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 f1e76b000e..17ccf4bc64 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 48160b42f4..0c8fc291ec 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 2420b6a1af..20289a2ee3 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 1f08f6a603..346cc6e64c 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 e9a3bafc34..99204c4192 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 5b6cd23ed4..9249ee79e7 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 0bc79aa261..17e92c058e 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 07c139f98a..f3e626bd25 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 eff01c1087..57f31b0b84 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 530c43ea78..4ab90578d6 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 805148b7f2..363e3d405e 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 7d50c39ce1..af110025e1 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 1a47974bf8..8a77cd2d83 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 feb32318c7..dfba9224f6 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 79efc55c9f..47a6dcbebe 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 67f52f37e5..6c09ca9225 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 e5f8ead7e5..5fe20447ea 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 9c657d4d0b..ea1a867a55 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 f6567040d8..c08ab918cf 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 bbcd92e9ca..08f95345a6 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 eae7cb6444..1475d6e2ad 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 2766076ea9..d72780a9f7 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 4f032fb7cf..7c415b3897 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 10e30df264..910bad4aa7 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 10e30df264..910bad4aa7 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 2696ab9b1d..e7fe6d7657 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 1e3835341b..e388528c3c 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 9166a9042a..cb086c322e 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 104ff14710..c8e2e73fed 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 d10e4b3304..d057f3a562 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 16c798c2f8..c7d50c55b2 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 68562efad4..73eb826468 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 47eac1d624..50b3da430e 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 47eac1d624..50b3da430e 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 b6f853242a..199394a28b 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 b6f853242a..199394a28b 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 0f8753254d..133a21de48 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 461264a474..5fb92c63e4 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 96f8739ccc..2690850ead 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 b80c53f2d8..0be45e1f0c 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 07c18e1eed..92af3dfc86 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 9f3680c391..51d570ba65 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 7a5d39b0a5..b04ac4b74c 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 37814240be..2ae529e2d1 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 5eaa91acc6..ed0ffa8077 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 0a1c746f20..f2c72a95f5 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 18087be3d3..0618e5bf28 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 cfa2b679b9..6a2e4dfdd5 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 2bb6681057..f713aa46ff 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 d3cc2c2eff..b333a64e39 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 efc4cba7a5..f3ae0f8184 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 58878494cd..e47c6d80e2 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 a2166dd8b0..7009da0a96 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 5d250e82a4..561e43b703 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 05760e668c..8821dadaba 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 3ae897bb7c..877a23688a 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 b80f2a3277..7d45f613e8 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 aeb9521c0b..9084a3dd5b 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 c0fc338df5..881471eee2 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 dd1bfb0753..effa477180 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 ee217383e5..5713f0c172 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 d9ba74c01b..8f6dbed15e 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 40de82e04d..149a5421b0 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 dbbd3aae24..327b37942a 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 fc3253d0ff..3f2738bb1a 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
diff --git a/targets/amd/dbm690t/Config-abuild.lb b/targets/amd/dbm690t/Config-abuild.lb
index e299413a2d..4653933ad1 100644
--- a/targets/amd/dbm690t/Config-abuild.lb
+++ b/targets/amd/dbm690t/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/amd/pistachio/Config-abuild.lb b/targets/amd/pistachio/Config-abuild.lb
index e299413a2d..4653933ad1 100644
--- a/targets/amd/pistachio/Config-abuild.lb
+++ b/targets/amd/pistachio/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/amd/serengeti_cheetah/Config-abuild.lb b/targets/amd/serengeti_cheetah/Config-abuild.lb
index b1c927705b..683a874ad4 100644
--- a/targets/amd/serengeti_cheetah/Config-abuild.lb
+++ b/targets/amd/serengeti_cheetah/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb b/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
index 6892a0eaa2..ba6c58a73c 100644
--- a/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
+++ b/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/arima/hdama/Config-abuild.lb b/targets/arima/hdama/Config-abuild.lb
index 03331da64c..12c3abf1eb 100644
--- a/targets/arima/hdama/Config-abuild.lb
+++ b/targets/arima/hdama/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/asus/a8n_e/Config-abuild.lb b/targets/asus/a8n_e/Config-abuild.lb
index b1c927705b..683a874ad4 100644
--- a/targets/asus/a8n_e/Config-abuild.lb
+++ b/targets/asus/a8n_e/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/asus/m2v-mx_se/Config-abuild.lb b/targets/asus/m2v-mx_se/Config-abuild.lb
index d7357a7467..08115a7047 100644
--- a/targets/asus/m2v-mx_se/Config-abuild.lb
+++ b/targets/asus/m2v-mx_se/Config-abuild.lb
@@ -22,7 +22,7 @@ mainboard asus/m2v-mx_se
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
## CONFIG_ROM_SIZE is the total number of bytes allocated for coreboot use
## (normal AND fallback images and payloads).
diff --git a/targets/bcom/winnetp680/Config-abuild.lb b/targets/bcom/winnetp680/Config-abuild.lb
index 2a65acae0d..620685b701 100644
--- a/targets/bcom/winnetp680/Config-abuild.lb
+++ b/targets/bcom/winnetp680/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/digitallogic/msm586seg/Config-abuild.lb b/targets/digitallogic/msm586seg/Config-abuild.lb
index 9b5b027c16..a6b1ddcad5 100644
--- a/targets/digitallogic/msm586seg/Config-abuild.lb
+++ b/targets/digitallogic/msm586seg/Config-abuild.lb
@@ -3,7 +3,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/emulation/qemu-x86/Config-abuild.lb b/targets/emulation/qemu-x86/Config-abuild.lb
index 0d537cad91..27fba1acc9 100644
--- a/targets/emulation/qemu-x86/Config-abuild.lb
+++ b/targets/emulation/qemu-x86/Config-abuild.lb
@@ -3,7 +3,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
index 14e83807e8..fd3fa4822b 100644
--- a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
@@ -24,7 +24,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/gigabyte/m57sli/Config-abuild.lb b/targets/gigabyte/m57sli/Config-abuild.lb
index b1c927705b..683a874ad4 100644
--- a/targets/gigabyte/m57sli/Config-abuild.lb
+++ b/targets/gigabyte/m57sli/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/ibm/e326/Config-abuild.lb b/targets/ibm/e326/Config-abuild.lb
index 03331da64c..12c3abf1eb 100644
--- a/targets/ibm/e326/Config-abuild.lb
+++ b/targets/ibm/e326/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/iei/juki-511p/Config-abuild.lb b/targets/iei/juki-511p/Config-abuild.lb
index f26e780cf3..7ad4c05735 100644
--- a/targets/iei/juki-511p/Config-abuild.lb
+++ b/targets/iei/juki-511p/Config-abuild.lb
@@ -3,7 +3,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/iwill/dk8_htx/Config-abuild.lb b/targets/iwill/dk8_htx/Config-abuild.lb
index b1c927705b..683a874ad4 100644
--- a/targets/iwill/dk8_htx/Config-abuild.lb
+++ b/targets/iwill/dk8_htx/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/jetway/j7f24/Config-abuild.lb b/targets/jetway/j7f24/Config-abuild.lb
index 2a65acae0d..620685b701 100644
--- a/targets/jetway/j7f24/Config-abuild.lb
+++ b/targets/jetway/j7f24/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/kontron/986lcd-m/Config-abuild.lb b/targets/kontron/986lcd-m/Config-abuild.lb
index ac903d16e9..67fc542618 100644
--- a/targets/kontron/986lcd-m/Config-abuild.lb
+++ b/targets/kontron/986lcd-m/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/msi/ms7135/Config-abuild.lb b/targets/msi/ms7135/Config-abuild.lb
index b1c927705b..683a874ad4 100644
--- a/targets/msi/ms7135/Config-abuild.lb
+++ b/targets/msi/ms7135/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/msi/ms7260/Config-abuild.lb b/targets/msi/ms7260/Config-abuild.lb
index f30a9b367e..988e33b351 100644
--- a/targets/msi/ms7260/Config-abuild.lb
+++ b/targets/msi/ms7260/Config-abuild.lb
@@ -23,7 +23,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/msi/ms9185/Config-abuild.lb b/targets/msi/ms9185/Config-abuild.lb
index 3baa41a42a..c88403e300 100644
--- a/targets/msi/ms9185/Config-abuild.lb
+++ b/targets/msi/ms9185/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/msi/ms9282/Config-abuild.lb b/targets/msi/ms9282/Config-abuild.lb
index 3baa41a42a..c88403e300 100644
--- a/targets/msi/ms9282/Config-abuild.lb
+++ b/targets/msi/ms9282/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/nvidia/l1_2pvv/Config-abuild.lb b/targets/nvidia/l1_2pvv/Config-abuild.lb
index b1c927705b..683a874ad4 100644
--- a/targets/nvidia/l1_2pvv/Config-abuild.lb
+++ b/targets/nvidia/l1_2pvv/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/rca/rm4100/Config-abuild.lb b/targets/rca/rm4100/Config-abuild.lb
index d7c1ec2c18..78a4bcbfc1 100644
--- a/targets/rca/rm4100/Config-abuild.lb
+++ b/targets/rca/rm4100/Config-abuild.lb
@@ -23,7 +23,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/supermicro/h8dme/Config-abuild.lb b/targets/supermicro/h8dme/Config-abuild.lb
index 7e93e76234..11a2ae53e5 100644
--- a/targets/supermicro/h8dme/Config-abuild.lb
+++ b/targets/supermicro/h8dme/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/supermicro/h8dmr/Config-abuild.lb b/targets/supermicro/h8dmr/Config-abuild.lb
index 683f9704f1..2c97443c6e 100644
--- a/targets/supermicro/h8dmr/Config-abuild.lb
+++ b/targets/supermicro/h8dmr/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/technexion/tim8690/Config-abuild.lb b/targets/technexion/tim8690/Config-abuild.lb
index 4e65fac881..b47f5ce851 100644
--- a/targets/technexion/tim8690/Config-abuild.lb
+++ b/targets/technexion/tim8690/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/technologic/ts5300/Config-abuild.lb b/targets/technologic/ts5300/Config-abuild.lb
index 2b619bf21a..82566654e7 100644
--- a/targets/technologic/ts5300/Config-abuild.lb
+++ b/targets/technologic/ts5300/Config-abuild.lb
@@ -3,7 +3,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/thomson/ip1000/Config-abuild.lb b/targets/thomson/ip1000/Config-abuild.lb
index bdacc46478..f6061283e2 100644
--- a/targets/thomson/ip1000/Config-abuild.lb
+++ b/targets/thomson/ip1000/Config-abuild.lb
@@ -23,7 +23,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/tyan/s2891/Config-abuild.lb b/targets/tyan/s2891/Config-abuild.lb
index bc651b964d..40620c073a 100644
--- a/targets/tyan/s2891/Config-abuild.lb
+++ b/targets/tyan/s2891/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/tyan/s2892/Config-abuild.lb b/targets/tyan/s2892/Config-abuild.lb
index bc651b964d..40620c073a 100644
--- a/targets/tyan/s2892/Config-abuild.lb
+++ b/targets/tyan/s2892/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/tyan/s2895/Config-abuild.lb b/targets/tyan/s2895/Config-abuild.lb
index b1c927705b..683a874ad4 100644
--- a/targets/tyan/s2895/Config-abuild.lb
+++ b/targets/tyan/s2895/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/tyan/s2912/Config-abuild.lb b/targets/tyan/s2912/Config-abuild.lb
index b1c927705b..683a874ad4 100644
--- a/targets/tyan/s2912/Config-abuild.lb
+++ b/targets/tyan/s2912/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/tyan/s2912_fam10/Config-abuild.lb b/targets/tyan/s2912_fam10/Config-abuild.lb
index 6c075c3d11..36284fcb0c 100644
--- a/targets/tyan/s2912_fam10/Config-abuild.lb
+++ b/targets/tyan/s2912_fam10/Config-abuild.lb
@@ -23,7 +23,7 @@ mainboard tyan/s2912_fam10
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/via/epia-cn/Config-abuild.lb b/targets/via/epia-cn/Config-abuild.lb
index 2a65acae0d..620685b701 100644
--- a/targets/via/epia-cn/Config-abuild.lb
+++ b/targets/via/epia-cn/Config-abuild.lb
@@ -5,7 +5,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/via/epia-m/Config-abuild.lb b/targets/via/epia-m/Config-abuild.lb
index 85066ba0d7..86371433b0 100644
--- a/targets/via/epia-m/Config-abuild.lb
+++ b/targets/via/epia-m/Config-abuild.lb
@@ -3,7 +3,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/via/pc2500e/Config-abuild.lb b/targets/via/pc2500e/Config-abuild.lb
index b7bd85b8af..5ab1923854 100644
--- a/targets/via/pc2500e/Config-abuild.lb
+++ b/targets/via/pc2500e/Config-abuild.lb
@@ -23,7 +23,7 @@ mainboard VENDOR/MAINBOARD
option CC = "CROSSCC"
option CONFIG_CROSS_COMPILE = "CROSS_PREFIX"
-option CONFIG_HOSTCC = "CROSS_HOSTCC"
+option HOSTCC = "CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/targets/via/vt8454c/Config-abuild.lb b/targets/via/vt8454c/Config-abuild.lb
index eb67dfae96..f4f35c52dd 100644
--- a/targets/via/vt8454c/Config-abuild.lb
+++ b/targets/via/vt8454c/Config-abuild.lb
@@ -26,7 +26,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
option CONFIG_ROM_SIZE=512*1024
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 4ded37b29b..11dbea2fe3 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -166,7 +166,7 @@ mainboard VENDOR/MAINBOARD
option CC="CROSSCC"
option CONFIG_CROSS_COMPILE="CROSS_PREFIX"
-option CONFIG_HOSTCC="CROSS_HOSTCC"
+option HOSTCC="CROSS_HOSTCC"
__COMPRESSION__
__LOGLEVEL__
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 7dc83fd2e4..50f97961bc 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -8,7 +8,7 @@ COMMANDS=create.o bootblock.o delete.o extract.o add.o print.o resize.o
OBJ=$(COMMANDS) cbfstool.o util.o fs.o
INC=cbfstool.h cbfs.h
-CONFIG_HOSTCC ?= gcc
+HOSTCC ?= gcc
HOSTCXX ?= g++
CFLAGS=-g -Wall -W -Werror
@@ -18,7 +18,7 @@ DESTDIR ?= /usr/local/bin
all: $(obj)/cbfstool $(obj)/tools/cbfs-mkpayload $(obj)/tools/cbfs-mkstage
$(obj)/cbfstool: $(patsubst %,$(obj)/%,$(OBJ))
- $(CONFIG_HOSTCC) -o $@ $(patsubst %,$(obj)/%,$(OBJ))
+ $(HOSTCC) -o $@ $(patsubst %,$(obj)/%,$(OBJ))
tobj = $(obj)/tools
tsrc = $(shell pwd)/tools
@@ -26,7 +26,7 @@ tsrc = $(shell pwd)/tools
include $(tsrc)/Makefile
$(obj)/%.o: %.c $(INC)
- $(CONFIG_HOSTCC) $(CFLAGS) -c -o $@ $<
+ $(HOSTCC) $(CFLAGS) -c -o $@ $<
install: $(obj)/cbfstool $(obj)/tools/cbfs-mkpayload $(obj)/tools/cbfs-mkstage
@ install -d $(DESTDIR)
diff --git a/util/cbfstool/tools/Makefile b/util/cbfstool/tools/Makefile
index 3bb8f5dff5..e750c21bd7 100644
--- a/util/cbfstool/tools/Makefile
+++ b/util/cbfstool/tools/Makefile
@@ -18,7 +18,7 @@ $(tobj)/cbfs-mkpayload: $(tobj)/cbfs-mkpayload.o $(patsubst %,$(tobj)/%,$(COMMON
$(HOSTCXX) $(CFLAGS) -o $@ $^
$(tobj)/%.o: %.c
- $(CONFIG_HOSTCC) $(CFLAGS) -c -o $@ $<
+ $(HOSTCC) $(CFLAGS) -c -o $@ $<
tools-clean:
rm -f $(tobj)/cbfs-mkpayload.o $(tobj)/cbfs-mkstage.o $(patsubst %,$(tobj)/%,$(COMMON))