From 649b5b92509dba021ed47ef4c04f358de83ba36f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Mar 2010 18:20:45 +0100
Subject: bootloaders: move bootloader build code to boot/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/Config.in        | 108 +++++++++++++++++++++++++++++++++++
 boot/at91bootstrap/at91bootstrap.mk | 110 ++++++++++++++++++++++++++++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 boot/at91bootstrap/Config.in
 create mode 100644 boot/at91bootstrap/at91bootstrap.mk

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
new file mode 100644
index 000000000..44db8f5a7
--- /dev/null
+++ b/boot/at91bootstrap/Config.in
@@ -0,0 +1,108 @@
+menuconfig BR2_TARGET_AT91BOOTSTRAP
+	depends on BR2_arm
+	bool "AT91 Bootstrap"
+
+if	BR2_TARGET_AT91BOOTSTRAP
+
+config BR2_TARGET_AT91BOOTSTRAP_BOARD
+	string "Bootstrap board"
+	default "$(BOARD_NAME)"
+	help
+	  This is used to do a make <board>_config
+
+choice
+	prompt "Boot Memory"
+	default BR2_TARGET_AT91BOOT_DATAFLASHCARD
+	depends on BR2_TARGET_AT91BOOTSTRAP
+	help
+	  Select Chip for which AT91 bootstrap should be built
+
+config BR2_TARGET_AT91BOOT_DATAFLASH
+	bool "AT45 Dataflash"
+	depends on BR2_BOOTSOURCE_DATAFLASH
+
+config BR2_TARGET_AT91BOOT_DATAFLASHCARD
+	bool "AT45 Dataflash Card"
+	depends on BR2_BOOTSOURCE_DATAFLASHCARD
+
+config BR2_TARGET_AT91BOOT_NANDFLASH
+	bool "NAND Flash"
+	depends on BR2_BOOTSOURCE_NANDFLASH
+
+config BR2_TARGET_AT91BOOT_FLASH
+	bool "Internal Flash or external parallel flash"
+	depends on BR2_BOOTSOURCE_FLASH
+
+config BR2_TARGET_AT91BOOT_SDCARD
+	bool "SD-Card"
+	depends on BR2_BOOTSOURCE_SDCARD
+
+config BR2_TARGET_AT91BOOT_EEPROM
+	bool "EEPROM"
+	depends on BR2_BOOTSOURCE_EEPROM
+
+endchoice
+
+config BR2_TARGET_AT91BOOTSTRAP_MEMORY
+	string
+	depends on BR2_TARGET_AT91BOOTSTRAP
+	default	"dataflash"	if	BR2_TARGET_AT91BOOT_DATAFLASH
+	default	"dataflashcard"	if	BR2_TARGET_AT91BOOT_DATAFLASHCARD
+	default	"nandflash"	if	BR2_TARGET_AT91BOOT_NANDFLASH
+	default	"flash"		if	BR2_TARGET_AT91BOOT_FLASH
+	default	"sdcard"	if	BR2_TARGET_AT91BOOT_SDCARD
+	default	"eeprom"	if	BR2_TARGET_AT91BOOT_EEPROM
+
+config	BR2_AT91BOOTSTRAP_IMG_SIZE
+	string	"Image Size to copy to SDRAM"
+	depends on BR2_TARGET_AT91BOOTSTRAP
+	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASH
+	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASHCARD
+	default	"0x30000"	if	BR2_TARGET_AT91BOOT_NANDFLASH
+	default	"0x100000"	if	BR2_TARGET_AT91BOOT_FLASH
+	default	"0x30000"	if	BR2_TARGET_AT91BOOT_SDCARD
+	default	"0x30000"	if	BR2_TARGET_AT91BOOT_EEPROM
+	help
+	  Select the size of your application
+	  AT91 Bootstrap will copy this amount from flash to SDRAM
+
+choice
+	prompt "Start address of application"
+	default BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
+	depends on BR2_TARGET_AT91BOOTSTRAP
+	help
+	  Select Chip for which AT91 bootstrap should be built
+	  Currently supports AT91SAM9260EK, AT91SAM9261EK,
+	  AT91SAM9XEEK, AT91SAM9263EK
+
+
+config	BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
+	bool "Copy to the default U-Boot start location in the SDRAM"
+	help
+	  This is where you copy the U-Boot boot loader
+
+config	BR2_AT91BOOTSTRAP_JUMP_TO_HIGH_SDRAM
+	bool "Copy to the last Megabyte of the SDRAM"
+	help
+	  This is where you copy a boot loader
+
+config	BR2_AT91BOOTSTRAP_JUMP_TO_START_OF_SDRAM
+	bool "Copy to the start of the SDRAM"
+	help
+	  This is where you copy a standalone application
+endchoice
+
+config	BR2_AT91BOOTSTRAP_JUMP_ADDR
+	string
+	default	"0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
+	default	"0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_HIGH_SDRAM
+	default "0x20000000" if BR2_AT91BOOTSTRAP_JUMP_TO_START_OF_SDRAM
+	depends on BR2_TARGET_AT91BOOTSTRAP
+
+comment "It will be copied to $(BR2_AT91BOOTSTRAP_JUMP_ADDR)"
+	depends on BR2_TARGET_AT91BOOTSTRAP
+
+endif
+
+
+
diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
new file mode 100644
index 000000000..2072c6bf6
--- /dev/null
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -0,0 +1,110 @@
+#############################################################
+#
+# at91bootstrap
+#
+#############################################################
+AT91BOOTSTRAP_VERSION:=2.10
+AT91BOOTSTRAP_PATCH_LEVEL:=
+AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL)
+AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)
+ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
+AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)
+AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2
+AT91BOOTSTRAP_DIR:=$(BUILD_DIR)/$(AT91BOOTSTRAP_NAME)
+AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP))
+AT91BOOTSTRAP_ZCAT:=$(BZCAT)
+
+AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))
+
+AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY))
+
+AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_PATCHED_VERSION).bin
+
+AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
+
+AT91BOOTSTRAP_JUMP_ADDR:=$(call qstrip,$(BR2_AT91BOOTSTRAP_JUMP_ADDR))
+AT91BOOTSTRAP_IMG_SIZE:=$(call qstrip,$(BR2_AT91BOOTSTRAP_IMG_SIZE))
+
+AT91_CUSTOM_FLAGS:=
+ifneq ($(AT91BOOTSTRAP_JUMP_ADDR),)
+AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR)
+endif
+ifneq ($(AT91BOOTSTRAP_IMG_SIZE),)
+AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE)
+endif
+
+$(DL_DIR)/$(AT91BOOTSTRAP_SOURCE):
+	 $(call DOWNLOAD,$(AT91BOOTSTRAP_SITE),$(AT91BOOTSTRAP_SOURCE))
+
+$(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
+	mkdir -p $(BUILD_DIR)
+	$(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) boot/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch
+	touch $(AT91BOOTSTRAP_DIR)/.unpacked
+
+$(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
+	$(MAKE) \
+		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
+		CROSS_COMPILE=$(TARGET_CROSS) \
+		-C $(AT91BOOTSTRAP_DIR) \
+		$(AT91BOOTSTRAP_BOARD)_defconfig
+	touch $(AT91BOOTSTRAP_DIR)/.configured
+
+#		$(BOARD_NAME)_defconfig
+
+$(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
+	$(MAKE) \
+		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
+		CROSS_COMPILE=$(TARGET_CROSS) \
+		AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \
+		-C $(AT91BOOTSTRAP_DIR)
+
+$(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
+	mkdir -p $(BINARIES_DIR)
+ifeq	($(AT91BOOTSTRAP_VERSION),2.3)
+	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(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 || \
+		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 $@
+
+#	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
+#	cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY)
+
+.PHONY: at91bootstrap at91bootstrap-source
+
+at91bootstrap: $(AT91BOOTSTRAP_DIR)/.installed
+
+at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
+
+at91bootstrap-unpacked: $(AT91BOOTSTRAP_DIR)/.unpacked
+
+.PHONY: at91bootstrap-clean at91bootstrap-dirclean
+
+at91bootstrap-clean:
+	make -C $(AT91BOOTSTRAP_DIR) clean
+
+at91bootstrap-dirclean:
+	rm -rf $(AT91BOOTSTRAP_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
+TARGETS+=at91bootstrap
+endif
+
+at91bootstrap-status:
+	@echo AT91BOOTSTRAP_BOARD=$(AT91BOOTSTRAP_BOARD)
+
-- 
cgit v1.2.3


From 5eaa0e7faea81f21c5d0c9fb8c3b8fd8a53386b0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Mar 2010 18:25:25 +0100
Subject: boot: remove references to COPYTO

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/at91bootstrap.mk         | 6 ------
 boot/at91dataflashboot/at91dataflashboot.mk | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 2072c6bf6..dc475e4f2 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -63,22 +63,16 @@ $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
 	mkdir -p $(BINARIES_DIR)
 ifeq	($(AT91BOOTSTRAP_VERSION),2.3)
 	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(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 || \
 		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 $@
 
 #	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-#	cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY)
 
 .PHONY: at91bootstrap at91bootstrap-source
 
diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk
index 8939c2897..519328c6c 100644
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@@ -31,8 +31,7 @@ DataflashBoot-dirclean:
 	rm -rf $(DATAFLASHBOOT_DIR)
 
 dataflash:	 $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY)
-	$(call COPY_FILE, $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY), $(TARGET_ATMEL_COPYTO),	$(BOARD_NAME)-$(DATAFLASHBOOT_BINARY))
-
+	cp $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY) $(BINARIES_DIR)
 
 #############################################################
 #
-- 
cgit v1.2.3


From de5dfe4a1ee74e6f44166e7dbde8f64a388ce6ba Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Mar 2010 08:43:15 +0100
Subject: at91bootstrap: do not default to $(BOARD_NAME)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 44db8f5a7..8514ccc0c 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -6,7 +6,7 @@ if	BR2_TARGET_AT91BOOTSTRAP
 
 config BR2_TARGET_AT91BOOTSTRAP_BOARD
 	string "Bootstrap board"
-	default "$(BOARD_NAME)"
+	default ""
 	help
 	  This is used to do a make <board>_config
 
-- 
cgit v1.2.3


From 1b3ff4a6490c66c88c9bb725e5465a508b39899d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Mar 2010 08:44:13 +0100
Subject: at91bootstrap: simplify configuration

There no need to depends on BR2_TARGET_AT91BOOTSTRAP when the
configuration options are already inside a if
BR2_TARGET_AT91BOOTSTRAP.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/Config.in | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 8514ccc0c..8efbd13a2 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -13,7 +13,6 @@ config BR2_TARGET_AT91BOOTSTRAP_BOARD
 choice
 	prompt "Boot Memory"
 	default BR2_TARGET_AT91BOOT_DATAFLASHCARD
-	depends on BR2_TARGET_AT91BOOTSTRAP
 	help
 	  Select Chip for which AT91 bootstrap should be built
 
@@ -45,7 +44,6 @@ endchoice
 
 config BR2_TARGET_AT91BOOTSTRAP_MEMORY
 	string
-	depends on BR2_TARGET_AT91BOOTSTRAP
 	default	"dataflash"	if	BR2_TARGET_AT91BOOT_DATAFLASH
 	default	"dataflashcard"	if	BR2_TARGET_AT91BOOT_DATAFLASHCARD
 	default	"nandflash"	if	BR2_TARGET_AT91BOOT_NANDFLASH
@@ -55,7 +53,6 @@ config BR2_TARGET_AT91BOOTSTRAP_MEMORY
 
 config	BR2_AT91BOOTSTRAP_IMG_SIZE
 	string	"Image Size to copy to SDRAM"
-	depends on BR2_TARGET_AT91BOOTSTRAP
 	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASH
 	default	"0x32000"	if	BR2_TARGET_AT91BOOT_DATAFLASHCARD
 	default	"0x30000"	if	BR2_TARGET_AT91BOOT_NANDFLASH
@@ -69,7 +66,6 @@ config	BR2_AT91BOOTSTRAP_IMG_SIZE
 choice
 	prompt "Start address of application"
 	default BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
-	depends on BR2_TARGET_AT91BOOTSTRAP
 	help
 	  Select Chip for which AT91 bootstrap should be built
 	  Currently supports AT91SAM9260EK, AT91SAM9261EK,
@@ -97,10 +93,6 @@ config	BR2_AT91BOOTSTRAP_JUMP_ADDR
 	default	"0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
 	default	"0x23F00000" if BR2_AT91BOOTSTRAP_JUMP_TO_HIGH_SDRAM
 	default "0x20000000" if BR2_AT91BOOTSTRAP_JUMP_TO_START_OF_SDRAM
-	depends on BR2_TARGET_AT91BOOTSTRAP
-
-comment "It will be copied to $(BR2_AT91BOOTSTRAP_JUMP_ADDR)"
-	depends on BR2_TARGET_AT91BOOTSTRAP
 
 endif
 
-- 
cgit v1.2.3


From 5880111f2aebd5f35545581f4c231ff4abf8b3b6 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Mar 2010 08:45:02 +0100
Subject: at91bootstrap: fix the boot source selection

The boot source configuration options were depending on U-Boot
configuration options. Let's make it independent and just allow the
user to select whichever boot source is appropriate.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/Config.in | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 8efbd13a2..7c0f393bf 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -18,27 +18,21 @@ choice
 
 config BR2_TARGET_AT91BOOT_DATAFLASH
 	bool "AT45 Dataflash"
-	depends on BR2_BOOTSOURCE_DATAFLASH
 
 config BR2_TARGET_AT91BOOT_DATAFLASHCARD
 	bool "AT45 Dataflash Card"
-	depends on BR2_BOOTSOURCE_DATAFLASHCARD
 
 config BR2_TARGET_AT91BOOT_NANDFLASH
 	bool "NAND Flash"
-	depends on BR2_BOOTSOURCE_NANDFLASH
 
 config BR2_TARGET_AT91BOOT_FLASH
 	bool "Internal Flash or external parallel flash"
-	depends on BR2_BOOTSOURCE_FLASH
 
 config BR2_TARGET_AT91BOOT_SDCARD
 	bool "SD-Card"
-	depends on BR2_BOOTSOURCE_SDCARD
 
 config BR2_TARGET_AT91BOOT_EEPROM
 	bool "EEPROM"
-	depends on BR2_BOOTSOURCE_EEPROM
 
 endchoice
 
-- 
cgit v1.2.3


From b19272d4bef98a8d46d06fe968beab031026d9f3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Mar 2010 08:46:03 +0100
Subject: at91bootstrap: fix incorrect config option comment

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/Config.in | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 7c0f393bf..1bf8d50d2 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -61,10 +61,7 @@ choice
 	prompt "Start address of application"
 	default BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
 	help
-	  Select Chip for which AT91 bootstrap should be built
-	  Currently supports AT91SAM9260EK, AT91SAM9261EK,
-	  AT91SAM9XEEK, AT91SAM9263EK
-
+	  Location of the application start address
 
 config	BR2_AT91BOOTSTRAP_JUMP_TO_DEFAULT
 	bool "Copy to the default U-Boot start location in the SDRAM"
-- 
cgit v1.2.3


From 004acd88b14a8ad146a45932ded4416cbe1c07ac Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Mar 2010 08:46:39 +0100
Subject: at91bootstrap: remove unused/useless code

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/at91bootstrap.mk | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index dc475e4f2..1d1091e14 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -50,8 +50,6 @@ $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
 		$(AT91BOOTSTRAP_BOARD)_defconfig
 	touch $(AT91BOOTSTRAP_DIR)/.configured
 
-#		$(BOARD_NAME)_defconfig
-
 $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 	$(MAKE) \
 		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
@@ -61,19 +59,13 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 
 $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
 	mkdir -p $(BINARIES_DIR)
-ifeq	($(AT91BOOTSTRAP_VERSION),2.3)
-	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-else
 	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
 		CROSS_COMPILE=$(TARGET_CROSS) \
 		-C $(AT91BOOTSTRAP_DIR) boot
 	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \
 		echo "Could not copy bootstrap to BINARIES_DIR"
-endif
 	touch $@
 
-#	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
-
 .PHONY: at91bootstrap at91bootstrap-source
 
 at91bootstrap: $(AT91BOOTSTRAP_DIR)/.installed
@@ -97,8 +89,4 @@ at91bootstrap-dirclean:
 #############################################################
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 TARGETS+=at91bootstrap
-endif
-
-at91bootstrap-status:
-	@echo AT91BOOTSTRAP_BOARD=$(AT91BOOTSTRAP_BOARD)
 
-- 
cgit v1.2.3


From 8704da32fa5d6fe5e890b274eef9b1e93a238d28 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Mar 2010 08:46:56 +0100
Subject: at91bootstrap: add a check to verify that
 BR2_TARGET_AT91BOOTSTRAP_BOARD is set

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/at91bootstrap.mk | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index 1d1091e14..b71df8977 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -90,3 +90,8 @@ at91bootstrap-dirclean:
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
 TARGETS+=at91bootstrap
 
+# we NEED a board name
+ifeq ($(AT91BOOTSTRAP_BOARD),)
+$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting)
+endif
+endif
-- 
cgit v1.2.3


From 811b67a71b1c4e89ffb726e5fde691f764bbb2c9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 31 May 2010 19:30:32 +0200
Subject: at91bootstrap: bump version to 2.13

At the same time, remove the unused AT91BOOTSTRAP_PATCH_LEVEL and
AT91BOOTSTRAP_PATCHED_VERSION variables.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/at91bootstrap.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index b71df8977..d6e2c18c5 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -3,9 +3,7 @@
 # at91bootstrap
 #
 #############################################################
-AT91BOOTSTRAP_VERSION:=2.10
-AT91BOOTSTRAP_PATCH_LEVEL:=
-AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL)
+AT91BOOTSTRAP_VERSION:=2.13
 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)
 ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
 AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)
@@ -18,7 +16,7 @@ AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))
 
 AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY))
 
-AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_PATCHED_VERSION).bin
+AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_VERSION).bin
 
 AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
 
-- 
cgit v1.2.3


From dc572b7e30dddd66350cc6d505ae61c4e481c9de Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 31 May 2010 19:31:30 +0200
Subject: at91bootstrap: don't use the ATMEL_MIRROR thing

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/at91bootstrap.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index d6e2c18c5..bad5ceec9 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -5,8 +5,7 @@
 #############################################################
 AT91BOOTSTRAP_VERSION:=2.13
 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)
-ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
-AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)
+AT91BOOTSTRAP_SITE:=ftp://www.at91.com/pub/buildroot/
 AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2
 AT91BOOTSTRAP_DIR:=$(BUILD_DIR)/$(AT91BOOTSTRAP_NAME)
 AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP))
-- 
cgit v1.2.3


From f195596132326fe7640f6c2ae4020294a50137b0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 31 May 2010 19:31:44 +0200
Subject: at91bootstrap: fix install procedure

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/at91bootstrap.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index bad5ceec9..fc7206eaf 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -56,11 +56,10 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
 
 $(AT91BOOTSTRAP_DIR)/.installed:: $(AT91BOOTSTRAP_TARGET)
 	mkdir -p $(BINARIES_DIR)
-	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
-		-C $(AT91BOOTSTRAP_DIR) boot
-	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install || \
-		echo "Could not copy bootstrap to BINARIES_DIR"
+	make MEMORY=$(AT91BOOTSTRAP_MEMORY) 	\
+		CROSS_COMPILE=$(TARGET_CROSS) 	\
+		DESTDIR=$(BINARIES_DIR) 	\
+		-C $(AT91BOOTSTRAP_DIR) install
 	touch $@
 
 .PHONY: at91bootstrap at91bootstrap-source
-- 
cgit v1.2.3


From 793f5faa3384146beda496fad75ddb15e2ee5a93 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 31 May 2010 19:38:03 +0200
Subject: at91bootstrap: fix AT91BOOTSTRAP_BINARY

Use AT91BOOTSTRAP_BOARD instead of BOARD_NAME. Remove
AT91BOOTSTRAP_VERSION from the final binary image name.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/at91bootstrap/at91bootstrap.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'boot/at91bootstrap')

diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk
index fc7206eaf..903069653 100644
--- a/boot/at91bootstrap/at91bootstrap.mk
+++ b/boot/at91bootstrap/at91bootstrap.mk
@@ -12,13 +12,9 @@ AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP))
 AT91BOOTSTRAP_ZCAT:=$(BZCAT)
 
 AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD))
-
 AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY))
-
-AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_VERSION).bin
-
+AT91BOOTSTRAP_BINARY:=$(AT91BOOTSTRAP_BOARD)-$(AT91BOOTSTRAP_MEMORY)boot.bin
 AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
-
 AT91BOOTSTRAP_JUMP_ADDR:=$(call qstrip,$(BR2_AT91BOOTSTRAP_JUMP_ADDR))
 AT91BOOTSTRAP_IMG_SIZE:=$(call qstrip,$(BR2_AT91BOOTSTRAP_IMG_SIZE))
 
-- 
cgit v1.2.3