From b8a3790615d9205b23aa087a64deb9bdcc72eedb Mon Sep 17 00:00:00 2001 From: Wei-Han Chen Date: Thu, 16 Aug 2018 05:16:08 +0000 Subject: Revert "**/build.mk: Set CROSS_COMPILE* to point to coreboot-sdk" This reverts commit bcd6842fb861b99588039b0bb72fafd92853525e. Reason for revert: This breaks whiskers. Original change's description: > **/build.mk: Set CROSS_COMPILE* to point to coreboot-sdk > > board/servo_v4 used it already but doesn't need the override anymore, > nds32 also used it, therefore no change. > > BUG=chromium:851727,b:65441143 > BRANCH=none > TEST=builds with the new compiler > > Change-Id: I59a7181b87293da2a8515b158c17417b5ba05404 > Signed-off-by: Patrick Georgi > Reviewed-on: https://chromium-review.googlesource.com/1172974 > Commit-Ready: Patrick Georgi > Tested-by: Patrick Georgi > Reviewed-by: Stefan Reinauer Bug: chromium:851727, b:65441143 Change-Id: If09eca04efc6461b951879ad528832bc50ca50d2 Reviewed-on: https://chromium-review.googlesource.com/1177221 Commit-Ready: ChromeOS CL Exonerator Bot Tested-by: Wei-Han Chen Tested-by: Nicolas Boichat Reviewed-by: Nicolas Boichat --- board/servo_v4/build.mk | 2 ++ core/cortex-m/build.mk | 3 +-- core/cortex-m0/build.mk | 3 +-- core/minute-ia/build.mk | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/board/servo_v4/build.mk b/board/servo_v4/build.mk index 6336bbfab6..6f757633f0 100644 --- a/board/servo_v4/build.mk +++ b/board/servo_v4/build.mk @@ -9,6 +9,8 @@ CHIP:=stm32 CHIP_FAMILY:=stm32f0 CHIP_VARIANT:=stm32f07x +$(call set-option,CROSS_COMPILE_arm,$(CROSS_COMPILE_arm),\ + /opt/coreboot-sdk/bin/arm-eabi-) # Not enough SRAM: Disable all tests test-list-y= diff --git a/core/cortex-m/build.mk b/core/cortex-m/build.mk index c46518683b..b07a2914de 100644 --- a/core/cortex-m/build.mk +++ b/core/cortex-m/build.mk @@ -7,8 +7,7 @@ # # Select ARMv7-m bare-metal toolchain -$(call set-option,CROSS_COMPILE,$(CROSS_COMPILE_arm),\ - /opt/coreboot-sdk/bin/arm-eabi-) +$(call set-option,CROSS_COMPILE,$(CROSS_COMPILE_arm),arm-none-eabi-) # FPU compilation flags CFLAGS_FPU-$(CONFIG_FPU)=-mfpu=fpv4-sp-d16 -mfloat-abi=hard diff --git a/core/cortex-m0/build.mk b/core/cortex-m0/build.mk index fedf646640..2023bd9607 100644 --- a/core/cortex-m0/build.mk +++ b/core/cortex-m0/build.mk @@ -7,8 +7,7 @@ # # Select ARMv6-m compatible bare-metal toolchain -$(call set-option,CROSS_COMPILE,$(CROSS_COMPILE_arm),\ - /opt/coreboot-sdk/bin/arm-eabi-) +$(call set-option,CROSS_COMPILE,$(CROSS_COMPILE_arm),arm-none-eabi-) # CPU specific compilation flags CFLAGS_CPU+=-mthumb -Os -mno-sched-prolog diff --git a/core/minute-ia/build.mk b/core/minute-ia/build.mk index b9722da508..4fae1ac107 100644 --- a/core/minute-ia/build.mk +++ b/core/minute-ia/build.mk @@ -7,8 +7,7 @@ # # Select Minute-IA bare-metal toolchain -$(call set-option,CROSS_COMPILE,$(CROSS_COMPILE_i386),\ - /opt/coreboot-sdk/bin/i386-elf-) +$(call set-option,CROSS_COMPILE,$(CROSS_COMPILE_i386),i686-pc-linux-gnu-) # FPU compilation flags CFLAGS_FPU-$(CONFIG_FPU)= -- cgit v1.2.1