bootloaders: move bootloader build code to boot/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

6 files changed, 0 insertions, 302 deletions

diff --git a/target/device/Atmel/Config.in b/target/device/Atmel/Config.in
index 4e36b9092..870c537d1 100644
--- a/target/device/Atmel/Config.in
+++ b/target/device/Atmel/Config.in
@@ -66,8 +66,4 @@ config BR2_BOARD_PATH
 
 endmenu
 
-source "target/device/Atmel/DataFlashBoot/Config.in"
-
-source "target/device/Atmel/at91bootstrap/Config.in"
-
 endif
diff --git a/target/device/Atmel/DataFlashBoot/Config.in b/target/device/Atmel/DataFlashBoot/Config.in
deleted file mode 100644
index 1da5e6274..000000000
--- a/target/device/Atmel/DataFlashBoot/Config.in
+++ /dev/null
@@ -1,23 +0,0 @@
-config BR2_TARGET_DATAFLASHBOOT
-       depends on BR2_TARGET_AT91RM9200 || BR2_TARGET_AT91SAM9261 || BR2_TARGET_AT91SAM9261S
-	bool "Build Dataflashboot for selected chip"
-
-choice
-	prompt "Target Architecture"
-	default BR2_TARGET_DATAFLASHBOOT_AT91RM9200
-	depends on BR2_TARGET_DATAFLASHBOOT
-	help
-	  Select Chip for which Dataflash boot should be built
-	  Currently only AT91RM9200 Supported
-
-config BR2_TARGET_DATAFLASHBOOT_AT91RM9200
-       depends on BR2_TARGET_AT91RM9200
-	bool "AT91RM9200"
-config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261
-       depends on BR2_TARGET_AT91SAM9261
-	bool "AT91SAM9261"
-config BR2_TARGET_DATAFLASHBOOT_AT91SAM9261S
-       depends on BR2_TARGET_AT91SAM9261S
-	bool "AT91SAM9261S"
-
-endchoice
diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
deleted file mode 100644
index 8939c2897..000000000
--- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#############################################################
-#
-# DataFlashBoot
-#
-#############################################################
-DATAFLASHBOOT_VERSION:=1.05
-DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION)
-ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR))
-DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)
-DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2
-DATAFLASHBOOT_DIR:=$(BUILD_DIR)/$(DATAFLASHBOOT_NAME)
-DATAFLASHBOOT_BINARY:=$(DATAFLASHBOOT_NAME).bin
-
-$(DL_DIR)/$(DATAFLASHBOOT_SOURCE):
-	 $(call DOWNLOAD,$(DATAFLASHBOOT_SITE),$(DATAFLASHBOOT_SOURCE))
-
-$(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE)
-	mkdir -p $(BUILD_DIR)
-	ls $(DL_DIR)/$(DATAFLASHBOOT_SOURCE)
-	$(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(DATAFLASHBOOT_DIR)/.unpacked
-
-$(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.unpacked
-	ls $(DATAFLASHBOOT_DIR)/.unpacked
-	make -C $(DATAFLASHBOOT_DIR) CROSS_COMPILE=$(TARGET_CROSS)
-
-DataflashBoot-clean:
-	make -C $(DATAFLASHBOOT_DIR) clean
-
-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))
-
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
-TARGETS+=dataflash
-endif
diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in
index c5dfffd70..6de54d7a9 100644
--- a/target/device/Atmel/Makefile.in
+++ b/target/device/Atmel/Makefile.in
@@ -66,18 +66,6 @@ include target/device/Atmel/*/Makefile.in
 UBOOT_CONFIG:=$(UBOOT_BOARD_NAME)_config
 UBOOT_CONFIG_FILE:=$(BOARD_PATH)/u-boot/$(UBOOT_BOARD_NAME).h
 
-#ifeq ($(BR2_TARGET_UBOOT_AT91),y)
-#include $(ATMEL_PATH)/u-boot/u-boot.mk
-#endif
-
-ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
-include $(ATMEL_PATH)/DataFlashBoot/DataflashBoot.mk
-endif
-
-ifeq ($(BR2_TARGET_AT91BOOTSTRAP),y)
-include $(ATMEL_PATH)/at91bootstrap/at91bootstrap.mk
-endif
-
 atmel_status:
 	@echo BUILD_DIR=$(BUILD_DIR)
 	@echo BOARD_NAME=$(BOARD_NAME)
diff --git a/target/device/Atmel/at91bootstrap/Config.in b/target/device/Atmel/at91bootstrap/Config.in
deleted file mode 100644
index 91e0b0887..000000000
--- a/target/device/Atmel/at91bootstrap/Config.in
+++ /dev/null
@@ -1,109 +0,0 @@
-menuconfig BR2_TARGET_AT91BOOTSTRAP
-	depends on BR2_TARGET_AT91SAM9260EK || BR2_TARGET_AT91SAM9260DFC || BR2_TARGET_AT91SAM9260PF || \
-	BR2_TARGET_AT91SAM9261EK || BR2_TARGET_AT91SAM9263EK || BR2_TARGET_AT91SAM9XEEK || BR2_TARGET_AT91SAM9G20DFC
-	bool "Build AT91 Bootstrap for selected chip"
-
-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/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk
deleted file mode 100644
index f681fa981..000000000
--- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-#############################################################
-#
-# 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) target/device/Atmel/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)
-