socfpga: Simplify Makefile filenames
We don't need the -dtb suffix anymore, so drop it. Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Simon Glass <sjg@chromium.org>utp
parent
a9d78260a8
commit
bd7dc3883b
10
Makefile
10
Makefile
|
@ -1010,10 +1010,10 @@ u-boot.spr: spl/u-boot-spl.img u-boot.img FORCE
|
||||||
|
|
||||||
ifneq ($(CONFIG_ARCH_SOCFPGA),)
|
ifneq ($(CONFIG_ARCH_SOCFPGA),)
|
||||||
quiet_cmd_socboot = SOCBOOT $@
|
quiet_cmd_socboot = SOCBOOT $@
|
||||||
cmd_socboot = cat spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \
|
cmd_socboot = cat spl/u-boot-spl.sfp spl/u-boot-spl.sfp \
|
||||||
spl/u-boot-spl-dtb.sfp spl/u-boot-spl-dtb.sfp \
|
spl/u-boot-spl.sfp spl/u-boot-spl.sfp \
|
||||||
u-boot-dtb.img > $@ || rm -f $@
|
u-boot.img > $@ || rm -f $@
|
||||||
u-boot-with-spl-dtb.sfp: spl/u-boot-spl-dtb.sfp u-boot-dtb.img FORCE
|
u-boot-with-spl.sfp: spl/u-boot-spl.sfp u-boot.img FORCE
|
||||||
$(call if_changed,socboot)
|
$(call if_changed,socboot)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -1322,7 +1322,7 @@ spl/u-boot-spl: tools prepare $(if $(CONFIG_OF_SEPARATE),dts/dt.dtb)
|
||||||
spl/sunxi-spl.bin: spl/u-boot-spl
|
spl/sunxi-spl.bin: spl/u-boot-spl
|
||||||
@:
|
@:
|
||||||
|
|
||||||
spl/u-boot-spl-dtb.sfp: spl/u-boot-spl
|
spl/u-boot-spl.sfp: spl/u-boot-spl
|
||||||
@:
|
@:
|
||||||
|
|
||||||
spl/boot.bin: spl/u-boot-spl
|
spl/boot.bin: spl/u-boot-spl
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
"netdev=eth0\0" \
|
"netdev=eth0\0" \
|
||||||
"hostname=mcvevk\0" \
|
"hostname=mcvevk\0" \
|
||||||
"kernel_addr_r=0x10000000\0" \
|
"kernel_addr_r=0x10000000\0" \
|
||||||
"update_filename=u-boot-with-spl-dtb.sfp\0" \
|
"update_filename=u-boot-with-spl.sfp\0" \
|
||||||
"update_sd_offset=0x800\0" \
|
"update_sd_offset=0x800\0" \
|
||||||
"update_sd=" /* Update the SD firmware partition */ \
|
"update_sd=" /* Update the SD firmware partition */ \
|
||||||
"if mmc rescan ; then " \
|
"if mmc rescan ; then " \
|
||||||
|
|
|
@ -142,7 +142,7 @@ ALL-y += $(obj)/$(BOARD)-spl.bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef CONFIG_ARCH_SOCFPGA
|
ifdef CONFIG_ARCH_SOCFPGA
|
||||||
ALL-y += $(obj)/$(SPL_BIN)-dtb.sfp
|
ALL-y += $(obj)/$(SPL_BIN).sfp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef CONFIG_SUNXI
|
ifdef CONFIG_SUNXI
|
||||||
|
@ -229,8 +229,8 @@ LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef CONFIG_ARCH_SOCFPGA
|
ifdef CONFIG_ARCH_SOCFPGA
|
||||||
MKIMAGEFLAGS_$(SPL_BIN)-dtb.sfp = -T socfpgaimage
|
MKIMAGEFLAGS_$(SPL_BIN).sfp = -T socfpgaimage
|
||||||
$(obj)/$(SPL_BIN)-dtb.sfp: $(obj)/$(SPL_BIN)-dtb.bin FORCE
|
$(obj)/$(SPL_BIN).sfp: $(obj)/$(SPL_BIN).bin FORCE
|
||||||
$(call if_changed,mkimage)
|
$(call if_changed,mkimage)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue