Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6d1ce387874c1060f27656f70151a52c511cd0e3

Authored by Mike Frysinger
Committed by Wolfgang Denk
1 parent 5ec5529b82
Exists in master and in 54 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, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, 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

make sure toplevel $(SUBDIRS) is always declared 

The $(SUBDIRS) variable is only declared when U-Boot has been configured,
but it gets used all the time.  In the non-configured case, it is used to
generate a helpful error message, but it needs to be set properly for that
to occur.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

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

... ... @@ -137,6 +137,14 @@
137 137 ARCH = ppc
138 138 endif
139 139  
  140 +# The "tools" are needed early, so put this first
  141 +# Don't include stuff already done in $(LIBS)
  142 +SUBDIRS = tools \
  143 + examples \
  144 + api_examples
  145 +
  146 +.PHONY : $(SUBDIRS)
  147 +
140 148 ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
141 149  
142 150 # load ARCH, BOARD, and CPU configuration
... ... @@ -281,14 +289,6 @@
281 289  
282 290 # Add GCC lib
283 291 PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
284   -
285   -# The "tools" are needed early, so put this first
286   -# Don't include stuff already done in $(LIBS)
287   -SUBDIRS = tools \
288   - examples \
289   - api_examples
290   -
291   -.PHONY : $(SUBDIRS)
292 292  
293 293 ifeq ($(CONFIG_NAND_U_BOOT),y)
294 294 NAND_SPL = nand_spl