Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 48aa812d8c5d64956cca49b5e189b0027cea3de7

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 2302b3ab85
Exists in v2017.01-smarct4x and in 37 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-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_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, 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: remove "clobber" target 

Now we stick to Linux Kernel's build system, so squash
"clobber" to "clean" target.

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

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

... ... @@ -1227,14 +1227,13 @@
1227 1227 # make distclean Remove editor backup files, patch leftover files and the like
1228 1228  
1229 1229 # Directories & files removed with 'make clean'
1230   -CLEAN_DIRS += $(MODVERDIR)
1231   -CLEAN_FILES += u-boot.lds include/bmp_logo.h include/bmp_logo_data.h
1232   -
1233   -# Directories & files removed with 'make clobber'
1234   -CLOBBER_DIRS += $(foreach d, spl tpl, $(patsubst %,$d/%, \
  1230 +CLEAN_DIRS += $(MODVERDIR) \
  1231 + $(foreach d, spl tpl, $(patsubst %,$d/%, \
1235 1232 $(filter-out include, $(shell ls -1 $d 2>/dev/null))))
1236   -CLOBBER_FILES += u-boot* MLO* SPL System.map
1237 1233  
  1234 +CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \
  1235 + u-boot* MLO* SPL System.map
  1236 +
1238 1237 # Directories & files removed with 'make mrproper'
1239 1238 MRPROPER_DIRS += include/config include/generated spl tpl \
1240 1239 .tmp_objdiff
... ... @@ -1266,17 +1265,6 @@
1266 1265 -o -name modules.builtin -o -name '.tmp_*.o.*' \
1267 1266 -o -name '*.gcno' \) -type f -print | xargs rm -f
1268 1267  
1269   -# clobber
1270   -#
1271   -clobber: rm-dirs := $(CLOBBER_DIRS)
1272   -clobber: rm-files := $(CLOBBER_FILES)
1273   -
1274   -PHONY += clobber
1275   -
1276   -clobber: clean
1277   - $(call cmd,rmdirs)
1278   - $(call cmd,rmfiles)
1279   -
1280 1268 # mrproper - Delete all generated files, including .config
1281 1269 #
1282 1270 mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
... ... @@ -1287,7 +1275,7 @@
1287 1275 $(mrproper-dirs):
1288 1276 $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)
1289 1277  
1290   -mrproper: clobber $(mrproper-dirs)
  1278 +mrproper: clean $(mrproper-dirs)
1291 1279 $(call cmd,rmdirs)
1292 1280 $(call cmd,rmfiles)
1293 1281 @rm -f arch/*/include/asm/arch
... ... @@ -1311,9 +1299,7 @@
1311 1299  
1312 1300 help:
1313 1301 @echo 'Cleaning targets:'
1314   - @echo ' clean - Remove most generated files but keep the config and'
1315   - @echo ' necessities for testing u-boot'
1316   - @echo ' clobber - Remove most generated files but keep the config'
  1302 + @echo ' clean - Remove most generated files but keep the config'
1317 1303 @echo ' mrproper - Remove all generated files + config + various backup files'
1318 1304 @echo ' distclean - mrproper + remove editor backup and patch files'
1319 1305 @echo ''