Skip to content
Snippets Groups Projects
Commit 1112c884 authored by Adrian Alonso's avatar Adrian Alonso
Browse files

MLK-25706: iMX8M: soc: fix support to override u-boot DTB file name 


Follow expected override name entry "dtbs", upstream imx-boot recipe
make SOC=${IMX_BOOT_SOC_TARGET} dtbs=${UBOOT_DTB_NAME} ${target}
use dtbs to override expected target uboot dtb name.

Signed-off-by: default avatarAdrian Alonso <adrian.alonso@nxp.com>
Reviewed-by: default avatarYe Li <ye.li@nxp.com>
parent 5af389ce
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 48 additions and 48 deletions
iMX8M/soc.mak
+ 48
− 48
View file @ 1112c884
...@@ -24,7 +24,7 @@ DTB_PREPROC = ../scripts/dtb_check.sh ...@@ -24,7 +24,7 @@ DTB_PREPROC = ../scripts/dtb_check.sh
PRINT_FIT_HAB_OFFSET ?= 0x60000 PRINT_FIT_HAB_OFFSET ?= 0x60000
DEK_BLOB_LOAD_ADDR = 0x40400000 DEK_BLOB_LOAD_ADDR = 0x40400000
UBOOT_DTB ?= dtbs ?=
ifeq ($(SOC),iMX8MM) ifeq ($(SOC),iMX8MM)
PLAT = imx8mm PLAT = imx8mm
...@@ -139,65 +139,65 @@ u-boot-atf-tee.bin: u-boot.bin bl31.bin tee.bin ...@@ -139,65 +139,65 @@ u-boot-atf-tee.bin: u-boot.bin bl31.bin tee.bin
clean: clean:
@rm -f $(MKIMG) u-boot-atf.bin u-boot-atf-tee.bin u-boot-spl-ddr.bin u-boot.itb u-boot.its u-boot-ddr3l.itb u-boot-ddr3l.its u-boot-spl-ddr3l.bin u-boot-ddr4.itb u-boot-ddr4.its u-boot-spl-ddr4.bin u-boot-ddr4-evk.itb u-boot-ivt.itb u-boot-ddr4-evk.its $(OUTIMG) @rm -f $(MKIMG) u-boot-atf.bin u-boot-atf-tee.bin u-boot-spl-ddr.bin u-boot.itb u-boot.its u-boot-ddr3l.itb u-boot-ddr3l.its u-boot-spl-ddr3l.bin u-boot-ddr4.itb u-boot-ddr4.its u-boot-spl-ddr4.bin u-boot-ddr4-evk.itb u-boot-ivt.itb u-boot-ddr4-evk.its $(OUTIMG)
dtbs = evk.dtb dtb = evk.dtb
$(dtbs): $(dtb):
./$(DTB_PREPROC) $(PLAT)-evk.dtb $(dtbs) $(UBOOT_DTB) ./$(DTB_PREPROC) $(PLAT)-evk.dtb $(dtb) $(dtbs)
u-boot.itb: $(dtbs) u-boot.itb: $(dtb)
./$(PAD_IMAGE) tee.bin ./$(PAD_IMAGE) tee.bin
./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs) > u-boot.its DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb) > u-boot.its
./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb
@rm -f u-boot.its $(dtbs) @rm -f u-boot.its $(dtb)
dtbs_ddr3l = valddr3l.dtb dtb_ddr3l = valddr3l.dtb
$(dtbs_ddr3l): $(dtb_ddr3l):
./$(DTB_PREPROC) $(PLAT)-ddr3l-$(VAL_BOARD).dtb $(dtbs_ddr3l) $(UBOOT_DTB) ./$(DTB_PREPROC) $(PLAT)-ddr3l-$(VAL_BOARD).dtb $(dtb_ddr3l) $(dtbs)
u-boot-ddr3l.itb: $(dtbs_ddr3l) u-boot-ddr3l.itb: $(dtb_ddr3l)
./$(PAD_IMAGE) tee.bin ./$(PAD_IMAGE) tee.bin
./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr3l) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr3l) > u-boot-ddr3l.its DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr3l) > u-boot-ddr3l.its
./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l.its u-boot-ddr3l.itb
@rm -f u-boot.its $(dtbs_ddr3l) @rm -f u-boot.its $(dtb_ddr3l)
dtbs_ddr3l_evk = evkddr3l.dtb dtb_ddr3l_evk = evkddr3l.dtb
$(dtbs_ddr3l_evk): $(dtb_ddr3l_evk):
./$(DTB_PREPROC) $(PLAT)-ddr3l-evk.dtb $(dtbs_ddr3l_evk) $(UBOOT_DTB) ./$(DTB_PREPROC) $(PLAT)-ddr3l-evk.dtb $(dtb_ddr3l_evk) $(dtbs)
u-boot-ddr3l-evk.itb: $(dtbs_ddr3l_evk) u-boot-ddr3l-evk.itb: $(dtb_ddr3l_evk)
./$(PAD_IMAGE) tee.bin ./$(PAD_IMAGE) tee.bin
./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr3l_evk) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr3l_evk)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr3l_evk) > u-boot-ddr3l-evk.its DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr3l_evk) > u-boot-ddr3l-evk.its
./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr3l-evk.its u-boot-ddr3l-evk.itb
@rm -f u-boot.its $(dtbs_ddr3l_evk) @rm -f u-boot.its $(dtb_ddr3l_evk)
dtbs_ddr4 = valddr4.dtb dtb_ddr4 = valddr4.dtb
$(dtbs_ddr4): $(dtb_ddr4):
./$(DTB_PREPROC) $(PLAT)-ddr4-$(VAL_BOARD).dtb $(dtbs_ddr4) $(UBOOT_DTB) ./$(DTB_PREPROC) $(PLAT)-ddr4-$(VAL_BOARD).dtb $(dtb_ddr4) $(dtbs)
u-boot-ddr4.itb: $(dtbs_ddr4) u-boot-ddr4.itb: $(dtb_ddr4)
./$(PAD_IMAGE) tee.bin ./$(PAD_IMAGE) tee.bin
./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr4) > u-boot-ddr4.its DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr4) > u-boot-ddr4.its
./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4.its u-boot-ddr4.itb
@rm -f u-boot.its $(dtbs_ddr4) @rm -f u-boot.its $(dtb_ddr4)
dtbs_ddr4_evk = evkddr4.dtb dtb_ddr4_evk = evkddr4.dtb
$(dtbs_ddr4_evk): $(dtb_ddr4_evk):
./$(DTB_PREPROC) $(PLAT)-ddr4-evk.dtb $(dtbs_ddr4_evk) $(UBOOT_DTB) ./$(DTB_PREPROC) $(PLAT)-ddr4-evk.dtb $(dtb_ddr4_evk) $(dtbs)
u-boot-ddr4-evk.itb: $(dtbs_ddr4_evk) u-boot-ddr4-evk.itb: $(dtb_ddr4_evk)
./$(PAD_IMAGE) tee.bin ./$(PAD_IMAGE) tee.bin
./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4_evk) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk)
DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs_ddr4_evk) > u-boot-ddr4-evk.its DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtb_ddr4_evk) > u-boot-ddr4-evk.its
./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb ./mkimage_uboot -E -p 0x3000 -f u-boot-ddr4-evk.its u-boot-ddr4-evk.itb
@rm -f u-boot.its $(dtbs_ddr4_evk) @rm -f u-boot.its $(dtb_ddr4_evk)
ifeq ($(HDMI),yes) ifeq ($(HDMI),yes)
flash_evk: $(MKIMG) signed_hdmi_imx8m.bin u-boot-spl-ddr.bin u-boot.itb flash_evk: $(MKIMG) signed_hdmi_imx8m.bin u-boot-spl-ddr.bin u-boot.itb
...@@ -278,26 +278,26 @@ flash_dp_spl_uboot: flash_dp_evk ...@@ -278,26 +278,26 @@ flash_dp_spl_uboot: flash_dp_evk
flash_spl_uboot: flash_evk_no_hdmi flash_spl_uboot: flash_evk_no_hdmi
print_fit_hab: u-boot-nodtb.bin bl31.bin $(dtbs) print_fit_hab: u-boot-nodtb.bin bl31.bin $(dtb)
./$(PAD_IMAGE) tee.bin ./$(PAD_IMAGE) tee.bin
./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb)
TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtbs) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtb)
@rm -f $(dtbs) @rm -f $(dtb)
print_fit_hab_ddr4: u-boot-nodtb.bin bl31.bin $(dtbs_ddr4_evk) print_fit_hab_ddr4: u-boot-nodtb.bin bl31.bin $(dtb_ddr4_evk)
./$(PAD_IMAGE) tee.bin ./$(PAD_IMAGE) tee.bin
./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs_ddr4_evk) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb_ddr4_evk)
TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtbs_ddr4_evk) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtb_ddr4_evk)
@rm -f $(dtbs_ddr4_evk) @rm -f $(dtb_ddr4_evk)
print_fit_hab_flexspi: u-boot-nodtb.bin bl31.bin $(dtbs) print_fit_hab_flexspi: u-boot-nodtb.bin bl31.bin $(dtb)
./$(PAD_IMAGE) tee.bin ./$(PAD_IMAGE) tee.bin
./$(PAD_IMAGE) bl31.bin ./$(PAD_IMAGE) bl31.bin
./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtb)
TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) BOOT_DEV="flexspi" ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtbs) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) BOOT_DEV="flexspi" ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtb)
@rm -f $(dtbs) @rm -f $(dtb)
nightly : nightly :
@echo "Pulling nightly for $(PLAT) evk board from $(SERVER)/$(DIR)" @echo "Pulling nightly for $(PLAT) evk board from $(SERVER)/$(DIR)"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment