From d9d4be3ca5cd51baf81e6eaf9f70c007cd802dc8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 3 Jun 2024 13:55:48 +0200 Subject: [PATCH] boot/at91bootstrap: remove package The upstream is no longer available, no defconfigs use it and the package has been replaced 12 years ago with at91bootstrap3 with commit ca0d69c61cc (at91bootstrap3: new package), so remove it. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 - Config.in.legacy | 7 + boot/Config.in | 1 - boot/at91bootstrap/0001-eabi-fix.patch | 334 ------------------ .../0002-gcc-4.6.x-ldscript-fix.patch | 29 -- .../0003-u-boot-relocation-fix.patch | 284 --------------- boot/at91bootstrap/Config.in | 49 --- boot/at91bootstrap/at91bootstrap.hash | 3 - boot/at91bootstrap/at91bootstrap.mk | 55 --- 9 files changed, 7 insertions(+), 758 deletions(-) delete mode 100644 boot/at91bootstrap/0001-eabi-fix.patch delete mode 100644 boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch delete mode 100644 boot/at91bootstrap/0003-u-boot-relocation-fix.patch delete mode 100644 boot/at91bootstrap/Config.in delete mode 100644 boot/at91bootstrap/at91bootstrap.hash delete mode 100644 boot/at91bootstrap/at91bootstrap.mk diff --git a/.checkpackageignore b/.checkpackageignore index 1c5ab08f5f..3b493de92d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -96,9 +96,6 @@ board/toradex/apalis-imx6/post-image.sh Shellcheck board/udoo/common/post-build.sh Shellcheck board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch lib_patch.Upstream boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch lib_patch.Upstream -boot/at91bootstrap/0001-eabi-fix.patch lib_patch.Upstream -boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch lib_patch.Upstream -boot/at91bootstrap/0003-u-boot-relocation-fix.patch lib_patch.Upstream boot/at91dataflashboot/0001-do-not-install.patch lib_patch.Upstream boot/at91dataflashboot/0002-eabi-fixes.patch lib_patch.Upstream boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index b5a87d4e88..7e5bc28bae 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TARGET_AT91BOOTSTRAP + bool "at91bootstrap removed" + select BR2_LEGACY + help + Upstream for at91bootstrap 1.x is no longer available and + has been replaced by at91bootstrap3. + config BR2_PACKAGE_ON2_8170_MODULES bool "on2-8170-modules removed" select BR2_LEGACY diff --git a/boot/Config.in b/boot/Config.in index 87e1b7c00e..3e00d28e56 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -1,7 +1,6 @@ menu "Bootloaders" source "boot/afboot-stm32/Config.in" -source "boot/at91bootstrap/Config.in" source "boot/at91bootstrap3/Config.in" source "boot/at91dataflashboot/Config.in" source "boot/arm-trusted-firmware/Config.in" diff --git a/boot/at91bootstrap/0001-eabi-fix.patch b/boot/at91bootstrap/0001-eabi-fix.patch deleted file mode 100644 index eab3c20928..0000000000 --- a/boot/at91bootstrap/0001-eabi-fix.patch +++ /dev/null @@ -1,334 +0,0 @@ -When using an EABI toolchain, the default compilation generates -references to __aeabi_unwind_cpp_pr0(). This symbol is defined in -libgcc, but we don't want to use it for a bootloader. - -Therefore, this patch passes some additional CFLAGS to disable the -generation of such references by avoiding unwind tables, exceptions, -etc. - -Signed-off-by: Thomas Petazzoni ---- - board/at91cap9adk/dataflash/Makefile | 2 +- - board/at91cap9adk/norflash/Makefile | 2 +- - board/at91cap9stk/nandflash/Makefile | 2 +- - board/at91sam9260ek/dataflash/Makefile | 2 +- - board/at91sam9260ek/nandflash/Makefile | 2 +- - board/at91sam9261ek/dataflash/Makefile | 2 +- - board/at91sam9261ek/nandflash/Makefile | 2 +- - board/at91sam9263ek/dataflash/Makefile | 2 +- - board/at91sam9263ek/nandflash/Makefile | 2 +- - board/at91sam9g10ek/dataflash/Makefile | 2 +- - board/at91sam9g10ek/nandflash/Makefile | 2 +- - board/at91sam9g20ek/dataflash/Makefile | 2 +- - board/at91sam9g20ek/nandflash/Makefile | 2 +- - board/at91sam9g45ekes/nandflash/Makefile | 2 +- - board/at91sam9m10ekes/dataflash/Makefile | 2 +- - board/at91sam9m10ekes/nandflash/Makefile | 2 +- - board/at91sam9m10g45ek/dataflash/Makefile | 2 +- - board/at91sam9m10g45ek/nandflash/Makefile | 2 +- - board/at91sam9rlek/dataflash/Makefile | 2 +- - board/at91sam9rlek/nandflash/Makefile | 2 +- - board/at91sam9xeek/dataflash/Makefile | 2 +- - board/at91sam9xeek/nandflash/Makefile | 2 +- - lib/Makefile | 2 +- - 23 files changed, 23 insertions(+), 23 deletions(-) - -Index: Bootstrap-v1.16/board/at91cap9adk/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9adk/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9adk/dataflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91cap9adk/norflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9adk/norflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9adk/norflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91cap9stk/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91cap9stk/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91cap9stk/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -D$(BOARD) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - -Index: Bootstrap-v1.16/board/at91sam9260ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9260ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9260ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9260ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9260ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9260ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9261ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9261ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9261ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9261ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9261ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9261ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9263ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9263ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9263ek/dataflash/Makefile -@@ -34,7 +34,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9263ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9263ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9263ek/nandflash/Makefile -@@ -33,7 +33,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -O0 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g10ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g10ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g10ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g10ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g10ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g10ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g20ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g20ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g20ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g20ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g20ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g20ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9g45ekes/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9g45ekes/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9g45ekes/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10ekes/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10ekes/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10ekes/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10ekes/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10ekes/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10ekes/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10g45ek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10g45ek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10g45ek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9m10g45ek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9m10g45ek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9m10g45ek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -O2 -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -O2 -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9rlek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9rlek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9rlek/dataflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9rlek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9rlek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9rlek/nandflash/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9xeek/dataflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9xeek/dataflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9xeek/dataflash/Makefile -@@ -38,7 +38,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/board/at91sam9xeek/nandflash/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/board/at91sam9xeek/nandflash/Makefile -+++ Bootstrap-v1.16/board/at91sam9xeek/nandflash/Makefile -@@ -38,7 +38,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm9 -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm9 -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. -Index: Bootstrap-v1.16/lib/Makefile -=================================================================== ---- Bootstrap-v1.16.orig/lib/Makefile -+++ Bootstrap-v1.16/lib/Makefile -@@ -37,7 +37,7 @@ - SIZE=$(CROSS_COMPILE)size - OBJCOPY=$(CROSS_COMPILE)objcopy - OBJDUMP=$(CROSS_COMPILE)objdump --CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -+CCFLAGS=-g -mcpu=arm926ej-s -Os -Wall -D$(TARGET) -I$(INCL) -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables - ASFLAGS=-g -mcpu=arm926ej-s -c -Os -Wall -D$(TARGET) -I$(INCL) -DTOP_OF_MEM=$(TOP_OF_MEMORY) - - # Linker flags. diff --git a/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch b/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch deleted file mode 100644 index e4ed04e865..0000000000 --- a/boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b783d1f9bf985c0981e755bd2c13e091e9d6837f Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Tue, 6 Nov 2012 09:38:50 +0100 -Subject: [PATCH] at91bootstrap: fix overlap linker issue - -The linker script of the at91bootstrap package has to be modified when -built from gcc-4.6.x version. Indeed a section named text.startup is -created and has to be added into the text section. - -Signed-off-by: Gregory Hermant ---- - elf32-littlearm.lds | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/elf32-littlearm.lds b/elf32-littlearm.lds -index a33952f..4f3ba25 100644 ---- a/elf32-littlearm.lds -+++ b/elf32-littlearm.lds -@@ -7,6 +7,7 @@ SECTIONS - .text : { - _stext = .; - *(.text) -+ *(.text*) - *(.rodata) /* read-only data (constants) */ - *(.rodata*) - . = ALIGN(4); --- -1.7.9.5 - diff --git a/boot/at91bootstrap/0003-u-boot-relocation-fix.patch b/boot/at91bootstrap/0003-u-boot-relocation-fix.patch deleted file mode 100644 index 0c9b9114cb..0000000000 --- a/boot/at91bootstrap/0003-u-boot-relocation-fix.patch +++ /dev/null @@ -1,284 +0,0 @@ -From d4e4a1aad559e35d84b445d1379be94ad036984e Mon Sep 17 00:00:00 2001 -From: Alexandre Belloni -Date: Thu, 25 Oct 2012 22:57:14 +0200 -Subject: [PATCH] u-boot relocation fix - -Every AT91SAM plaforms were broken between 2010.12 and 2011.03 because -of the relocation changes. - -We have to get JUMP_ADDR consistant with what is used by u-boot -(CONFIG_SYS_TEXT_BASE). - -I didn't know what to do with at91sam9m10g45ek as it doesn't seems to be -converted yet. But anyway, that means that it is either not working or -doesn't care so changing it here shouldn't harm. - -We also have to increase the IMG_SIZE as u-boot as grown larger than the -default value. As requested on the u-boot ML, we assume that it could -be up to 495kB big. - -It means that now, you have to flash your kernel at 0x00084000 instead -of 0x00042000. And so you also have to load it from that adress from -u-boot. - -Then, remember that you could decrease IMG_SIZE to boot faster. - -Signed-off-by: Alexandre Belloni ---- - board/at91sam9260ek/dataflash/at91sam9260ek.h | 4 ++-- - board/at91sam9260ek/nandflash/at91sam9260ek.h | 2 +- - board/at91sam9261ek/dataflash/at91sam9261ek.h | 4 ++-- - board/at91sam9261ek/nandflash/at91sam9261ek.h | 2 +- - board/at91sam9263ek/dataflash/at91sam9263ek.h | 4 ++-- - board/at91sam9263ek/nandflash/at91sam9263ek.h | 2 +- - board/at91sam9g10ek/dataflash/at91sam9g10ek.h | 4 ++-- - board/at91sam9g10ek/nandflash/at91sam9g10ek.h | 2 +- - board/at91sam9g20ek/dataflash/at91sam9g20ek.h | 4 ++-- - board/at91sam9g20ek/nandflash/at91sam9g20ek.h | 2 +- - board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h | 2 +- - .../at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h | 2 +- - board/at91sam9rlek/dataflash/at91sam9rlek.h | 4 ++-- - board/at91sam9rlek/nandflash/at91sam9rlek.h | 2 +- - board/at91sam9xeek/dataflash/at91sam9xeek.h | 4 ++-- - board/at91sam9xeek/nandflash/at91sam9xeek.h | 2 +- - 16 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/board/at91sam9260ek/dataflash/at91sam9260ek.h b/board/at91sam9260ek/dataflash/at91sam9260ek.h -index 1834246..91081a1 100644 ---- a/board/at91sam9260ek/dataflash/at91sam9260ek.h -+++ b/board/at91sam9260ek/dataflash/at91sam9260ek.h -@@ -74,10 +74,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9260ek/nandflash/at91sam9260ek.h b/board/at91sam9260ek/nandflash/at91sam9260ek.h -index 2cac601..f8fdff2 100644 ---- a/board/at91sam9260ek/nandflash/at91sam9260ek.h -+++ b/board/at91sam9260ek/nandflash/at91sam9260ek.h -@@ -92,7 +92,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9260-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9261ek/dataflash/at91sam9261ek.h b/board/at91sam9261ek/dataflash/at91sam9261ek.h -index 8ce30e9..276ba3d 100644 ---- a/board/at91sam9261ek/dataflash/at91sam9261ek.h -+++ b/board/at91sam9261ek/dataflash/at91sam9261ek.h -@@ -97,10 +97,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9261ek/nandflash/at91sam9261ek.h b/board/at91sam9261ek/nandflash/at91sam9261ek.h -index badc3ac..e628c97 100644 ---- a/board/at91sam9261ek/nandflash/at91sam9261ek.h -+++ b/board/at91sam9261ek/nandflash/at91sam9261ek.h -@@ -114,7 +114,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9263ek/dataflash/at91sam9263ek.h b/board/at91sam9263ek/dataflash/at91sam9263ek.h -index 5c9da4b..870f9e2 100644 ---- a/board/at91sam9263ek/dataflash/at91sam9263ek.h -+++ b/board/at91sam9263ek/dataflash/at91sam9263ek.h -@@ -96,10 +96,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x4B2 /* AT91SAM9263-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9263ek/nandflash/at91sam9263ek.h b/board/at91sam9263ek/nandflash/at91sam9263ek.h -index 505afc7..8ab4f46 100644 ---- a/board/at91sam9263ek/nandflash/at91sam9263ek.h -+++ b/board/at91sam9263ek/nandflash/at91sam9263ek.h -@@ -108,7 +108,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 1202 /* AT91SAM9263-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -index b2faf44..f4f556b 100644 ---- a/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -+++ b/board/at91sam9g10ek/dataflash/at91sam9g10ek.h -@@ -98,10 +98,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9261-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -index 66c40a3..6c3ecda 100644 ---- a/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -+++ b/board/at91sam9g10ek/nandflash/at91sam9g10ek.h -@@ -115,7 +115,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x350 /* AT91SAM9G10-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -index eea0439..7fc70d6 100644 ---- a/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -+++ b/board/at91sam9g20ek/dataflash/at91sam9g20ek.h -@@ -75,10 +75,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -index 31bd499..e797e4d 100644 ---- a/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -+++ b/board/at91sam9g20ek/nandflash/at91sam9g20ek.h -@@ -93,7 +93,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x658 /* AT91SAM9G20-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -index a60fd41..5587a00 100644 ---- a/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -+++ b/board/at91sam9m10ekes/dataflash/at91sam9m10ekes.h -@@ -89,7 +89,7 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x9CD /* AT91SAM9M10-EKES */ - #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ -diff --git a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -index 5c726b5..9090097 100644 ---- a/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -+++ b/board/at91sam9m10g45ek/dataflash/at91sam9m10g45ek.h -@@ -85,7 +85,7 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x726 /* AT91SAM9M10G45-EK */ - #define JUMP_ADDR 0x73F00000 /* Final Jump Address */ -diff --git a/board/at91sam9rlek/dataflash/at91sam9rlek.h b/board/at91sam9rlek/dataflash/at91sam9rlek.h -index 05c42dc..150f17e 100644 ---- a/board/at91sam9rlek/dataflash/at91sam9rlek.h -+++ b/board/at91sam9rlek/dataflash/at91sam9rlek.h -@@ -89,10 +89,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS0_DATAFLASH /* Boot on SPI NCS0 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9rlek/nandflash/at91sam9rlek.h b/board/at91sam9rlek/nandflash/at91sam9rlek.h -index 656b4ba..594db8f 100644 ---- a/board/at91sam9rlek/nandflash/at91sam9rlek.h -+++ b/board/at91sam9rlek/nandflash/at91sam9rlek.h -@@ -112,7 +112,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 1326 /* AT91SAM9RL-EK */ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9xeek/dataflash/at91sam9xeek.h b/board/at91sam9xeek/dataflash/at91sam9xeek.h -index 27d1822..08e515d 100644 ---- a/board/at91sam9xeek/dataflash/at91sam9xeek.h -+++ b/board/at91sam9xeek/dataflash/at91sam9xeek.h -@@ -74,10 +74,10 @@ - #define AT91C_SPI_PCS_DATAFLASH AT91C_SPI_PCS1_DATAFLASH /* Boot on SPI NCS1 */ - - #define IMG_ADDRESS 0x8400 /* Image Address in DataFlash */ --#define IMG_SIZE 0x33900 /* Image Size in DataFlash */ -+#define IMG_SIZE 0x7BC00 /* Image Size in DataFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ -diff --git a/board/at91sam9xeek/nandflash/at91sam9xeek.h b/board/at91sam9xeek/nandflash/at91sam9xeek.h -index 5dbc63e..9fac7cb 100644 ---- a/board/at91sam9xeek/nandflash/at91sam9xeek.h -+++ b/board/at91sam9xeek/nandflash/at91sam9xeek.h -@@ -94,7 +94,7 @@ - #define IMG_SIZE 0x40000 /* Image Size in NandFlash */ - - #define MACH_TYPE 0x44B /* AT91SAM9XE-EK same id as AT91SAM9260-EK*/ --#define JUMP_ADDR 0x23F00000 /* Final Jump Address */ -+#define JUMP_ADDR 0x21F00000 /* Final Jump Address */ - - /* ******************************************************************* */ - /* Application Settings */ --- -1.7.9.5 - diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in deleted file mode 100644 index 0f6430fd8d..0000000000 --- a/boot/at91bootstrap/Config.in +++ /dev/null @@ -1,49 +0,0 @@ -config BR2_TARGET_AT91BOOTSTRAP - bool "AT91 Bootstrap" - depends on BR2_arm926t - help - AT91Bootstrap is a first level bootloader for the Atmel AT91 - devices. It integrates algorithms for: - - Device initialization such as clock configuration, PIO - settings... - - Peripheral drivers such as PIO, PMC or SDRAMC... - - Physical media algorithm such as DataFlash, NandFlash, NOR - Flash... - -if BR2_TARGET_AT91BOOTSTRAP - -config BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR - string "custom patch dir" - help - If your board requires custom patches, add the path to the - directory containing the patches here. The patches must be - named at91bootstrap--.patch. - - Most users may leave this empty - -config BR2_TARGET_AT91BOOTSTRAP_BOARD - string "Bootstrap board" - default "" - help - This is used to do a make _config - -choice - prompt "Boot Memory" - default BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - help - Select Chip for which AT91 bootstrap should be built - -config BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - bool "Data Flash" - -config BR2_TARGET_AT91BOOTSTRAP_NANDFLASH - bool "NAND Flash" - -endchoice - -config BR2_TARGET_AT91BOOTSTRAP_MEMORY - string - default "dataflash" if BR2_TARGET_AT91BOOTSTRAP_DATAFLASH - default "nandflash" if BR2_TARGET_AT91BOOTSTRAP_NANDFLASH - -endif diff --git a/boot/at91bootstrap/at91bootstrap.hash b/boot/at91bootstrap/at91bootstrap.hash deleted file mode 100644 index d9f8db8897..0000000000 --- a/boot/at91bootstrap/at91bootstrap.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 d66192a274247f4baa39fa932eadf903d7add55641d89d30402f967c4f2282a5 AT91Bootstrap1.16.zip -sha256 6a3ac5dfcf19e6bac1b1109d30d72818768a3855e2594b84fe2b012b5fe0e77b include/sdramc.h diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk deleted file mode 100644 index 385957b5d4..0000000000 --- a/boot/at91bootstrap/at91bootstrap.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# at91bootstrap -# -################################################################################ - -AT91BOOTSTRAP_VERSION = 1.16 -AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap -AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip -AT91BOOTSTRAP_LICENSE = BSD-Source-Code -AT91BOOTSTRAP_LICENSE_FILES = include/sdramc.h - -AT91BOOTSTRAP_BOARD = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD)) -AT91BOOTSTRAP_MEMORY = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY)) -AT91BOOTSTRAP_MAKE_SUBDIR = board/$(AT91BOOTSTRAP_BOARD)/$(AT91BOOTSTRAP_MEMORY) -AT91BOOTSTRAP_BINARY = $(AT91BOOTSTRAP_MAKE_SUBDIR)/$(AT91BOOTSTRAP_MEMORY)_$(AT91BOOTSTRAP_BOARD).bin - -AT91BOOTSTRAP_INSTALL_IMAGES = YES -AT91BOOTSTRAP_INSTALL_TARGET = NO - -define AT91BOOTSTRAP_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(AT91BOOTSTRAP_DL_DIR)/$(AT91BOOTSTRAP_SOURCE) - mv $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION)/* $(@D) - rmdir $(BUILD_DIR)/Bootstrap-v$(AT91BOOTSTRAP_VERSION) -endef - -ifneq ($(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR)),) -define AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES - $(APPLY_PATCHES) $(@D) $(BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR) \*.patch -endef - -AT91BOOTSTRAP_POST_PATCH_HOOKS += AT91BOOTSTRAP_APPLY_CUSTOM_PATCHES -endif - -# The at91bootstrap Makefile doesn't support customizing -# CFLAGS/LDFLAGS, so we cheat and pass our custom flags through CC and -# LD. -define AT91BOOTSTRAP_BUILD_CMDS - $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) \ - CC="$(TARGET_CC) -fno-stack-protector" \ - LD="$(TARGET_CC) -fno-PIE" \ - -C $(@D)/$(AT91BOOTSTRAP_MAKE_SUBDIR) -endef - -define AT91BOOTSTRAP_INSTALL_IMAGES_CMDS - cp $(@D)/$(AT91BOOTSTRAP_BINARY) $(BINARIES_DIR) -endef - -$(eval $(generic-package)) - -ifeq ($(BR2_TARGET_AT91BOOTSTRAP)$(BR_BUILDING),yy) -ifeq ($(AT91BOOTSTRAP_BOARD),) -$(error No AT91Bootstrap board name set. Check your BR2_TARGET_AT91BOOTSTRAP_BOARD setting) -endif -endif