diff options
| -rw-r--r-- | Makefile.inc | 2 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/Makefile.inc | 2 | ||||
| -rw-r--r-- | toolchain.inc | 16 |
3 files changed, 8 insertions, 12 deletions
diff --git a/Makefile.inc b/Makefile.inc index 9e4c6b0f64..d098cff291 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -149,7 +149,7 @@ smm-c-deps:=$$(OPTION_TABLE_H) define ramstage-objs_asl_template $(obj)/$(1).ramstage.o: src/$(1).asl $(obj)/config.h @printf " IASL $$(subst $(top)/,,$$(@))\n" - $(CC_ramstage) -x assembler-with-cpp -E -MMD -MT $$(@) -D__ACPI__ -P -include $(src)/include/kconfig.h -I$(obj) -I$(src) -I$(src)/include -I$(src)/arch/$(ARCHDIR-$(ARCH-RAMSTAGE-y))/include -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl + $(CC_ramstage) -x assembler-with-cpp -E -MMD -MT $$(@) -D__ACPI__ -P -include $(src)/include/kconfig.h -I$(obj) -I$(src) -I$(src)/include -I$(src)/arch/$(ARCHDIR-$(ARCH-ramstage-y))/include -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl cd $$(dir $$@); $(IASL) -p $$(notdir $$@) -tc $$(notdir $$(basename $$@)).asl mv $$(basename $$@).hex $$(basename $$@).c $(CC_ramstage) $$(CFLAGS_ramstage) $$(CPPFLAGS_ramstage) $$(if $$(subst dsdt,,$$(basename $$(notdir $(1)))), -DAmlCode=AmlCode_$$(basename $$(notdir $(1)))) -c -o $$@ $$(basename $$@).c diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 80a0da92a8..a875303e25 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -44,7 +44,7 @@ VB_LIB = $(obj)/external/vboot_reference/vboot_fw.a # up all components in one of the three stages of coreboot, vboot seems # most logical to fall under the romstage. Thus, all references to arch # and other compiler stuff for vboot is using the romstage arch. -VB_FIRMWARE_ARCH := $(ARCHDIR-$(ARCH-ROMSTAGE-y)) +VB_FIRMWARE_ARCH := $(ARCHDIR-$(ARCH-romstage-y)) VB_SOURCE := vboot_reference # Add the vboot include paths. diff --git a/toolchain.inc b/toolchain.inc index f666e0cc52..d998a7eca4 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 = \ |