diff options
Diffstat (limited to 'boot')
25 files changed, 0 insertions, 2795 deletions
diff --git a/boot/Config.in b/boot/Config.in index 11856fd9c7..3dc11008b7 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -1,20 +1,15 @@ 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" source "boot/barebox/Config.in" source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" source "boot/grub2/Config.in" source "boot/gummiboot/Config.in" -source "boot/lpc32xxcdl/Config.in" source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" source "boot/riscv-pk/Config.in" -source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ts4800-mbrboot/Config.in" diff --git a/boot/afboot-stm32/0001-Use-ld-instead-of-gcc-for-linking.patch b/boot/afboot-stm32/0001-Use-ld-instead-of-gcc-for-linking.patch deleted file mode 100644 index 3f359dc316..0000000000 --- a/boot/afboot-stm32/0001-Use-ld-instead-of-gcc-for-linking.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0d581abe6620ac69adec321b94390e009802f36a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Sun, 13 Mar 2016 14:32:33 +0100 -Subject: [PATCH] Use ld instead of gcc for linking - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - Makefile | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index ce40314..271bb4f 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,7 @@ - CROSS_COMPILE ?= arm-none-eabi- - - CC = $(CROSS_COMPILE)gcc -+LD = $(CROSS_COMPILE)ld - OBJCOPY = $(CROSS_COMPILE)objcopy - OBJDUMP = $(CROSS_COMPILE)objdump - SIZE = $(CROSS_COMPILE)size -@@ -10,7 +11,7 @@ OPENOCD = openocd - CFLAGS := -mthumb -mcpu=cortex-m4 - CFLAGS += -ffunction-sections -fdata-sections - CFLAGS += -Os -std=gnu99 -Wall --LDFLAGS := -nostartfiles -Wl,--gc-sections -+LINKERFLAGS := -nostartfiles --gc-sections - - obj-y += gpio.o mpu.o - obj-f4 += $(obj-y) usart-f4.o -@@ -22,22 +23,22 @@ all: stm32f429i-disco stm32429i-eval stm32f469i-disco stm32746g-eval - $(CC) -c $(CFLAGS) $< -o $@ - - stm32f429i-disco: stm32f429i-disco.o $(obj-f4) -- $(CC) -T stm32f429.lds $(LDFLAGS) -o stm32f429i-disco.elf stm32f429i-disco.o $(obj-f4) -+ $(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32f429i-disco.elf stm32f429i-disco.o $(obj-f4) - $(OBJCOPY) -Obinary stm32f429i-disco.elf stm32f429i-disco.bin - $(SIZE) stm32f429i-disco.elf - - stm32429i-eval: stm32429i-eval.o $(obj-f4) -- $(CC) -T stm32f429.lds $(LDFLAGS) -o stm32429i-eval.elf stm32429i-eval.o $(obj-f4) -+ $(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32429i-eval.elf stm32429i-eval.o $(obj-f4) - $(OBJCOPY) -Obinary stm32429i-eval.elf stm32429i-eval.bin - $(SIZE) stm32429i-eval.elf - - stm32f469i-disco: stm32f469i-disco.o $(obj-f4) -- $(CC) -T stm32f429.lds $(LDFLAGS) -o stm32f469i-disco.elf stm32f469i-disco.o $(obj-f4) -+ $(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32f469i-disco.elf stm32f469i-disco.o $(obj-f4) - $(OBJCOPY) -Obinary stm32f469i-disco.elf stm32f469i-disco.bin - $(SIZE) stm32f469i-disco.elf - - stm32746g-eval: stm32746g-eval.o $(obj-f7) -- $(CC) -T stm32f429.lds $(LDFLAGS) -o stm32746g-eval.elf stm32746g-eval.o $(obj-f7) -+ $(LD) -T stm32f429.lds $(LINKERFLAGS) -o stm32746g-eval.elf stm32746g-eval.o $(obj-f7) - $(OBJCOPY) -Obinary stm32746g-eval.elf stm32746g-eval.bin - $(SIZE) stm32746g-eval.elf - --- -2.6.4 - diff --git a/boot/afboot-stm32/Config.in b/boot/afboot-stm32/Config.in deleted file mode 100644 index 309b9e0491..0000000000 --- a/boot/afboot-stm32/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_TARGET_AFBOOT_STM32 - bool "afboot-stm32" - depends on BR2_arm - help - afboot-stm32 is a very small bootloader for STM32 platforms - - https://github.com/mcoquelin-stm32/afboot-stm32 diff --git a/boot/afboot-stm32/afboot-stm32.hash b/boot/afboot-stm32/afboot-stm32.hash deleted file mode 100644 index d23b74ad21..0000000000 --- a/boot/afboot-stm32/afboot-stm32.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 dbd715c8b99f7d266f74a04707a4dac76b75b31321f24dee5256a6348260530c afboot-stm32-v0.1.tar.gz diff --git a/boot/afboot-stm32/afboot-stm32.mk b/boot/afboot-stm32/afboot-stm32.mk deleted file mode 100644 index 5e221cf364..0000000000 --- a/boot/afboot-stm32/afboot-stm32.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# afboot-stm32 -# -################################################################################ - -AFBOOT_STM32_VERSION = v0.1 -AFBOOT_STM32_SITE = $(call github,mcoquelin-stm32,afboot-stm32,$(AFBOOT_STM32_VERSION)) -AFBOOT_STM32_INSTALL_IMAGES = YES -AFBOOT_STM32_INSTALL_TARGET = NO - -define AFBOOT_STM32_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) all -endef - -define AFBOOT_STM32_INSTALL_IMAGES_CMDS - $(INSTALL) -m 0755 -t $(BINARIES_DIR) -D $(@D)/stm32*.bin -endef - -$(eval $(generic-package)) 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-<version>-<something>.patch. - - Most users may leave this empty - -config BR2_TARGET_AT91BOOTSTRAP_BOARD - string "Bootstrap board" - default "" - help - This is used to do a make <board>_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-1.16-eabi-fix.patch b/boot/at91bootstrap/at91bootstrap-1.16-eabi-fix.patch deleted file mode 100644 index eab3c20928..0000000000 --- a/boot/at91bootstrap/at91bootstrap-1.16-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 <thomas.petazzoni@free-electrons.com> ---- - 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/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch b/boot/at91bootstrap/at91bootstrap-1.16-gcc-4.6.x-ldscript-fix.patch deleted file mode 100644 index e4ed04e865..0000000000 --- a/boot/at91bootstrap/at91bootstrap-1.16-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 <gregory.hermant@calao-systems.com> -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 <gregory.hermant@calao-systems.com> ---- - 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/at91bootstrap-1.16-u-boot-relocation-fix.patch b/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch deleted file mode 100644 index 0c9b9114cb..0000000000 --- a/boot/at91bootstrap/at91bootstrap-1.16-u-boot-relocation-fix.patch +++ /dev/null @@ -1,284 +0,0 @@ -From d4e4a1aad559e35d84b445d1379be94ad036984e Mon Sep 17 00:00:00 2001 -From: Alexandre Belloni <alexandre.belloni@piout.net> -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 <alexandre.belloni@piout.net> ---- - 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/at91bootstrap.hash b/boot/at91bootstrap/at91bootstrap.hash deleted file mode 100644 index b1f963b825..0000000000 --- a/boot/at91bootstrap/at91bootstrap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 d66192a274247f4baa39fa932eadf903d7add55641d89d30402f967c4f2282a5 AT91Bootstrap1.16.zip diff --git a/boot/at91bootstrap/at91bootstrap.mk b/boot/at91bootstrap/at91bootstrap.mk deleted file mode 100644 index c68b56b6ec..0000000000 --- a/boot/at91bootstrap/at91bootstrap.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# at91bootstrap -# -################################################################################ - -AT91BOOTSTRAP_VERSION = 1.16 -AT91BOOTSTRAP_SITE = ftp://www.at91.com/pub/at91bootstrap -AT91BOOTSTRAP_SOURCE = AT91Bootstrap$(AT91BOOTSTRAP_VERSION).zip - -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 - -define AT91BOOTSTRAP_BUILD_CMDS - $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -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 diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in deleted file mode 100644 index 4055f96410..0000000000 --- a/boot/at91dataflashboot/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_TARGET_AT91DATAFLASHBOOT - bool "AT91 DataFlashBoot" - depends on BR2_arm926t diff --git a/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch b/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch deleted file mode 100644 index 41d97ad20e..0000000000 --- a/boot/at91dataflashboot/at91dataflashboot-1.05-do-not-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disable the automatic installation of at91dataflashboot since it tries -to install things to /tftpboot, which is not possible when not -building as root. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: at91dataflashboot-1.05/Makefile -=================================================================== ---- at91dataflashboot-1.05.orig/Makefile -+++ at91dataflashboot-1.05/Makefile -@@ -40,7 +40,7 @@ - - I=config.h com.h dataflash.h embedded_services.h main.h stdio.h include/AT91RM9200.h include/lib_AT91RM9200.h - --all: clean $(BINNAME) $(LSSNAME) install -+all: clean $(BINNAME) $(LSSNAME) - $(SIZE) $(OUTNAME) - - # C objects here diff --git a/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch b/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch deleted file mode 100644 index e38905f7cb..0000000000 --- a/boot/at91dataflashboot/at91dataflashboot-1.05-eabi-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -Get at91dataflashboot to build with EABI toolchains, by providing the -__aeabi_uidiv and __aeabi_uidivmod symbols. The code is based on -U-Boot's code. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - _udivsi3.S | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -Index: DataflashBoot-1.05/_udivsi3.S -=================================================================== ---- DataflashBoot-1.05.orig/_udivsi3.S -+++ DataflashBoot-1.05/_udivsi3.S -@@ -12,8 +12,11 @@ - .text - .globl __udivsi3 - .type __udivsi3 ,function -+ .globl __aeabi_uidiv -+ .type __aeabi_uidiv ,function - .align 0 - __udivsi3 : -+ __aeabi_uidiv: - cmp divisor, #0 - beq Ldiv0 - mov curbit, #1 -@@ -68,6 +71,17 @@ - mov r0, #0 @ about as wrong as it could be - ldmia sp!, {pc} - .size __udivsi3 , . - __udivsi3 -+ -+.globl __aeabi_uidivmod -+__aeabi_uidivmod: -+ -+ stmfd sp!, {r0, r1, ip, lr} -+ bl __aeabi_uidiv -+ ldmfd sp!, {r1, r2, ip, lr} -+ mul r3, r0, r2 -+ sub r1, r1, r3 -+ mov pc, lr -+ - /* # 235 "libgcc1.S" */ - /* # 320 "libgcc1.S" */ - /* # 421 "libgcc1.S" */ diff --git a/boot/at91dataflashboot/at91dataflashboot.hash b/boot/at91dataflashboot/at91dataflashboot.hash deleted file mode 100644 index 57df4e5389..0000000000 --- a/boot/at91dataflashboot/at91dataflashboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 2cfeb6a9236e1a743c8010f05e504dbc92169ef42d9a6cf7948954a577bfc386 DataflashBoot-1.05.tar.bz2 diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk deleted file mode 100644 index 0ad8b6fc44..0000000000 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# at91dataflashboot -# -################################################################################ - -AT91DATAFLASHBOOT_VERSION = 1.05 -AT91DATAFLASHBOOT_SOURCE = DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).tar.bz2 -AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot - -AT91DATAFLASHBOOT_INSTALL_TARGET = NO -AT91DATAFLASHBOOT_INSTALL_IMAGES = YES - -define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) -endef - -define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS - cp $(@D)/DataflashBoot-$(AT91DATAFLASHBOOT_VERSION).bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) diff --git a/boot/lpc32xxcdl/Config.in b/boot/lpc32xxcdl/Config.in deleted file mode 100644 index 97137aa7d4..0000000000 --- a/boot/lpc32xxcdl/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_TARGET_LPC32XXCDL - bool "LPC32XX CDL (kickstart and S1L)" - depends on BR2_arm926t - -if BR2_TARGET_LPC32XXCDL - -config BR2_TARGET_LPC32XXCDL_BOARDNAME - string "LPC32xx board name" - -endif #BR2_TARGET_LPC32XXCDL diff --git a/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch b/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch deleted file mode 100644 index 6aecbdeba6..0000000000 --- a/boot/lpc32xxcdl/lpc32xxcdl-2.11-compiler_name.patch +++ /dev/null @@ -1,52 +0,0 @@ -Use CROSS_COMPILE as compiler name and stop using libc - -Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com> ---- - makerule/lpc32xx/make.lpc32xx.gnu | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu -index 1014c28..3277d99 100644 ---- a/makerule/lpc32xx/make.lpc32xx.gnu -+++ b/makerule/lpc32xx/make.lpc32xx.gnu -@@ -27,19 +27,19 @@ CFLAGS += -mno-sched-prolog -fno-hosted -mno-thumb-interwork -ffunction-sectio - CFLAGS += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - AFLAGS = -mcpu=arm926ej-s - AFLAGS += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) --CC = arm-none-eabi-gcc --AS = arm-none-eabi-as --AR = arm-none-eabi-ar -r --LD = arm-none-eabi-gcc --NM = arm-none-eabi-nm --OBJDUMP = arm-none-eabi-objdump --OBJCOPY = arm-none-eabi-objcopy --READELF = arm-none-eabi-readelf -+CC = $(CROSS_COMPILE)gcc -+AS = $(CROSS_COMPILE)as -+AR = $(CROSS_COMPILE)ar -r -+LD = $(CROSS_COMPILE)gcc -+NM = $(CROSS_COMPILE)nm -+OBJDUMP = $(CROSS_COMPILE)objdump -+OBJCOPY = $(CROSS_COMPILE)objcopy -+READELF = $(CROSS_COMPILE)readelf - LDFLAGS += -Wl,--gc-sections - - LK = -static - LK += -Wl,--start-group $(TARGET_CSP_LIB) $(TARGET_BSP_LIB) $(TARGET_GEN_LIB) --LK += -lgcc -lc -lg -lm -lstdc++ -lsupc++ -+LK += -nostdlib -lgcc #-lc -lg -lm -lstdc++ -lsupc++ - LK += -Wl,--end-group - MAP = -Xlinker -Map -Xlinker - LDESC = -Xlinker -T -@@ -47,6 +47,6 @@ ENTRY = -e - BIN = -bin - EXT = .elf - LEXT = --ELFTOREC =arm-none-eabi-objcopy -O srec --strip-all --verbose --ELFTOBIN =arm-none-eabi-objcopy -I elf32-littlearm -O binary --strip-all --verbose -+ELFTOREC = $(OBJCOPY) -O srec --strip-all --verbose -+ELFTOBIN = $(OBJCOPY) -I elf32-littlearm -O binary --strip-all --verbose - REC =.srec --- -1.7.7.3 - diff --git a/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch b/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch deleted file mode 100644 index 39966f01e9..0000000000 --- a/boot/lpc32xxcdl/lpc32xxcdl-2.11-delete_redundant_files.patch +++ /dev/null @@ -1,969 +0,0 @@ -Remove duplicated files to stop the linker from complaining about duplicate -symbols - -Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com> ---- ---- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sysapi_timer.c 2011-10-05 19:10:37.000000000 +0200 -+++ /dev/null 2012-01-01 16:39:47.918907000 +0100 -@@ -1,212 +0,0 @@ --/*********************************************************************** -- * $Id:: sysapi_timer.c 3394 2010-05-06 17:56:27Z usb10132 $ -- * -- * Project: Time support functions -- * -- * Description: -- * Implements the following functions required for the S1L API -- * time_init -- * time_reset -- * time_start -- * time_stop -- * time_get -- * time_get_rate -- * -- *********************************************************************** -- * Software that is described herein is for illustrative purposes only -- * which provides customers with programming information regarding the -- * products. This software is supplied "AS IS" without any warranties. -- * NXP Semiconductors assumes no responsibility or liability for the -- * use of the software, conveys no license or title under any patent, -- * copyright, or mask work right to the product. NXP Semiconductors -- * reserves the right to make changes in the software without -- * notification. NXP Semiconductors also make no representation or -- * warranty that such application will be suitable for the specified -- * use without further testing or modification. -- **********************************************************************/ -- --#include "s1l_sys_inf.h" --#include "lpc32xx_intc_driver.h" --#include "lpc32xx_timer_driver.h" -- --static UNS_64 base_rate; --static INT_32 tdev = 0; -- --/*********************************************************************** -- * -- * Function: time_init -- * -- * Purpose: Initializes time system -- * -- * Processing: Initializes the system timer. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: 0 if the init failed, otherwise non-zero -- * -- * Notes: None -- * -- **********************************************************************/ --INT_32 time_init(void) --{ -- TMR_PSCALE_SETUP_T pscale; -- -- /* Open timer driver */ -- if (tdev == 0) -- { -- tdev = timer_open((void *) TIMER_CNTR0, 0); -- if (tdev != 0) -- { -- /* Use a prescale count to 100000 */ -- pscale.ps_tick_val = 100000; -- pscale.ps_us_val = 0; /* Not needed when ps_tick_val != 0 */ -- timer_ioctl(tdev, TMR_SETUP_PSCALE, (INT_32) &pscale); -- -- /* Get timer clock rate */ -- base_rate = (UNS_64) timer_ioctl(tdev, TMR_GET_STATUS, -- TMR_GET_CLOCK); -- } -- } -- -- return tdev; --} -- --/*********************************************************************** -- * -- * Function: time_reset -- * -- * Purpose: Resets system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_reset(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_RESET, 1); -- } --} -- --/*********************************************************************** -- * -- * Function: time_start -- * -- * Purpose: Starts system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_start(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_ENABLE, 1); -- } --} -- --/*********************************************************************** -- * -- * Function: time_stop -- * -- * Purpose: Stops system timer -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --void time_stop(void) --{ -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_ENABLE, 0); -- } --} -- --/*********************************************************************** -- * -- * Function: time_get -- * -- * Purpose: Returns current system time value -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: The number of ticks of the timer counter -- * -- * Notes: None -- * -- **********************************************************************/ --UNS_64 time_get(void) --{ -- TMR_COUNTS_T tcounts; -- UNS_64 ticks = 0; -- -- if (tdev != 0) -- { -- timer_ioctl(tdev, TMR_GET_COUNTS, (INT_32) &tcounts); -- -- /* Compute number of timer ticks */ -- ticks = (UNS_64) tcounts.count_val * 100000; -- ticks = ticks + (UNS_64) tcounts.ps_count_val; -- } -- -- return ticks; --} -- --/*********************************************************************** -- * -- * Function: time_get_rate -- * -- * Purpose: -- * Returns base tick rate (ticks per second) of the time counter -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: The timer tick rate (in ticks per second) -- * -- * Notes: None -- * -- **********************************************************************/ --UNS_64 time_get_rate(void) --{ -- return base_rate; --} -- ---- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sys_mmu_cmd_group.c 2011-10-05 19:10:37.000000000 +0200 -+++ /dev/null 2012-01-01 16:39:47.918907000 +0100 -@@ -1,746 +0,0 @@ --/*********************************************************************** -- * $Id:: sys_mmu_cmd_group.c 3430 2010-05-07 17:39:08Z usb10132 $ -- * -- * Project: Command processor for peek, poke, dump, and fill -- * -- * Description: -- * Processes commands from the command prompt -- * -- *********************************************************************** -- * Software that is described herein is for illustrative purposes only -- * which provides customers with programming information regarding the -- * products. This software is supplied "AS IS" without any warranties. -- * NXP Semiconductors assumes no responsibility or liability for the -- * use of the software, conveys no license or title under any patent, -- * copyright, or mask work right to the product. NXP Semiconductors -- * reserves the right to make changes in the software without -- * notification. NXP Semiconductors also make no representation or -- * warranty that such application will be suitable for the specified -- * use without further testing or modification. -- **********************************************************************/ -- --#include "lpc_arm922t_cp15_driver.h" --#include "lpc_string.h" --#include "startup.h" --#include "s1l_cmds.h" --#include "s1l_sys_inf.h" -- --/* dcache command */ --BOOL_32 cmd_dcache(void); --static UNS_32 cmd_dcache_plist[] = --{ -- (PARSE_TYPE_STR), /* The "dcache" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_dcache_cmd = --{ -- (UNS_8 *) "dcache", -- cmd_dcache, -- (UNS_8 *) "Enables, disables, or flushes data cache", -- (UNS_8 *) "dcache [0(disable), 1(enable), 2(flush)]", -- cmd_dcache_plist, -- NULL --}; -- --/* icache command */ --BOOL_32 cmd_icache(void); --static UNS_32 cmd_icache_plist[] = --{ -- (PARSE_TYPE_STR), /* The "icache" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_icache_cmd = --{ -- (UNS_8 *) "icache", -- cmd_icache, -- (UNS_8 *) "Enables or disables instruction cache", -- (UNS_8 *) "icache [0(disable), 1(enable)]", -- cmd_icache_plist, -- NULL --}; -- --/* inval command */ --BOOL_32 cmd_inval(void); --static UNS_32 cmd_inval_plist[] = --{ -- (PARSE_TYPE_STR | PARSE_TYPE_END) /* The "inval" command */ --}; --static CMD_ROUTE_T core_inval_cmd = --{ -- (UNS_8 *) "inval", -- cmd_inval, -- (UNS_8 *) "Flushes data cache and invalidates instruction cache", -- (UNS_8 *) "inval", -- cmd_inval_plist, -- NULL --}; -- --/* mmuenab command */ --BOOL_32 cmd_mmuenab(void); --static UNS_32 cmd_mmuenab_plist[] = --{ -- (PARSE_TYPE_STR), /* The "mmuenab" command */ -- (PARSE_TYPE_DEC | PARSE_TYPE_END) --}; --static CMD_ROUTE_T core_mmuenab_cmd = --{ -- (UNS_8 *) "mmuenab", -- cmd_mmuenab, -- (UNS_8 *) "Enables or disables the MMU", -- (UNS_8 *) "mmuenab [0(disable), 1(enable)]", -- cmd_mmuenab_plist, -- NULL --}; -- --/* map command */ --BOOL_32 cmd_map(void); --static UNS_32 cmd_map_plist[] = --{ -- (PARSE_TYPE_STR), /* The "map" command */ -- (PARSE_TYPE_HEX), -- (PARSE_TYPE_HEX), -- (PARSE_TYPE_DEC), -- (PARSE_TYPE_DEC | PARSE_TYPE_END), --}; --static CMD_ROUTE_T core_map_cmd = --{ -- (UNS_8 *) "map", -- cmd_map, -- (UNS_8 *) "Maps a range of physical address sections to virtual addresses", -- (UNS_8 *) "map [virt hex addr][phy hex addr][sections][0(uncached), 1(cached), 2(unmap)]", -- cmd_map_plist, -- NULL --}; -- --/* mmuinfo command */ --static BOOL_32 cmd_mmuinfo(void); --static UNS_32 cmd_mmuinfo_plist[] = --{ -- (PARSE_TYPE_STR | PARSE_TYPE_END) /* The "mmuinfo" command */ --}; --static CMD_ROUTE_T core_mmuinfo_cmd = --{ -- (UNS_8 *) "mmuinfo", -- cmd_mmuinfo, -- (UNS_8 *) "Dumps page table and MMU info", -- (UNS_8 *) "mmuinfo", -- cmd_mmuinfo_plist, -- NULL --}; -- --/* MMU group */ --static GROUP_LIST_T mmu_group = --{ -- (UNS_8 *) "mmu", /* mmu group */ -- (UNS_8 *) "MMU command group", -- NULL, -- NULL --}; -- --static UNS_8 enabled_msg [] =" enabled"; --static UNS_8 disabled_msg [] =" disabled"; --static UNS_8 dcache_msg[] = "Data cache"; --static UNS_8 icache_msg[] = "Instruction cache"; --static UNS_8 pagetab_msg[] = "Page table at address: "; --static UNS_8 slist_msg[] = "Type Virt Phy fl Size"; --static UNS_8 mmu_msg [] ="MMU"; --static UNS_8 cpage_msg[] = "Coarse page:"; --static UNS_8 fpage_msg[] = "Fine page :"; --static UNS_8 sect_msg[] = "Section :"; --static UNS_8 mbytes_msg[] = "M"; --static UNS_8 map1_err_msg[] = -- "Error : section addresses must be aligned on a 32-bit boundary"; --static UNS_8 map2_err_msg[] = -- "Error : Number of sections exceeds address range of device"; --static UNS_8 phya_msg[] = "Virtual address "; --static UNS_8 mapped_msg[] = " mapped to physical address "; --static UNS_8 unmapped_msg[] = " unmapped from physical address "; --static UNS_8 cached_msg[] = " (cached)"; --static UNS_8 inval_msg[] = " invalidated"; --static UNS_8 caches_msg [] ="Caches"; --static UNS_8 flushed_msg[] = " flushed"; -- --/*********************************************************************** -- * -- * Function: show_section -- * -- * Purpose: Display section information -- * -- * Processing: -- * See function. -- * -- * Parameters: -- * mmu_reg : MMU settings for this section -- * virt_addr : Starting virtual address for this section -- * segs : Number of 1M segments for this section -- * -- * Outputs: None -- * -- * Returns: Nothing -- * -- * Notes: None -- * -- **********************************************************************/ --static void show_section(UNS_32 mmu_reg, -- UNS_32 virt_addr, -- UNS_32 segs) --{ -- UNS_8 straddr [16]; -- UNS_32 mmu_phy; -- -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) != -- ARM922T_L1D_TYPE_FAULT) -- { -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_CPAGE) -- { -- term_dat_out(cpage_msg); -- } -- else if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_FPAGE) -- { -- term_dat_out(fpage_msg); -- } -- else -- { -- term_dat_out(sect_msg); -- } -- -- /* Compute virtual address */ -- str_makehex(straddr, virt_addr, 8); -- term_dat_out(straddr); -- term_dat_out((UNS_8 *) " "); -- -- /* Compute mapped physical address */ -- if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) == -- ARM922T_L1D_TYPE_SECTION) -- { -- mmu_phy = mmu_reg & 0xFFF00000; -- } -- else -- { -- /* Don't compute addresses for non-sections */ -- mmu_phy = 0; -- } -- str_makehex(straddr, mmu_phy, 8); -- term_dat_out(straddr); -- term_dat_out((UNS_8 *) " "); -- -- /* MMU flags */ -- if ((mmu_reg & ARM922T_L1D_BUFFERABLE) != 0) -- { -- term_dat_out((UNS_8 *) "b"); -- } -- else -- { -- term_dat_out((UNS_8 *) " "); -- } -- if ((mmu_reg & ARM922T_L1D_CACHEABLE) != 0) -- { -- term_dat_out((UNS_8 *) "c"); -- } -- else -- { -- term_dat_out((UNS_8 *) " "); -- } -- term_dat_out((UNS_8 *) " "); -- -- /* Displays used megabytes */ -- str_makedec(straddr, segs); -- term_dat_out(straddr); -- term_dat_out_crlf(mbytes_msg); -- } --} -- --/*********************************************************************** -- * -- * Function: mmu_dumpinfo -- * -- * Purpose: Display MMU info -- * -- * Processing: -- * Display the MMU information, including enable status, cache -- * status, and page table. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 mmu_dumpinfo(void) --{ -- UNS_32 segsz, last_mmu_reg, mmu_vrt, mmu_reg, mmu_vrtsav = 0, *pt; -- UNS_32 mlast_mmu_reg, mmmu_reg; -- int idx; -- UNS_8 hexaddr [16]; -- -- term_dat_out(mmu_msg); -- if (cp15_mmu_enabled() == FALSE) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- -- /* Get MMU control register word */ -- mmu_reg = cp15_get_mmu_control_reg(); -- -- /* Instruction cache status */ -- term_dat_out(icache_msg); -- if ((mmu_reg & ARM922T_MMU_CONTROL_I) == 0) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- } -- -- /* Data cache status */ -- term_dat_out(dcache_msg); -- if ((mmu_reg & ARM922T_MMU_CONTROL_C) == 0) -- { -- term_dat_out_crlf(disabled_msg); -- } -- else -- { -- term_dat_out_crlf(enabled_msg); -- } -- -- term_dat_out(pagetab_msg); -- mmu_reg = (UNS_32) cp15_get_ttb(); -- str_makehex(hexaddr, mmu_reg, 8); -- term_dat_out_crlf(hexaddr); -- term_dat_out_crlf(slist_msg); -- -- /* Process MMU table - assume that the physical and -- virtual locations of table are the same */ -- pt = (UNS_32 *) mmu_reg; -- mmu_vrt = 0x0; -- segsz = 0xFFFFFFFF; -- last_mmu_reg = mlast_mmu_reg = 0xFFFFFFFF; -- for (idx = 0; idx < 4096; idx++) -- { -- mmu_reg = *pt; -- mmmu_reg = (mmu_reg & (ARM922T_L1D_TYPE_PG_SN_MASK | -- ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE)); -- segsz = segsz + 1; -- -- if ((last_mmu_reg != 0xFFFFFFFF) && -- (mlast_mmu_reg != mmmu_reg)) -- { -- show_section(last_mmu_reg, mmu_vrtsav, segsz); -- segsz = 0; -- } -- -- if (mlast_mmu_reg != mmmu_reg) -- { -- mmu_vrtsav = mmu_vrt; -- last_mmu_reg = mmu_reg; -- mlast_mmu_reg = mmmu_reg; -- } -- -- pt++; -- mmu_vrt += 0x00100000; -- } -- } -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: mmu_dumpmap -- * -- * Purpose: Map a virtual address range to a physical range -- * -- * Processing: -- * From the input addresses and number of sections, generate the -- * appropriate entries in the page table. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 mmu_dumpmap(UNS_32 vrt, -- UNS_32 phy, -- UNS_32 sections, -- UNS_32 cache) --{ -- BOOL_32 processed = FALSE; -- UNS_32 mmu_phy, mmu_vrt, tmp1 = 0, tmp2, *pt; -- UNS_8 hexaddr [16]; -- -- /* Verify address boundaries are sectional */ -- mmu_vrt = vrt & ~ARM922T_L2D_SN_BASE_MASK; -- mmu_phy = phy & ~ARM922T_L2D_SN_BASE_MASK; -- if ((mmu_vrt != 0) || (mmu_phy != 0)) -- { -- term_dat_out_crlf(map1_err_msg); -- } -- else -- { -- /* Verify that address range and section count will not -- exceed address range of device */ -- tmp1 = vrt >> 20; -- tmp1 = (tmp1 + sections) - 1; -- tmp2 = phy >> 20; -- tmp2 = (tmp2 + sections) - 1; -- if ((tmp1 < 4096) && (tmp2 < 4096)) -- { -- /* Good address range and good section count */ -- processed = TRUE; -- } -- else -- { -- term_dat_out_crlf(map2_err_msg); -- } -- } -- -- /* Generate static part of MMU word */ -- if (cache == 0) -- { -- /* Section mapped with cache disabled */ -- tmp1 = ARM922T_L1D_TYPE_SECTION; -- } -- else if (cache == 1) -- { -- /* Section mapped with cache enabled */ -- tmp1 = (ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE | -- ARM922T_L1D_TYPE_SECTION); -- } -- else if (cache == 2) -- { -- /* Section unmapped */ -- tmp1 = ARM922T_L1D_TYPE_FAULT; -- } -- tmp1 |= ARM922T_L1D_AP_ALL; -- -- /* Offset into page table for virtual address */ -- tmp2 = (vrt >> 20); -- pt = cp15_get_ttb() + tmp2; -- -- /* Loop until all sections are complete */ -- while ((sections > 0) && (processed == TRUE)) -- { -- /* Add in physical address */ -- tmp2 = tmp1 | (phy & ARM922T_L2D_SN_BASE_MASK); -- -- /* Save new section descriptor for virtual address */ -- *pt = tmp2; -- -- /* Output message shown the map */ -- term_dat_out(phya_msg); -- str_makehex(hexaddr, phy, 8); -- term_dat_out(hexaddr); -- if (cache == 2) -- { -- term_dat_out(unmapped_msg); -- } -- else -- { -- term_dat_out(mapped_msg); -- } -- str_makehex(hexaddr, vrt, 8); -- term_dat_out(hexaddr); -- if (cache == 1) -- { -- term_dat_out(cached_msg); -- } -- term_dat_out_crlf((UNS_8 *) ""); -- -- /* Next section and page table entry*/ -- phy += 0x00100000; -- vrt += 0x00100000; -- pt++; -- sections--; -- } -- -- return processed; --} -- --/*********************************************************************** -- * -- * Function: cmd_mmuinfo -- * -- * Purpose: Display MMU information -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --static BOOL_32 cmd_mmuinfo(void) --{ -- mmu_dumpinfo(); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_map -- * -- * Purpose: Map a physical address region to a virtual region -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_map(void) --{ -- UNS_32 phy, virt, sects, ce = 0; -- -- /* Get arguments */ -- virt = cmd_get_field_val(1); -- phy = cmd_get_field_val(2); -- sects = cmd_get_field_val(3); -- ce = cmd_get_field_val(4); -- -- if (ce <= 2) -- { -- mmu_dumpmap(virt, phy, sects, ce); -- } -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_inval -- * -- * Purpose: MMU cache flush and invalidate -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_inval(void) --{ -- dcache_flush(); -- icache_inval(); -- term_dat_out(caches_msg); -- term_dat_out(inval_msg); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_dcache -- * -- * Purpose: MMU data cache enable and disable -- * -- * Processing: -- * If the value passed in the parser is 1, enable the data cache, -- * otherwise disable the data cache. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_dcache(void) --{ -- UNS_32 cenable; -- UNS_8 *ppar; -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- switch (cenable) -- { -- case 0: -- dcache_flush(); -- cp15_set_dcache(0); -- ppar = disabled_msg; -- break; -- -- case 1: -- cp15_invalidate_cache(); -- cp15_set_dcache(1); -- ppar = enabled_msg; -- break; -- -- case 2: -- default: -- dcache_flush(); -- ppar = flushed_msg; -- break; -- } -- -- term_dat_out(dcache_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: cmd_icache -- * -- * Purpose: MMU instruction cache enable and disable -- * -- * Processing: -- * If the value passed in the parser is 1, enable the instruction -- * cache, otherwise disable the instruction cache. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_icache(void) --{ -- UNS_32 cenable; -- UNS_8 *ppar; -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- if (cenable == 1) -- { -- dcache_flush(); -- cp15_invalidate_cache(); -- cp15_set_icache(1); -- ppar = enabled_msg; -- } -- else -- { -- cp15_set_icache(0); -- ppar = disabled_msg; -- } -- -- term_dat_out(icache_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- -- --/*********************************************************************** -- * -- * Function: cmd_mmuenab -- * -- * Purpose: Enable or disable MMU -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: TRUE if the command was processed, otherwise FALSE -- * -- * Notes: None -- * -- **********************************************************************/ --BOOL_32 cmd_mmuenab(void) --{ -- UNS_8 *ppar; -- UNS_32 cenable; -- -- term_dat_out_crlf((UNS_8 *) "Warning: Changing MMU status on " -- " cached and buffered code can cause system crashes."); -- -- /* Get argument */ -- cenable = cmd_get_field_val(1); -- -- if (cenable == 1) -- { -- if ((cp15_get_mmu_control_reg() & ARM922T_MMU_CONTROL_C) != 0) -- { -- cp15_invalidate_cache(); -- } -- -- cp15_set_mmu(1); -- ppar = enabled_msg; -- } -- else -- { -- cp15_dcache_flush(); -- cp15_write_buffer_flush(); -- cp15_invalidate_cache(); -- cp15_set_mmu(0); -- ppar = disabled_msg; -- } -- -- term_dat_out(mmu_msg); -- term_dat_out_crlf(ppar); -- -- return TRUE; --} -- --/*********************************************************************** -- * -- * Function: mmu_cmd_group_init -- * -- * Purpose: Initialize MMU command group -- * -- * Processing: -- * See function. -- * -- * Parameters: None -- * -- * Outputs: None -- * -- * Returns: Nothin -- * -- * Notes: None -- * -- **********************************************************************/ --void mmu_cmd_group_init(void) --{ -- /* Add MMU group */ -- cmd_add_group(&mmu_group); -- -- /* Add commands to the MMU group */ -- cmd_add_new_command(&mmu_group, &core_dcache_cmd); -- cmd_add_new_command(&mmu_group, &core_icache_cmd); -- cmd_add_new_command(&mmu_group, &core_inval_cmd); -- cmd_add_new_command(&mmu_group, &core_mmuenab_cmd); -- cmd_add_new_command(&mmu_group, &core_map_cmd); -- cmd_add_new_command(&mmu_group, &core_mmuinfo_cmd); --} diff --git a/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch b/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch deleted file mode 100644 index cfd77bead6..0000000000 --- a/boot/lpc32xxcdl/lpc32xxcdl-2.11-libnosys_gnu.patch +++ /dev/null @@ -1,188 +0,0 @@ -Fix compilation and eabi issues - -Since we are not linking with libc anymore, we need to define our own memset, -strlen and memcpy. Also, as we are using a *libc compiler, we need to "handle" -exceptions (mostly division by 0) by defining raise() and -__aeabi_unwind_cpp_pr0. - -Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com> ---- - csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c | 41 +++++++++++++++++++++++ - 3 files changed, 123 insertions(+), 0 deletions(-) - -diff --git a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -index 385b0ab..f1f0a0a 100644 ---- a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include <errno.h> - #include <sys/times.h> - #include <sys/stat.h> -+#include <sys/types.h> - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ -diff --git a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -index 385b0ab..f1f0a0a 100644 ---- a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include <errno.h> - #include <sys/times.h> - #include <sys/stat.h> -+#include <sys/types.h> - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ -diff --git a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -index cfdb674..6b50c60 100644 ---- a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -+++ b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c -@@ -25,6 +25,7 @@ - #include <errno.h> - #include <sys/times.h> - #include <sys/stat.h> -+#include <sys/types.h> - - /* errno definition */ - #undef errno -@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){ - return 0; - } - -+void * memset(void * s,int c,size_t count) -+{ -+ char *xs = (char *) s; -+ -+ while (count--) -+ *xs++ = c; -+ -+ return s; -+} -+ -+ -+size_t strlen(const char * s) -+{ -+ const char *sc; -+ -+ for (sc = s; *sc != '\0'; ++sc) -+ /* nothing */; -+ return sc - s; -+} -+ -+void * memcpy(void * dest,const void *src,size_t count) -+{ -+ char *tmp = (char *) dest, *s = (char *) src; -+ -+ while (count--) -+ *tmp++ = *s++; -+ -+ return dest; -+} -+ -+ -+/* Dummy functions to avoid linker complaints */ -+void __aeabi_unwind_cpp_pr0(void) -+{ -+}; -+ -+void raise(void) -+{ -+}; -+ - #endif /*__GNUC__*/ --- -1.7.7.3 - diff --git a/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch b/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch deleted file mode 100644 index 94c184780e..0000000000 --- a/boot/lpc32xxcdl/lpc32xxcdl-2.11-slashes.patch +++ /dev/null @@ -1,521 +0,0 @@ -Use slashes instead of backslashes - -Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com> ---- - .../bsps/common/examples/buildfiles/makefile | 10 +++--- - .../startup/examples/burners/makefile.burner | 16 +++++----- - csps/lpc32xx/bsps/ea3250/source/makefile | 10 +++--- - csps/lpc32xx/bsps/fdi3250/source/makefile | 12 ++++---- - csps/lpc32xx/bsps/phy3250/examples/makefile | 2 +- - csps/lpc32xx/bsps/phy3250/source/makefile | 2 +- - .../examples/Burners/nor/kickstart/makefile | 2 +- - .../startup/examples/Burners/nor/norerase/makefile | 2 +- - .../startup/examples/Burners/nor/s1lapp/makefile | 2 +- - .../examples/Burners/spi/kickstart/makefile | 2 +- - csps/lpc32xx/source/makefile | 10 +++--- - lpc/source/makefile | 10 +++--- - makefile | 2 +- - makerule/common/make.rules.environment | 30 ++++++++++---------- - makerule/lpc32xx/make.lpc32xx.gnu | 2 +- - makerule/lpc32xx/make.lpc32xx.iar | 12 ++++---- - makerule/lpc32xx/make.lpc32xx.keil | 6 ++-- - makerule/lpc32xx/make.lpc32xx.rvw | 2 +- - 18 files changed, 67 insertions(+), 67 deletions(-) - -diff --git a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -index cf4977c..1da2201 100644 ---- a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -+++ b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -42,6 +42,6 @@ CFLAGS +=-I..\Include - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - -diff --git a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -index fca3947..18bd703 100644 ---- a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -+++ b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner -@@ -22,9 +22,9 @@ - # - ######################################################################## - --COMMON_BASE := $(NXPMCU_SOFTWARE)\csps\$(CSP)\bsps\common --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) --include $(COMMON_BASE)\startup\examples\buildfiles\make.env -+COMMON_BASE := $(NXPMCU_SOFTWARE)/csps/$(CSP)/bsps/common -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) -+include $(COMMON_BASE)/startup/examples/buildfiles/make.env - - ######################################################################## - # ARM Realview -@@ -38,7 +38,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}" - #AFLAGS += --predefine "RW_RELOC SETL {TRUE}" - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld - LDFLAGS = --remove - MAP = --map --info=totals,sizes,unused --symbols --list - endif -@@ -55,7 +55,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}" - #AFLAGS += --predefine "RW_RELOC SETL {TRUE}" - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld - LDFLAGS = --remove - MAP = --map --info=totals,sizes,unused --symbols --list - endif -@@ -72,7 +72,7 @@ AFLAGS += --defsym USE_ALL_STACKS=1 - #AFLAGS += --defsym RW_RELOC=1 - - # This runs from IRAM --LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_gnu.ld -+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_gnu.ld - - endif - -@@ -108,7 +108,7 @@ endif - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes - - ######################################################################## - # -@@ -157,6 +157,6 @@ endif - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: debug bin -diff --git a/csps/lpc32xx/bsps/ea3250/source/makefile b/csps/lpc32xx/bsps/ea3250/source/makefile -index 7cada25..2899b20 100644 ---- a/csps/lpc32xx/bsps/ea3250/source/makefile -+++ b/csps/lpc32xx/bsps/ea3250/source/makefile -@@ -22,16 +22,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -64,7 +64,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/csps/lpc32xx/bsps/fdi3250/source/makefile b/csps/lpc32xx/bsps/fdi3250/source/makefile -index 4e153bb..11e4b63 100644 ---- a/csps/lpc32xx/bsps/fdi3250/source/makefile -+++ b/csps/lpc32xx/bsps/fdi3250/source/makefile -@@ -22,16 +22,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -53,7 +53,7 @@ lib_clean: - # delete all targets this Makefile can make and all built libraries - # linked in - lib_realclean: -- -@$(RM) $(BSP_LIB_DIR)\*.a -+ -@$(RM) $(BSP_LIB_DIR)/*.a - -@$(RMDIR) $(BSP_LIB_DIR) - - clean: lib_clean -@@ -65,7 +65,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/csps/lpc32xx/bsps/phy3250/examples/makefile b/csps/lpc32xx/bsps/phy3250/examples/makefile -index b939252..e7feaa6 100644 ---- a/csps/lpc32xx/bsps/phy3250/examples/makefile -+++ b/csps/lpc32xx/bsps/phy3250/examples/makefile -@@ -25,7 +25,7 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - SUBDIRS = adc dram_self_refresh hstimer hsuart i2c kscan lcd_colorbars - SUBDIRS += lcd_tsc mi2c mstimer pwm pwm_simple rtc sdcard sdcard_dma -diff --git a/csps/lpc32xx/bsps/phy3250/source/makefile b/csps/lpc32xx/bsps/phy3250/source/makefile -index 7c48e7d..750b776 100644 ---- a/csps/lpc32xx/bsps/phy3250/source/makefile -+++ b/csps/lpc32xx/bsps/phy3250/source/makefile -@@ -32,7 +32,7 @@ include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes - AFLAGS +=-I../Include - CFLAGS +=-I../Include - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -index 01e2b38..526d6cc 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile -@@ -78,7 +78,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -index ce329f5..e81b8db 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile -@@ -77,7 +77,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -index 4426fc7..196faec 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile -@@ -77,7 +77,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -index dc73b64..39fc304 100644 ---- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile -@@ -78,7 +78,7 @@ endif - - ######################################################################## - # --# Compiler\linker specific stuff -+# Compiler/linker specific stuff - # - ######################################################################## - -diff --git a/csps/lpc32xx/source/makefile b/csps/lpc32xx/source/makefile -index 8e05456..16bd944 100644 ---- a/csps/lpc32xx/source/makefile -+++ b/csps/lpc32xx/source/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - - ######################################################################## -@@ -68,7 +68,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/lpc/source/makefile b/lpc/source/makefile -index 2860db9..ae7d612 100644 ---- a/lpc/source/makefile -+++ b/lpc/source/makefile -@@ -25,16 +25,16 @@ - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # - # Pick up the assembler and C source files in the directory - # - ######################################################################## --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes --AFLAGS +=-I..\Include --CFLAGS +=-I..\Include -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes -+AFLAGS +=-I../Include -+CFLAGS +=-I../Include - - ######################################################################## - # -@@ -67,7 +67,7 @@ realclean: lib_realclean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build - - .PHONY: all lib_clean lib_realclean - -diff --git a/makefile b/makefile -index 8645fcc..86fa6bc 100644 ---- a/makefile -+++ b/makefile -@@ -34,7 +34,7 @@ TARGETS_CLN =gen_clean csp_clean bsp_clean - # - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL) -+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL) - - ######################################################################## - # -diff --git a/makerule/common/make.rules.environment b/makerule/common/make.rules.environment -index d5737fe..4e6df48 100644 ---- a/makerule/common/make.rules.environment -+++ b/makerule/common/make.rules.environment -@@ -52,7 +52,7 @@ ASTYLE =astyle --options=$(BUILD_ROOT)/tools/astyle.cfg - # - ######################################################################## - --CSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\lib -+CSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/lib - - ######################################################################## - # -@@ -60,7 +60,7 @@ CSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\lib - # - ######################################################################## - --BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib -+BSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP)/lib - - ######################################################################## - # -@@ -68,7 +68,7 @@ BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib - # - ######################################################################## - --GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib -+GEN_LIB_DIR =$(BUILD_ROOT)/$(GEN)/lib - - ######################################################################## - # -@@ -76,9 +76,9 @@ GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib - # - ######################################################################## - --CSP_DIR =$(BUILD_ROOT)\csps\$(CSP) --CSP_SRC_DIR =$(CSP_DIR)\source --CSP_INC_DIR =$(CSP_DIR)\include -+CSP_DIR =$(BUILD_ROOT)/csps/$(CSP) -+CSP_SRC_DIR =$(CSP_DIR)/source -+CSP_INC_DIR =$(CSP_DIR)/include - - ######################################################################## - # -@@ -86,9 +86,9 @@ CSP_INC_DIR =$(CSP_DIR)\include - # - ######################################################################## - --BSP_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP) --BSP_SRC_DIR =$(BSP_DIR)\source --BSP_INC_DIR =$(BSP_DIR)\include -+BSP_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP) -+BSP_SRC_DIR =$(BSP_DIR)/source -+BSP_INC_DIR =$(BSP_DIR)/include - - ######################################################################## - # -@@ -96,9 +96,9 @@ BSP_INC_DIR =$(BSP_DIR)\include - # - ######################################################################## - --GEN_DIR =$(BUILD_ROOT)\$(GEN) --GEN_SRC_DIR =$(GEN_DIR)\source --GEN_INC_DIR =$(GEN_DIR)\include -+GEN_DIR =$(BUILD_ROOT)/$(GEN) -+GEN_SRC_DIR =$(GEN_DIR)/source -+GEN_INC_DIR =$(GEN_DIR)/include - - ######################################################################## - # -@@ -151,6 +151,6 @@ endif - # - ######################################################################## - --TARGET_CSP_LIB =$(CSP_LIB_DIR)\$(CSP_ARCHIVE) --TARGET_BSP_LIB =$(BSP_LIB_DIR)\$(BSP_ARCHIVE) --TARGET_GEN_LIB =$(GEN_LIB_DIR)\$(GEN_ARCHIVE) -+TARGET_CSP_LIB =$(CSP_LIB_DIR)/$(CSP_ARCHIVE) -+TARGET_BSP_LIB =$(BSP_LIB_DIR)/$(BSP_ARCHIVE) -+TARGET_GEN_LIB =$(GEN_LIB_DIR)/$(GEN_ARCHIVE) -diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu -index 3277d99..d80b98d 100644 ---- a/makerule/lpc32xx/make.lpc32xx.gnu -+++ b/makerule/lpc32xx/make.lpc32xx.gnu -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CPU = arm926ej-s - CFLAGS = -mcpu=arm926ej-s -Wall -Os -diff --git a/makerule/lpc32xx/make.lpc32xx.iar b/makerule/lpc32xx/make.lpc32xx.iar -index 238ebbf..27d163f 100644 ---- a/makerule/lpc32xx/make.lpc32xx.iar -+++ b/makerule/lpc32xx/make.lpc32xx.iar -@@ -19,12 +19,12 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - --IARBASE = $(IAR_ROOT)\ARM --IARTOOLS = $(IARBASE)\bin --IAR_LIB = $(IARBASE)\lib --IAR_INC = $(IARBASE)\inc -+IARBASE = $(IAR_ROOT)/ARM -+IARTOOLS = $(IARBASE)/bin -+IAR_LIB = $(IARBASE)/lib -+IAR_INC = $(IARBASE)/inc - CC = iccarm - CCP = iccarm - AS = iasmarm -@@ -36,7 +36,7 @@ CFLAGS += -I"$(IAR_INC)" - AFLAGS = --cpu 5TEJ - LDFLAGS = - LK = "$(TARGET_GEN_LIB)" "$(TARGET_CSP_LIB)" "$(TARGET_BSP_LIB)" --;LK += "$(IAR_LIB)\dl4tpannl8f.r79" -+;LK += "$(IAR_LIB)/dl4tpannl8f.r79" - MAP = --map - LDESC = --config - ENTRY = --entry -diff --git a/makerule/lpc32xx/make.lpc32xx.keil b/makerule/lpc32xx/make.lpc32xx.keil -index dd27583..7334d3f 100644 ---- a/makerule/lpc32xx/make.lpc32xx.keil -+++ b/makerule/lpc32xx/make.lpc32xx.keil -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CC =armcc - CCP =armcc -@@ -27,11 +27,11 @@ AS =armasm - LD =armlink - AR =armar -r -s - CFLAGS =--arm -O3 -g --device DARMP3 -D__MICROLIB --CFLAGS +=-I$(KEIL_RVCT)\inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) -+CFLAGS +=-I$(KEIL_RVCT)/inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - AFLAGS =--arm --device=DARMP3 - AFLAGS +=-I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) - LDFLAGS =--noremove --LK =--device DARMP3 --libpath $(KEIL_RVCT)\lib --scan $(TARGET_CSP_LIB) -+LK =--device DARMP3 --libpath $(KEIL_RVCT)/lib --scan $(TARGET_CSP_LIB) - LK +=--scan $(TARGET_BSP_LIB) - LK +=--scan $(TARGET_GEN_LIB) - MAP =--map --list -diff --git a/makerule/lpc32xx/make.lpc32xx.rvw b/makerule/lpc32xx/make.lpc32xx.rvw -index 59961dd..2419976 100644 ---- a/makerule/lpc32xx/make.lpc32xx.rvw -+++ b/makerule/lpc32xx/make.lpc32xx.rvw -@@ -19,7 +19,7 @@ - # use without further testing or modification. - ######################################################################## - --include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment -+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment - - CC =armcc - CCP =armcpp --- -1.7.7.3 - diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk deleted file mode 100644 index 30afed050b..0000000000 --- a/boot/lpc32xxcdl/lpc32xxcdl.mk +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# -# lpc32xxcdl -# -################################################################################ - -LPC32XXCDL_VERSION = lpc32xx_cdl_v2.11 -LPC32XXCDL_SITE = http://git.lpcware.com/lpc3xxx_cdl.git -LPC32XXCDL_SITE_METHOD = git - -LPC32XXCDL_INSTALL_TARGET = NO -LPC32XXCDL_INSTALL_IMAGES = YES - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"ea3250") -LPC32XXCDL_KICKSTART = kickstart/nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart -LPC32XXCDL_S1L = s1l -LPC32XXCDL_S1L_BURNER = nand/s1lapp -endif - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"phy3250") -LPC32XXCDL_KICKSTART = kickstart/kickstart_nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart -LPC32XXCDL_S1L = s1l/s1l_nand_boot -LPC32XXCDL_S1L_BURNER = nand/s1lapp -endif - -ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"fdi3250") -LPC32XXCDL_KICKSTART = kickstart/nand -LPC32XXCDL_KICKSTART_BURNER = nand/kickstart_jtag -LPC32XXCDL_S1L = s1l -LPC32XXCDL_S1L_BURNER = nand/s1lapp_jtag -endif - -LPC32XXCDL_BUILD_FLAGS = \ - CROSS_COMPILE=$(TARGET_CROSS) \ - NXPMCU_WINBASE=$(@D) \ - NXPMCU_SOFTWARE=$(@D) \ - BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \ - CSP=lpc32xx TOOL=gnu GEN=lpc - -LPC32XXCDL_BOARD_STARTUP_DIR = \ - csps/lpc32xx/bsps/$(BR2_TARGET_LPC32XXCDL_BOARDNAME)/startup/examples/ - -# Source files are with dos newlines, which our patch infrastructure doesn't -# handle. Work around it by converting the affected files to unix newlines -# before patching -define LPC32XXCDL_DOS2UNIX_FOR_PATCH - sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \ - boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//' -endef - -LPC32XXCDL_POST_EXTRACT_HOOKS += LPC32XXCDL_DOS2UNIX_FOR_PATCH - -define LPC32XXCDL_BUILD_CMDS - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER) - $(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L) -endef - -define LPC32XXCDL_INSTALL_IMAGES_CMDS - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER)/*gnu.bin $(BINARIES_DIR) - cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L)/*gnu.bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) diff --git a/boot/s500-bootloader/Config.in b/boot/s500-bootloader/Config.in deleted file mode 100644 index 7bb689f305..0000000000 --- a/boot/s500-bootloader/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_TARGET_S500_BOOTLOADER - bool "s500-bootloader" - depends on BR2_arm - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_HOSTARCH_NEEDS_IA32_LIBS - help - 1st level bootloader for Actions Semiconductor S500 SoC. - - https://github.com/xapp-le/owl - -config BR2_TARGET_S500_BOOTLOADER_BOARD - string "board to configure for" - depends on BR2_TARGET_S500_BOOTLOADER - help - Specify the board to configure the bootloader for. - This should be the name of a directory under s500/boards - containing a suitable bootloader.ini file. diff --git a/boot/s500-bootloader/s500-bootloader.hash b/boot/s500-bootloader/s500-bootloader.hash deleted file mode 100644 index d538f23b2a..0000000000 --- a/boot/s500-bootloader/s500-bootloader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b183024ac69f51ea7befd28d03b2ec35a7280e270405600fb4f37aa91d9c9571 s500-bootloader-a8d7fa1d9a7f353ec4613febf30f4ca99a10a106.tar.gz diff --git a/boot/s500-bootloader/s500-bootloader.mk b/boot/s500-bootloader/s500-bootloader.mk deleted file mode 100644 index bc87b091c7..0000000000 --- a/boot/s500-bootloader/s500-bootloader.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# s500-bootloader -# -################################################################################ - -S500_BOOTLOADER_VERSION = a8d7fa1d9a7f353ec4613febf30f4ca99a10a106 -S500_BOOTLOADER_SITE = $(call github,xapp-le,owl,$(S500_BOOTLOADER_VERSION)) -S500_BOOTLOADER_LICENSE = PROPRIETARY -S500_BOOTLOADER_INSTALL_TARGET = NO -S500_BOOTLOADER_INSTALL_IMAGES = YES - -S500_BOOTLOADER_BOARD = $(call qstrip,$(BR2_TARGET_S500_BOOTLOADER_BOARD)) - -define S500_BOOTLOADER_BUILD_CMDS - cd $(@D) && ./tools/utils/bootloader_pack \ - s500/bootloader/bootloader.bin \ - s500/boards/$(S500_BOOTLOADER_BOARD)/bootloader.ini \ - s500-bootloader.bin -endef - -define S500_BOOTLOADER_INSTALL_IMAGES_CMDS - $(INSTALL) -m 0644 -D $(@D)/s500-bootloader.bin \ - $(BINARIES_DIR)/s500-bootloader.bin -endef - -$(eval $(generic-package)) - -ifeq ($(BR2_TARGET_S500_BOOTLOADER)$(BR_BUILDING),yy) -# we NEED a board name -ifeq ($(S500_BOOTLOADER_BOARD),) -$(error No s500-bootloader board specified. Check your BR2_TARGET_S500_BOOTLOADER settings) -endif -endif |
