Merge tag 'dm-pull-28jul20' of git://git.denx.de/u-boot-dm
Use binman instead of one of the Rockchip build scripts Refactor to allow any arch to create SPI-flash images New button uclass
This commit is contained in:
@@ -25,8 +25,8 @@ cmd_prodzip = \
|
||||
zip -9 -r $@ misc/* >/dev/null $<
|
||||
|
||||
ifeq ($(hw-platform-y),brppt1-spi)
|
||||
ALL-y += $(hw-platform-y)_prog.bin
|
||||
ALL-y += $(hw-platform-y)_prod.zip
|
||||
INPUTS-y += $(hw-platform-y)_prog.bin
|
||||
INPUTS-y += $(hw-platform-y)_prod.zip
|
||||
endif
|
||||
|
||||
$(hw-platform-y)_prog.bin: u-boot-dtb.img spl/u-boot-spl.bin
|
||||
|
||||
@@ -24,8 +24,8 @@ cmd_prodzip = \
|
||||
|
||||
ifeq ($(hw-platform-y),brppt2)
|
||||
ifneq ($(CONFIG_SPL_BUILD),y)
|
||||
ALL-y += $(hw-platform-y)_prog.bin
|
||||
ALL-y += $(hw-platform-y)_prod.zip
|
||||
INPUTS-y += $(hw-platform-y)_prog.bin
|
||||
INPUTS-y += $(hw-platform-y)_prod.zip
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@@ -23,11 +23,11 @@ cmd_prodzip = \
|
||||
cp u-boot-dtb.img misc/ && \
|
||||
zip -9 -r $@ misc/* >/dev/null $<
|
||||
|
||||
ALL-y += $(hw-platform-y)_prog.bin
|
||||
ALL-y += $(hw-platform-y)_prod.zip
|
||||
INPUTS-y += $(hw-platform-y)_prog.bin
|
||||
INPUTS-y += $(hw-platform-y)_prod.zip
|
||||
|
||||
$(hw-platform-y)_prog.bin: u-boot-dtb.img spl/u-boot-spl.bin
|
||||
$(call if_changed,prodbin)
|
||||
|
||||
$(hw-platform-y)_prod.zip: $(hw-platform-y)_prog.bin
|
||||
$(call if_changed,prodzip)
|
||||
$(call if_changed,prodzip)
|
||||
|
||||
@@ -11,5 +11,5 @@ u-boot.mcs: u-boot.bin
|
||||
|
||||
# if srec_cat is present build u-boot.mcs by default
|
||||
has_srec_cat = $(call try-run,srec_cat -VERSion,y,n)
|
||||
ALL-$(has_srec_cat) += u-boot.mcs
|
||||
INPUTS-$(has_srec_cat) += u-boot.mcs
|
||||
CLEAN_FILES += u-boot.mcs
|
||||
|
||||
@@ -10,7 +10,7 @@ cmd_mkalign_eds = \
|
||||
dd if=$^ of=$@ bs=4k seek=1 2>/dev/null && \
|
||||
mv $@ $^
|
||||
|
||||
ALL-y += u-boot-align.bin
|
||||
INPUTS-y += u-boot-align.bin
|
||||
u-boot-align.bin: u-boot.bin
|
||||
$(call if_changed,mkalign_eds)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user