diff options
| author | Patrick Georgi <patrick@georgi-clan.de> | 2014-05-17 14:02:08 +0200 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2014-05-17 21:14:41 +0200 |
| commit | 4ebd3d9195731721e777186d6f78531bba29497e (patch) | |
| tree | 1b01b13dc3b2cf27d3e0a023609baa382befecb8 /toolchain.inc | |
| parent | b83f7deb78fbc440a42db47eaa0605e116d9d28e (diff) | |
| download | coreboot-4ebd3d9195731721e777186d6f78531bba29497e.tar.gz coreboot-4ebd3d9195731721e777186d6f78531bba29497e.tar.bz2 coreboot-4ebd3d9195731721e777186d6f78531bba29497e.zip | |
build: kill one indirection
No need to first define X86_32 and then replace every
single use of it with its lower cased equivalent.
Just start out with the lower case versions in the first
place.
Change-Id: I1e771ef443db1b8d34018d19a64a9ee489cd8133
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/5767
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'toolchain.inc')
| -rw-r--r-- | toolchain.inc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/toolchain.inc b/toolchain.inc index f666e0cc529a..d998a7eca480 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -17,10 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ARCH_SUPPORTED := ARMV7 X86_32 - -ARCH_TO_TOOLCHAIN_X86_32 := x86_32 -ARCH_TO_TOOLCHAIN_ARMV7 := armv7 +ARCH_SUPPORTED := armv7 x86_32 COREBOOT_STANDARD_STAGES := bootblock romstage ramstage @@ -38,8 +35,8 @@ CFLAGS_armv7 = \ toolchain_to_dir = \ $(foreach arch,$(ARCH_SUPPORTED),\ - $(eval CPPFLAGS_$(ARCH_TO_TOOLCHAIN_$(arch)) = \ - -Isrc/arch/$(ARCHDIR-$(ARCH_TO_TOOLCHAIN_$(arch)))/include)) + $(eval CPPFLAGS_$(arch) = \ + -Isrc/arch/$(ARCHDIR-$(arch))/include)) # set_stage_toolchain: Decides the toolchain to be used by every stage # E.g.: If bootblock is x86_32, it sets ARCH-BOOTBLOCK-y = x86_32, whereas @@ -49,7 +46,7 @@ toolchain_to_dir = \ # stages i.e. bootblock, romstage and ramstage, since it acts as the second # parameter to create_class_compiler below in init_standard_toolchain set_stage_toolchain= \ - $(foreach arch,$(ARCH_SUPPORTED),$(eval ARCH-$(1)-$(CONFIG_ARCH_$(1)_$(arch)) := $(ARCH_TO_TOOLCHAIN_$(arch)))) + $(foreach arch,$(ARCH_SUPPORTED),$(eval ARCH-$(1)-$($(shell echo CONFIG_ARCH_$(1)_$(arch) | tr '[:lower:]' '[:upper:]')) := $(arch))) # create_class_compiler: Used to create compiler tool set for # special classes @@ -73,9 +70,8 @@ endef # initialize standard toolchain (CC,AS and others) for give stage # @1 : stage for which the toolchain is to be initialized init_standard_toolchain = \ - $(eval stage_caps := $(shell printf "%s" $(1) | tr '[:lower:]' '[:upper:]' )) \ - $(eval $(call set_stage_toolchain,$(stage_caps))) \ - $(eval $(call create_class_compiler,$(1),$(ARCH-$(stage_caps)-y))) \ + $(eval $(call set_stage_toolchain,$(1))) \ + $(eval $(call create_class_compiler,$(1),$(ARCH-$(1)-y))) \ $(eval $(call set_stage_libgcc,$(1))) init_stages = \ |