diff options
| author | Simon Glass <sjg@chromium.org> | 2023-01-07 14:07:19 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2023-01-18 14:55:40 -0700 |
| commit | 31f35e83b18fe8c6b1bc6f1501b575c7cf764939 (patch) | |
| tree | fa13bd8d101741b5c33446c944f04733d31e8b84 /Makefile | |
| parent | e0c0efff2a02bf153d6afced3a57107790159ae2 (diff) | |
| download | u-boot-31f35e83b18fe8c6b1bc6f1501b575c7cf764939.zip u-boot-31f35e83b18fe8c6b1bc6f1501b575c7cf764939.tar.gz u-boot-31f35e83b18fe8c6b1bc6f1501b575c7cf764939.tar.bz2 | |
rockchip: Convert all boards to use binman
Instead of the bash script, use binman to generate the FIT for arm64.
For 32-bit boards, use binman for all images, dropping the intermediate
files.
With this change, only Zynq is now using SPL_FIT_GENERATOR so update the
Kconfig rule accordingly.
Clean up the Makefile to the extent possible. Unfortunately, two boards
do not use SPL_FRAMEWORK so don't enable the u-boot.img rule:
evb-rk3036
kylin-rk3036
So a small remnant remains.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -1006,14 +1006,9 @@ ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy) INPUTS-y += init_sp_bss_offset_check endif -ifeq ($(CONFIG_ARCH_ROCKCHIP)$(CONFIG_SPL),yy) -# Binman image dependencies -ifeq ($(CONFIG_ARM64),y) -INPUTS-y += u-boot.itb -else +ifeq ($(CONFIG_ARCH_ROCKCHIP)_$(CONFIG_SPL_FRAMEWORK),y_) INPUTS-y += u-boot.img endif -endif INPUTS-$(CONFIG_X86) += u-boot-x86-start16.bin u-boot-x86-reset16.bin \ $(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \ @@ -1477,7 +1472,6 @@ OBJCOPYFLAGS_u-boot-with-spl.bin = -I binary -O binary \ u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE $(call if_changed,pad_cat) - ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE) |