diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-26 23:52:31 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-26 23:52:31 +0000 |
| commit | 0dbf9dd7ab8e08e9081a1141f0122f0e2cdc6202 (patch) | |
| tree | 098bb98a9d08b6ec633c00178556bdd9955ce8ae /target/device | |
| parent | 78fa0d4eb4f8ce861664093cb62c1a11b22d90f6 (diff) | |
| download | buildroot-novena-0dbf9dd7ab8e08e9081a1141f0122f0e2cdc6202.tar.gz buildroot-novena-0dbf9dd7ab8e08e9081a1141f0122f0e2cdc6202.zip | |
Create a common BR2_COPYTO to prepare to replace
all the different COPYTOs spread out all over
Buildroot.
Generate COPY_FILE subroutine which can be used
to copy a file.
$(COPY_FILE , file, directory, filename)
This will copy to binary dir and to the selected
copy dir if set in new config (intended to replace
all old COPYTO configs)
This is overridden by BUILDROOT_COPYTO,
if set into the environment.
Diffstat (limited to 'target/device')
| -rw-r--r-- | target/device/Atmel/DataFlashBoot/DataflashBoot.mk | 9 | ||||
| -rw-r--r-- | target/device/Atmel/Makefile.in | 4 | ||||
| -rw-r--r-- | target/device/Atmel/at91bootstrap/at91bootstrap.mk | 10 |
3 files changed, 14 insertions, 9 deletions
diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk index c59e2bcfa..b3735bca9 100644 --- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk +++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk @@ -7,7 +7,7 @@ DATAFLASHBOOT_VERSION:=1.05 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION) ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) # ")) -DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)/Source +DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR) DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2 DATAFLASHBOOT_DIR:=$(PROJECT_BUILD_DIR)/$(DATAFLASHBOOT_NAME) DATAFLASHBOOT_BINARY:=$(DATAFLASHBOOT_NAME).bin @@ -32,11 +32,8 @@ DataflashBoot-dirclean: rm -rf $(DATAFLASHBOOT_DIR) dataflash: $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) - mkdir -p $(BINARIES_DIR) - cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) $(BINARIES_DIR)/$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY) -ifneq ($(TARGET_ATMEL_COPYTO),) - cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) $(TARGET_ATMEL_COPYTO)/$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY) -endif + $(call COPY_FILE, $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY), $(TARGET_ATMEL_COPYTO), $(BOARD_NAME)-$(DATAFLASHBOOT_BINARY)) + ############################################################# # diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index b6ca1be1a..fd53e6ee9 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -13,7 +13,11 @@ TARGET_SKELETON:=$(ATMEL_TARGET)/target_skeleton TARGET_DEVICE_TABLE:=$(ATMEL_TARGET)/device_table.txt TARGET_SKELETON_LINKS:=$(ATMEL_TARGET)/skel.tar.gz +ifneq ($(COPYTO),) +TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_COPYTO))) +else TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) +endif # These are set by Config.in DOWNLOAD_LINUX26_VERSION:= $(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index 059d6a134..2b41e8212 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -71,13 +71,17 @@ $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET) mkdir -p $(BINARIES_DIR) ifeq ($(AT91BOOTSTRAP_VERSION),2.3) cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) - cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY) + $(call COPY_FILE, $(AT91BOOTSTRAP_TARGET), $(BR2_TARGET_ATMEL_COPYTO), $(AT91BOOTSTRAP_BINARY)) else make MEMORY=$(AT91BOOTSTRAP_MEMORY) \ CROSS_COMPILE=$(TARGET_CROSS) \ -C $(AT91BOOTSTRAP_DIR) boot - make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install - make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install + make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || ± + echo "Could not copy bootstrap to BINARIES_DIR" +ifneq ($(BR2_TARGET_ATMEL_COPYTO),) + make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install || \ + echo "Could not copy bootstrap to BR2_ATMEL_COPYTO" +endif endif touch $@ |