diff options
| author | Wei-Han Chen <stimim@chromium.org> | 2018-08-16 05:16:08 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-08-17 16:14:28 -0700 |
| commit | b8a3790615d9205b23aa087a64deb9bdcc72eedb (patch) | |
| tree | 90640dea9b4a5f9092fbe58a3f3b30d534f91c01 | |
| parent | d79c5a4cbf3f931bd723a16d541298f803ef22a6 (diff) | |
| download | chrome-ec-b8a3790615d9205b23aa087a64deb9bdcc72eedb.tar.gz | |
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 <pgeorgi@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/1172974
> Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
> Tested-by: Patrick Georgi <pgeorgi@chromium.org>
> Reviewed-by: Stefan Reinauer <reinauer@google.com>
Bug: chromium:851727, b:65441143
Change-Id: If09eca04efc6461b951879ad528832bc50ca50d2
Reviewed-on: https://chromium-review.googlesource.com/1177221
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Wei-Han Chen <stimim@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
| -rw-r--r-- | board/servo_v4/build.mk | 2 | ||||
| -rw-r--r-- | core/cortex-m/build.mk | 3 | ||||
| -rw-r--r-- | core/cortex-m0/build.mk | 3 | ||||
| -rw-r--r-- | 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)= |