diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-03 00:07:25 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2009-01-03 00:07:25 +0000 |
| commit | 5dec4da010cb151d314d9d220383b7c3585726f7 (patch) | |
| tree | 7934101a58c2c1864234545ed2cd3cc6d36d9fbe /target/device/Atmel/at91bootstrap | |
| parent | 7213dae7a5009ba966f261e04b50c49a0672cea3 (diff) | |
Remove debugging variable added to svn by mistake, (Thanks Pter)
Diffstat (limited to 'target/device/Atmel/at91bootstrap')
| -rw-r--r-- | target/device/Atmel/at91bootstrap/Config.in | 7 | ||||
| -rw-r--r-- | target/device/Atmel/at91bootstrap/at91bootstrap.mk | 29 |
2 files changed, 27 insertions, 9 deletions
diff --git a/target/device/Atmel/at91bootstrap/Config.in b/target/device/Atmel/at91bootstrap/Config.in index e198fcea2..02f8938a7 100644 --- a/target/device/Atmel/at91bootstrap/Config.in +++ b/target/device/Atmel/at91bootstrap/Config.in @@ -3,6 +3,13 @@ config BR2_TARGET_AT91BOOTSTRAP BR2_TARGET_AT91SAM9261EK || BR2_TARGET_AT91SAM9263EK || BR2_TARGET_AT91SAM9XEEK bool "Build AT91 Bootstrap for selected chip" +config BR2_TARGET_AT91BOOTSTRAP_BOARD + string "Bootstrap board" + default "$(BOARD_NAME)" + depends on BR2_TARGET_AT91BOOTSTRAP + help + This is used to do a make <board>_config + choice prompt "Boot Memory" default BR2_TARGET_AT91BOOT_DATAFLASHCARD diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index facee12f3..babdc7df6 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -3,9 +3,10 @@ # at91bootstrap # ############################################################# -AT91BOOTSTRAP_VERSION:=2.3 -AT91BOOTSTRAP_PATCH_LEVEL:=4 -AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION).$(AT91BOOTSTRAP_PATCH_LEVEL) +AT91BOOTSTRAP_VERSION:=2.9 +AT91BOOTSTRAP_PATCH_LEVEL:= + +AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL) AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) @@ -16,6 +17,9 @@ AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) #")) AT91BOOTSTRAP_ZCAT:=$(BZCAT) +AT91BOOTSTRAP_BOARD:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_BOARD))) +#")) + AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY))) #")) @@ -42,7 +46,7 @@ $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): $(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) mkdir -p $(PROJECT_BUILD_DIR) $(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap\*.patch + toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch touch $(AT91BOOTSTRAP_DIR)/.unpacked $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config @@ -50,7 +54,7 @@ $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config MEMORY=$(AT91BOOTSTRAP_MEMORY) \ CROSS_COMPILE=$(TARGET_CROSS) \ -C $(AT91BOOTSTRAP_DIR) \ - $(BOARD_NAME)_defconfig + $(AT91BOOTSTRAP_BOARD)_defconfig touch $(AT91BOOTSTRAP_DIR)/.configured $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured @@ -60,14 +64,21 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \ -C $(AT91BOOTSTRAP_DIR) -$(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY): $(AT91BOOTSTRAP_TARGET) +$(AT91BOOTSTRAP_DIR)/.installed: $(AT91BOOTSTRAP_TARGET) mkdir -p $(BINARIES_DIR) - cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) - cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY) + 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 + touch $@ + +# cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) +# cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY) .PHONY: at91bootstrap at91bootstrap-source -at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) +at91bootstrap: $(AT91BOOTSTRAP_DIR)/.installed at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) |