Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3fdf5c8e94e7a2a62f98ea8f0ad1a84d18eccfbf

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 620110afe5
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

Makefile: abolish COBJS, SOBJS, etc. 

The support for COBJS, COBJS-y, SOBJS, SOBJS-y, GLCOBJS, GLSOBJS
from scripts/Makefile.build.
Going forward we need to use Kbuild style consistently.

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

Showing 1 changed file with 4 additions and 8 deletions Side-by-side Diff

scripts/Makefile.build
Diff comments   View file @ 3fdf5c8
... ... @@ -10,10 +10,6 @@
10 10  
11 11 include Makefile
12 12  
13   -# Backward compatible: obj-y is preferable
14   -COBJS := $(sort $(COBJS) $(COBJS-y))
15   -SOBJS := $(sort $(SOBJS) $(SOBJS-y))
16   -
17 13 # Going forward use the following
18 14 obj-y := $(sort $(obj-y))
19 15 extra-y := $(sort $(extra-y))
20 16  
... ... @@ -24,11 +20,11 @@
24 20 subdir-obj-y := $(filter %/built-in.o, $(obj-y))
25 21 subdir-obj-y := $(addprefix $(obj),$(subdir-obj-y))
26 22  
27   -SRCS += $(COBJS:.o=.c) $(SOBJS:.o=.S) \
28   - $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) $(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S))
29   -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS) $(obj-y))
  23 +SRCS += $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) \
  24 + $(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S))
  25 +OBJS := $(addprefix $(obj),$(obj-y))
30 26  
31   -LGOBJS := $(addprefix $(obj),$(sort $(GLSOBJS) $(GLCOBJS)) $(lib-y))
  27 +LGOBJS := $(addprefix $(obj),$(sort $(lib-y)))
32 28  
33 29 all: $(LIB) $(addprefix $(obj),$(extra-y))
34 30