Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0e5c8ce7342db9c88d59412b184c5e214c88f27c

Authored by Peng Fan
Committed by Stefano Babic
1 parent a2b96ece5b
Exists in smarc_8mq_lf_v2020.04 and in 12 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, 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_8m-imx_v2019.04_4.19.35_1.1.0, 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

arm: imx: include imx8image support 

When building i.MX8/8X board, use imx8image type.

`-e $(CONFIG_SYS_TEXT_BASE)` is not needed, but
no harm to keep it for i.MX8/8X

Signed-off-by: Peng Fan <peng.fan@nxp.com>

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

arch/arm/mach-imx/Makefile
Diff comments   View file @ 0e5c8ce
... ... @@ -86,24 +86,29 @@
86 86 $(Q)mkdir -p $(dir $@)
87 87 $(call if_changed_dep,cpp_cfg)
88 88  
89   -MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
90   - -e $(CONFIG_SYS_TEXT_BASE)
  89 +IMAGE_TYPE = imximage
  90 +ifeq ($(CONFIG_ARCH_IMX8), y)
  91 +IMAGE_TYPE = imx8image
  92 +endif
  93 +
  94 +MKIMAGEFLAGS_u-boot.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \
  95 + -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE)
91 96 u-boot.imx: MKIMAGEOUTPUT = u-boot.imx.log
92 97  
93 98 u-boot.imx: u-boot.bin u-boot.cfgout $(PLUGIN).bin FORCE
94 99 $(call if_changed,mkimage)
95 100  
96 101 ifeq ($(CONFIG_OF_SEPARATE),y)
97   -MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
98   - -e $(CONFIG_SYS_TEXT_BASE)
  102 +MKIMAGEFLAGS_u-boot-dtb.imx = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \
  103 + -T $(IMAGE_TYPE) -e $(CONFIG_SYS_TEXT_BASE)
99 104 u-boot-dtb.imx: MKIMAGEOUTPUT = u-boot-dtb.imx.log
100 105  
101 106 u-boot-dtb.imx: u-boot-dtb.bin u-boot-dtb.cfgout $(PLUGIN).bin FORCE
102 107 $(call if_changed,mkimage)
103 108 endif
104 109  
105   -MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) -T imximage \
106   - -e $(CONFIG_SPL_TEXT_BASE)
  110 +MKIMAGEFLAGS_SPL = -n $(filter-out $(PLUGIN).bin $< $(PHONY),$^) \
  111 + -T $(IMAGE_TYPE) -e $(CONFIG_SPL_TEXT_BASE)
107 112 SPL: MKIMAGEOUTPUT = SPL.log
108 113  
109 114 SPL: spl/u-boot-spl.bin spl/u-boot-spl.cfgout $(PLUGIN).bin FORCE