Commit 62ee161f authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

u-boot: revert U_BOOT_TARGET part of r24646 

More u-boot build unbreaking. r24646 added U_BOOT_TARGET which uses the
nonexisting BOARDNAME variable, which means that the filename expands
to -u-boot-*, confusing ln.

There's limited point in having that symlink in the first please, so simply
revert that hunk.
parent f7870ba0

target/u-boot/Makefile.in

+1 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ U_BOOT_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION) 
U_BOOT_PATCH_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches

U_BOOT_CAT:=$(BZCAT)

U_BOOT_BIN:=u-boot.bin

U_BOOT_TARGET:=$(BOARD_NAME)-u-boot-$(U_BOOT_VERSION)-$(DATE).bin

U_BOOT_TOOLS_BIN:=mkimage

U_BOOT_TOOLS:=$(STAGING_DIR)/usr/bin/$(U_BOOT_TOOLS_BIN)

MKIMAGE:=$(U_BOOT_TOOLS)
@@ -179,10 +178,8 @@ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified 
		 -C $(U_BOOT_DIR)



$(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)

	rm -f $(BINARIES_DIR)/$(U_BOOT_TARGET)

	rm -f $(BINARIES_DIR)/$(U_BOOT_BIN)

	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET)

	(cd $(BINARIES_DIR); ln -s $(U_BOOT_TARGET) $(U_BOOT_BIN)) 

	cp -dpf $(U_BOOT_DIR)/$(U_BOOT_BIN) $(BINARIES_DIR)



$(U_BOOT_TOOLS):	$(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN)

	cp -dpf $(U_BOOT_DIR)/tools/$(U_BOOT_TOOLS_BIN) $(STAGING_DIR)/usr/bin/