summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-01-05 16:12:34 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-01-05 16:12:34 +0000
commit62ee161f0d44463eafdfb50be5eb8ae11aa73d57 (patch)
tree4e5710c216e22c9c8c6e4b33d98fd17329fdd790 /target
parentf7870ba02772b365539befaee0cbaa797294592b (diff)
downloadbuildroot-novena-62ee161f0d44463eafdfb50be5eb8ae11aa73d57.tar.gz
buildroot-novena-62ee161f0d44463eafdfb50be5eb8ae11aa73d57.zip
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.
Diffstat (limited to 'target')
-rw-r--r--target/u-boot/Makefile.in5
1 files changed, 1 insertions, 4 deletions
diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index c29ee4522..b746768c0 100644
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -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/