mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
Makefile: Drop unnecessary -dtb suffixes
When OF_CONTROL is enabled, u-boot-dtb.* files are the same as u-boot.* files. So we can use the latter for simplicity. Tested-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
dae6e7bf50
commit
73c5c39997
1 changed files with 7 additions and 8 deletions
15
Makefile
15
Makefile
|
@ -915,7 +915,7 @@ MKIMAGEFLAGS_u-boot.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \
|
|||
u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
|
||||
$(call if_changed,mkimage)
|
||||
|
||||
u-boot-spl.kwb: u-boot-dtb.img spl/u-boot-spl.bin FORCE
|
||||
u-boot-spl.kwb: u-boot.img spl/u-boot-spl.bin FORCE
|
||||
$(call if_changed,mkimage)
|
||||
|
||||
u-boot.sha1: u-boot.bin
|
||||
|
@ -1056,7 +1056,7 @@ endif
|
|||
cmd_ifdtool += $(IFDTOOL) $(IFDTOOL_FLAGS) u-boot.tmp;
|
||||
cmd_ifdtool += mv u-boot.tmp $@
|
||||
|
||||
u-boot.rom: u-boot-x86-16bit.bin u-boot-dtb.bin
|
||||
u-boot.rom: u-boot-x86-16bit.bin u-boot.bin
|
||||
$(call if_changed,ifdtool)
|
||||
|
||||
OBJCOPYFLAGS_u-boot-x86-16bit.bin := -O binary -j .start16 -j .resetvec
|
||||
|
@ -1067,8 +1067,7 @@ endif
|
|||
ifneq ($(CONFIG_SUNXI),)
|
||||
OBJCOPYFLAGS_u-boot-sunxi-with-spl.bin = -I binary -O binary \
|
||||
--pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
|
||||
u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin \
|
||||
u-boot$(if $(CONFIG_OF_CONTROL),-dtb,).img FORCE
|
||||
u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img FORCE
|
||||
$(call if_changed,pad_cat)
|
||||
endif
|
||||
|
||||
|
@ -1078,7 +1077,7 @@ u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot-nodtb.bin FORCE
|
|||
$(call if_changed,pad_cat)
|
||||
|
||||
OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE)
|
||||
u-boot-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE
|
||||
u-boot-tegra.bin: spl/u-boot-spl u-boot.bin FORCE
|
||||
$(call if_changed,pad_cat)
|
||||
|
||||
u-boot-dtb-tegra.bin: u-boot-tegra.bin FORCE
|
||||
|
@ -1089,7 +1088,7 @@ OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI)
|
|||
u-boot-app.efi: u-boot FORCE
|
||||
$(call if_changed,zobjcopy)
|
||||
|
||||
u-boot-dtb.bin.o: u-boot-dtb.bin FORCE
|
||||
u-boot.bin.o: u-boot.bin FORCE
|
||||
$(call if_changed,efipayload)
|
||||
|
||||
u-boot-payload.lds: $(LDSCRIPT_EFI) FORCE
|
||||
|
@ -1099,10 +1098,10 @@ u-boot-payload.lds: $(LDSCRIPT_EFI) FORCE
|
|||
quiet_cmd_u-boot_payload ?= LD $@
|
||||
cmd_u-boot_payload ?= $(LD) $(LDFLAGS_EFI_PAYLOAD) -o $@ \
|
||||
-T u-boot-payload.lds arch/x86/cpu/call32.o \
|
||||
lib/efi/efi.o lib/efi/efi_stub.o u-boot-dtb.bin.o \
|
||||
lib/efi/efi.o lib/efi/efi_stub.o u-boot.bin.o \
|
||||
$(addprefix arch/$(ARCH)/lib/efi/,$(EFISTUB))
|
||||
|
||||
u-boot-payload: u-boot-dtb.bin.o u-boot-payload.lds FORCE
|
||||
u-boot-payload: u-boot.bin.o u-boot-payload.lds FORCE
|
||||
$(call if_changed,u-boot_payload)
|
||||
|
||||
OBJCOPYFLAGS_u-boot-payload.efi := $(OBJCOPYFLAGS_EFI)
|
||||
|
|
Loading…
Reference in a new issue