Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d18926af30d111362c6262c356feb768d7a367a3

Authored by Simon Glass
Committed by Tom Rini
1 parent 597a8b2c68
Exists in v2017.01-smarct4x and in 40 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, 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

fdt: Rename the DEV_TREE_BIN Makefile flag to to EXT_DTB 

This seems like a better name. This is a patch-up to the earlier commit
63b4b5b, and also removes a redundant Makefile change.

Signed-off-by: Simon Glass <sjg@chromium.org>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

... ... @@ -832,7 +832,7 @@
832 832 MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
833 833 -R $(srctree)/$(CONFIG_SYS_FSL_PBL_PBI:"%"=%) -T pblimage
834 834  
835   -u-boot.img u-boot.kwb u-boot.pbl: u-boot$(if $(CONFIG_OF_SEPARATE),-dtb,).bin FORCE
  835 +u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
836 836 $(call if_changed,mkimage)
837 837  
838 838 MKIMAGEFLAGS_u-boot-dtb.img = $(MKIMAGEFLAGS_u-boot.img)
doc/README.fdt-control
Diff comments   View file @ d18926a
... ... @@ -143,9 +143,9 @@
143 143 You cannot use more than one of these options at the same time.
144 144  
145 145 To use a device tree file that you have compiled yourself, pass
146   -DEV_TREE_BIN=<filename> to 'make', as in:
  146 +EXT_DTB=<filename> to 'make', as in:
147 147  
148   - make DEV_TREE_BIN=boot/am335x-boneblack-pubkey.dtb
  148 + make EXT_DTB=boot/am335x-boneblack-pubkey.dtb
149 149  
150 150 Then U-Boot will copy that file to u-boot.dtb, put it in the .img file
151 151 if used, and u-boot-dtb.bin.
... ... @@ -12,8 +12,8 @@
12 12 DEVICE_TREE := unset
13 13 endif
14 14  
15   -ifneq ($(DEV_TREE_BIN),)
16   -DTB := $(DEV_TREE_BIN)
  15 +ifneq ($(EXT_DTB),)
  16 +DTB := $(EXT_DTB)
17 17 else
18 18 DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb
19 19 endif