diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-04-11 21:32:09 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-04-11 21:32:09 +0000 |
| commit | bcf8f7ca9e3d2af55e578fc56c9b8e7b3ebe873a (patch) | |
| tree | 01084ddee758cc33a59e287741afd232b22fc4de | |
| parent | ab36f50a82bdd99b4eb8a31ae1274af860619670 (diff) | |
buildroot: additional tftpboot fixes
Patch by Jean-Christian de Rivaz
| -rw-r--r-- | target/device/Atmel/at91bootstrap/at91bootstrap.mk | 2 | ||||
| -rw-r--r-- | target/linux/Makefile.in.advanced | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index 057fe08e4..66558107d 100644 --- 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 39a1fb75c..c3c70c44c 100644 --- 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) |