Browse Source

Update at91bootstrap to 2.10

Ulf Samuelsson 16 years ago
parent
commit
e897b420fb
1 changed files with 17 additions and 5 deletions
  1. 17 5
      target/device/Atmel/at91bootstrap/at91bootstrap.mk

+ 17 - 5
target/device/Atmel/at91bootstrap/at91bootstrap.mk

@@ -3,9 +3,10 @@
 # at91bootstrap
 # at91bootstrap
 #
 #
 #############################################################
 #############################################################
-AT91BOOTSTRAP_VERSION:=2.9
+#AT91BOOTSTRAP_VERSION:=2.3
+#AT91BOOTSTRAP_PATCH_LEVEL:=.4
+AT91BOOTSTRAP_VERSION:=2.10
 AT91BOOTSTRAP_PATCH_LEVEL:=
 AT91BOOTSTRAP_PATCH_LEVEL:=
-
 AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL)
 AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL)
 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)
 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)
 ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR)))
 ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR)))
@@ -57,6 +58,8 @@ $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
 		$(AT91BOOTSTRAP_BOARD)_defconfig
 		$(AT91BOOTSTRAP_BOARD)_defconfig
 	touch $(AT91BOOTSTRAP_DIR)/.configured
 	touch $(AT91BOOTSTRAP_DIR)/.configured
 
 
+#		$(BOARD_NAME)_defconfig
+
 $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 	$(MAKE) \
 	$(MAKE) \
 		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
 		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
@@ -64,13 +67,18 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 		AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \
 		AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \
 		-C $(AT91BOOTSTRAP_DIR)
 		-C $(AT91BOOTSTRAP_DIR)
 
 
-$(AT91BOOTSTRAP_DIR)/.installed: $(AT91BOOTSTRAP_TARGET)
+$(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
 	mkdir -p $(BINARIES_DIR)
 	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)
+else
 	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
 	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
-	     CROSS_COMPILE=$(TARGET_CROSS) \
-	     -C $(AT91BOOTSTRAP_DIR) boot
+		CROSS_COMPILE=$(TARGET_CROSS) \
+		-C $(AT91BOOTSTRAP_DIR) boot
 	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install
 	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install
 	make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install
 	make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install
+endif
 	touch $@
 	touch $@
 
 
 #	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
 #	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
@@ -100,3 +108,7 @@ at91bootstrap-dirclean:
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 TARGETS+=at91bootstrap
 TARGETS+=at91bootstrap
 endif
 endif
+
+at91bootstrap-status:
+	@echo AT91BOOTSTRAP_BOARD=$(AT91BOOTSTRAP_BOARD)
+