Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit de04d64eda42490f94d638e8ee2e12e494e80417

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent e2ce81696a
Exists in master and in 50 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.01, 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, v2017.01-smarct4x

PowerPC: merge commonly-defined flags 

PLATFORM_RELFLAGS += -meabi
PLATFORM_CPPFLAGS += -ffixed-r2
were defined in all arch/powerpc/${CPU}/config.mk.

This commit moves them to arch/powerpc/config.mk.

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

Showing 12 changed files with 15 additions and 39 deletions Side-by-side Diff

arch/powerpc/config.mk
Diff comments   View file @ de04d64
... ... @@ -9,8 +9,9 @@
9 9  
10 10 CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
11 11 LDFLAGS_FINAL += --gc-sections
12   -PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections
13   -PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__
  12 +PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections \
  13 + -meabi
  14 +PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ -ffixed-r2
14 15 PLATFORM_LDFLAGS += -n
15 16  
16 17 # Support generic board on PPC
arch/powerpc/cpu/74xx_7xx/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,7 +5,5 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
9   -
10   -PLATFORM_CPPFLAGS += -DCONFIG_74xx_7xx -ffixed-r2 -mstring
  8 +PLATFORM_CPPFLAGS += -DCONFIG_74xx_7xx -mstring
arch/powerpc/cpu/mpc512x/config.mk
Diff comments   View file @ de04d64
... ... @@ -4,8 +4,5 @@
4 4 # SPDX-License-Identifier: GPL-2.0+
5 5 #
6 6  
7   -PLATFORM_RELFLAGS += -meabi
8   -
9   -PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \
10   - -ffixed-r2 -msoft-float -mcpu=603e
  7 +PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 -msoft-float -mcpu=603e
arch/powerpc/cpu/mpc5xx/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,7 +5,5 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
9   -
10   -PLATFORM_CPPFLAGS += -DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float
  8 +PLATFORM_CPPFLAGS += -DCONFIG_5xx -mpowerpc -msoft-float
arch/powerpc/cpu/mpc5xxx/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,8 +5,6 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
9   -
10   -PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \
  8 +PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx \
11 9 -mstring -mcpu=603e -mmultiple
arch/powerpc/cpu/mpc824x/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,7 +5,5 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
9   -
10   -PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float
  8 +PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -mstring -mcpu=603e -msoft-float
arch/powerpc/cpu/mpc8260/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,8 +5,6 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
9   -
10   -PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 -ffixed-r2 \
  8 +PLATFORM_CPPFLAGS += -DCONFIG_8260 -DCONFIG_CPM2 \
11 9 -mstring -mcpu=603e -mmultiple
arch/powerpc/cpu/mpc83xx/config.mk
Diff comments   View file @ de04d64
... ... @@ -4,8 +4,5 @@
4 4 # SPDX-License-Identifier: GPL-2.0+
5 5 #
6 6  
7   -PLATFORM_RELFLAGS += -meabi
8   -
9   -PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 \
10   - -ffixed-r2 -msoft-float
  7 +PLATFORM_CPPFLAGS += -DCONFIG_MPC83xx -DCONFIG_E300 -msoft-float
arch/powerpc/cpu/mpc85xx/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,14 +5,11 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
  8 +PLATFORM_CPPFLAGS += -Wa,-me500 -msoft-float -mno-string
9 9  
10   -PLATFORM_CPPFLAGS += -ffixed-r2 -Wa,-me500 -msoft-float -mno-string
11   -
12 10 # -mspe=yes is needed to have -mno-spe accepted by a buggy GCC;
13 11 # see "[PATCH,rs6000] make -mno-spe work as expected" on
14 12 # http://gcc.gnu.org/ml/gcc-patches/2008-04/msg00311.html
15   -PF_CPPFLAGS_SPE := $(call cc-option,-mspe=yes) \
  13 +PLATFORM_CPPFLAGS += $(call cc-option,-mspe=yes) \
16 14 $(call cc-option,-mno-spe)
17   -PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_SPE)
arch/powerpc/cpu/mpc86xx/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,8 +5,5 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
9   -
10   -PLATFORM_CPPFLAGS += -ffixed-r2 -mstring
11   -PLATFORM_CPPFLAGS += -maltivec -mabi=altivec -msoft-float
  8 +PLATFORM_CPPFLAGS += -mstring -maltivec -mabi=altivec -msoft-float
arch/powerpc/cpu/mpc8xx/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,7 +5,5 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
9   -
10   -PLATFORM_CPPFLAGS += -DCONFIG_8xx -ffixed-r2 -mstring -mcpu=860 -msoft-float
  8 +PLATFORM_CPPFLAGS += -DCONFIG_8xx -mstring -mcpu=860 -msoft-float
arch/powerpc/cpu/ppc4xx/config.mk
Diff comments   View file @ de04d64
... ... @@ -5,8 +5,7 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -PLATFORM_RELFLAGS += -meabi
9   -PLATFORM_CPPFLAGS += -DCONFIG_4xx -ffixed-r2 -mstring -msoft-float
  8 +PLATFORM_CPPFLAGS += -DCONFIG_4xx -mstring -msoft-float
10 9  
11 10 cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<\(configs.*\)>/\1/')
12 11 is440:=$(shell grep CONFIG_440 $(TOPDIR)/include/$(cfg))