buildroot: additional tftpboot fixes

Patch by Jean-Christian de Rivaz

diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
index 057fe08e496df411a9cf24960c3e4e09db017ba0..66558107d9df7998af56b412ca1841623fab5a3f 100644 (file)
--- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk
+++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
@@ -63,7 +63,7 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY): $(AT91BOOTSTRAP_TARGET)
        mkdir -p $(BINARIES_DIR)
        cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-       cp $(AT91BOOTSTRAP_TARGET) /tftpboot/$(AT91BOOTSTRAP_BINARY)
+       cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY)
 
 .PHONY: at91bootstrap at91bootstrap-source
 

diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 39a1fb75c8d528e5964d1fa05d48c7f0d7e65750..c3c70c44c7529a9f38851515362ff1f693dac131 100644 (file)
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -230,7 +230,7 @@ LINUX26_TARGETS+=$(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME)
 endif
 
 ifeq ($(BR2_LINUX_COPYTO_TFTPBOOT),y)
-LINUX26_TARGETS+=/tftpboot/$(LINUX26_KERNEL_NAME)
+LINUX26_TARGETS+=$(BR2_LINUX_COPYTO)/$(LINUX26_KERNEL_NAME)
 endif
 
 ifneq ($(strip $(subst ",,$(BR2_LINUX_COPYTO))),)
@@ -437,9 +437,9 @@ $(TARGET_DIR)/boot/busybox.config: $(BUSYBOX_DIR)/.config
        mkdir -p $(TARGET_DIR)/boot
        cp -dpf .config $(TARGET_DIR)/boot/busybox.config
 
-/tftpboot/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
-       mkdir -p /tftpboot
-       cp -dpf $(LINUX26_KERNEL) /tftpboot/$(LINUX26_KERNEL_NAME)
+$(BR2_LINUX_COPYTO)/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
+       mkdir -p $(BR2_LINUX_COPYTO)
+       cp -dpf $(LINUX26_KERNEL) $(BR2_LINUX_COPYTO)/$(LINUX26_KERNEL_NAME)
 
 $(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL)
        mkdir -p $(LINUX_COPYTO)