Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9b6e2c363f2686d6f7bf61fbe58b7591b71d3e8b

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent a86cf89c76
Exists in v2017.01-smarct4x and in 48 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

kbuild: fix CROSS_COMPILE settings in config.mk 

The syntax
  CROSS_COMIPLE ?= <cross_compiler_prefix>
does not work because config.mk is parsed after
exporting CROSS_COMPILE.

Like Linux Kernel's arch/$(ARCH)/Makefile,
we must write as follows:

  ifeq ($(CROSS_COMPILE),)
  CROSS_COMPILE := <cross_compiler_prefix>
  endif

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 13 changed files with 43 additions and 14 deletions Side-by-side Diff

... ... @@ -9,12 +9,16 @@
9 9 endif
10 10  
11 11 ifdef CONFIG_SYS_LITTLE_ENDIAN
12   -CROSS_COMPILE ?= arc-buildroot-linux-uclibc-
  12 +ARC_CROSS_COMPILE := arc-buildroot-linux-uclibc-
13 13 endif
14 14  
15 15 ifdef CONFIG_SYS_BIG_ENDIAN
16   -CROSS_COMPILE ?= arceb-buildroot-linux-uclibc-
  16 +ARC_CROSS_COMPILE := arceb-buildroot-linux-uclibc-
17 17 PLATFORM_LDFLAGS += -EB
  18 +endif
  19 +
  20 +ifeq ($(CROSS_COMPILE),)
  21 +CROSS_COMPILE := $(ARC_CROSS_COMPILE)
18 22 endif
19 23  
20 24 PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -DCONFIG_ARC -gdwarf-2
... ... @@ -5,7 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= arm-linux-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := arm-linux-
  10 +endif
9 11  
10 12 ifndef CONFIG_STANDALONE_LOAD_ADDR
11 13 ifneq ($(CONFIG_OMAP_COMMON),)
arch/avr32/config.mk
Diff comments   View file @ 9b6e2c3
... ... @@ -5,7 +5,10 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= avr32-linux-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := avr32-linux-
  10 +endif
  11 +
9 12 PLATFORM_CPPFLAGS += -DCONFIG_AVR32
10 13 CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
11 14  
arch/blackfin/config.mk
Diff comments   View file @ 9b6e2c3
... ... @@ -5,7 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= bfin-uclinux-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := bfin-uclinux-
  10 +endif
9 11  
10 12 CONFIG_STANDALONE_LOAD_ADDR ?= 0x1000 -m elf32bfin
11 13  
... ... @@ -5,7 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= m68k-elf-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := m68k-elf-
  10 +endif
9 11  
10 12 CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
11 13  
arch/microblaze/config.mk
Diff comments   View file @ 9b6e2c3
... ... @@ -8,7 +8,9 @@
8 8 # SPDX-License-Identifier: GPL-2.0+
9 9 #
10 10  
11   -CROSS_COMPILE ?= mb-
  11 +ifeq ($(CROSS_COMPILE),)
  12 +CROSS_COMPILE := mb-
  13 +endif
12 14  
13 15 CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000
14 16  
... ... @@ -5,7 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= mips_4KC-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := mips_4KC-
  10 +endif
9 11  
10 12 # Handle special prefix in ELDK 4.0 toolchain
11 13 ifneq (,$(findstring 4KCle,$(CROSS_COMPILE)))
arch/nds32/config.mk
Diff comments   View file @ 9b6e2c3
... ... @@ -8,7 +8,9 @@
8 8 #
9 9 # SPDX-License-Identifier: GPL-2.0+
10 10  
11   -CROSS_COMPILE ?= nds32le-linux-
  11 +ifeq ($(CROSS_COMPILE),)
  12 +CROSS_COMPILE := nds32le-linux-
  13 +endif
12 14  
13 15 CONFIG_STANDALONE_LOAD_ADDR = 0x300000 -T $(srctree)/$(src)/nds32.lds
14 16  
arch/nios2/config.mk
Diff comments   View file @ 9b6e2c3
... ... @@ -6,7 +6,9 @@
6 6 # SPDX-License-Identifier: GPL-2.0+
7 7 #
8 8  
9   -CROSS_COMPILE ?= nios2-elf-
  9 +ifeq ($(CROSS_COMPILE),)
  10 +CROSS_COMPILE := nios2-elf-
  11 +endif
10 12  
11 13 CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
12 14  
arch/openrisc/config.mk
Diff comments   View file @ 9b6e2c3
... ... @@ -5,7 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= or32-elf-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := or32-elf-
  10 +endif
9 11  
10 12 # r10 used for global object pointer, already set in OR32 GCC but just to be
11 13 # clear
arch/powerpc/config.mk
Diff comments   View file @ 9b6e2c3
... ... @@ -5,7 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= ppc_8xx-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := ppc_8xx-
  10 +endif
9 11  
10 12 CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
11 13 LDFLAGS_FINAL += --gc-sections
... ... @@ -5,7 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= sh4-linux-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := sh4-linux-
  10 +endif
9 11  
10 12 CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000
11 13 ifeq ($(CPU),sh2)
arch/sparc/config.mk
Diff comments   View file @ 9b6e2c3
... ... @@ -5,7 +5,9 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -CROSS_COMPILE ?= sparc-elf-
  8 +ifeq ($(CROSS_COMPILE),)
  9 +CROSS_COMPILE := sparc-elf-
  10 +endif
9 11  
10 12 CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 -L $(gcclibdir) \
11 13 -T $(srctree)/$(src)/sparc.lds