From a1d74a08e4f671edfc5b5ad575c3f97077e37154 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 1 Mar 2019 15:25:29 -0500 Subject: [PATCH] lib: Remove samd21/samd51 customizations that are no longer necessary Signed-off-by: Kevin O'Connor --- lib/README | 8 +-- lib/samd21/samd21.patch | 13 ----- .../samd21a/gcc/gcc/samd21g18a_flash.ld | 2 +- lib/samd51/samd51.patch | 55 ------------------- .../samd51a/gcc/gcc/samd51g19a_flash.ld | 2 +- .../samd51a/gcc/gcc/samd51j19a_flash.ld | 2 +- .../samd51a/gcc/gcc/samd51n19a_flash.ld | 2 +- .../samd51a/gcc/gcc/samd51p20a_flash.ld | 2 +- 8 files changed, 9 insertions(+), 77 deletions(-) diff --git a/lib/README b/lib/README index 771a55e1..2336782f 100644 --- a/lib/README +++ b/lib/README @@ -30,15 +30,15 @@ The samd21 directory contains code from the Atmel.SAMD21_DFP.1.3.304.atpack zip file found at: http://packs.download.atmel.com/ version 1.3.304 (extracted on 20180725). It has been modified to -compile with gcc's LTO feature and to work with chips that have a -bootloader. See samd21.patch for the modifications. +compile with gcc's LTO feature. See samd21.patch for the +modifications. The samd51 directory contains code from the Atmel.SAMD51_DFP.1.1.96.atpack zip file found at: http://packs.download.atmel.com/ version 1.1.96 (extracted on 20190110). It has been modified to -compile with gcc's LTO feature and to work with chips that have a -bootloader. See samd51.patch for the modifications. +compile with gcc's LTO feature. See samd51.patch for the +modifications. The lpc176x directory contains code from the mbed project: https://github.com/ARMmbed/mbed-os diff --git a/lib/samd21/samd21.patch b/lib/samd21/samd21.patch index ae7d7670..4e9b40c9 100644 --- a/lib/samd21/samd21.patch +++ b/lib/samd21/samd21.patch @@ -1,16 +1,3 @@ -diff --git a/lib/samd21/samd21a/gcc/gcc/samd21g18a_flash.ld b/lib/samd21/samd21a/gcc/gcc/samd21g18a_flash.ld -index c6f289e7..34dfb6ba 100644 ---- a/lib/samd21/samd21a/gcc/gcc/samd21g18a_flash.ld -+++ b/lib/samd21/samd21a/gcc/gcc/samd21g18a_flash.ld -@@ -35,7 +35,7 @@ SEARCH_DIR(.) - /* Memory Spaces Definitions */ - MEMORY - { -- rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000 -+ rom (rx) : ORIGIN = 0x00000000 + FLASH_START , LENGTH = 0x00040000 - FLASH_START - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000 - } - diff --git a/lib/samd21/samd21a/gcc/gcc/startup_samd21.c b/lib/samd21/samd21a/gcc/gcc/startup_samd21.c index 3dce0edd..a480077f 100644 --- a/lib/samd21/samd21a/gcc/gcc/startup_samd21.c diff --git a/lib/samd21/samd21a/gcc/gcc/samd21g18a_flash.ld b/lib/samd21/samd21a/gcc/gcc/samd21g18a_flash.ld index 34dfb6ba..c6f289e7 100644 --- a/lib/samd21/samd21a/gcc/gcc/samd21g18a_flash.ld +++ b/lib/samd21/samd21a/gcc/gcc/samd21g18a_flash.ld @@ -35,7 +35,7 @@ SEARCH_DIR(.) /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000 + FLASH_START , LENGTH = 0x00040000 - FLASH_START + rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000 ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000 } diff --git a/lib/samd51/samd51.patch b/lib/samd51/samd51.patch index 482e313b..f1c04eeb 100644 --- a/lib/samd51/samd51.patch +++ b/lib/samd51/samd51.patch @@ -1,58 +1,3 @@ -diff --git a/lib/samd51/samd51.patch b/lib/samd51/samd51.patch -new file mode 100644 -index 00000000..e69de29b -diff --git a/lib/samd51/samd51a/gcc/gcc/samd51g19a_flash.ld b/lib/samd51/samd51a/gcc/gcc/samd51g19a_flash.ld -index bee9c68d..551597dc 100644 ---- a/lib/samd51/samd51a/gcc/gcc/samd51g19a_flash.ld -+++ b/lib/samd51/samd51a/gcc/gcc/samd51g19a_flash.ld -@@ -35,7 +35,7 @@ SEARCH_DIR(.) - /* Memory Spaces Definitions */ - MEMORY - { -- rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000 -+ rom (rx) : ORIGIN = 0x00000000 + FLASH_START, LENGTH = 0x00080000 - FLASH_START - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 - bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 - qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 -diff --git a/lib/samd51/samd51a/gcc/gcc/samd51j19a_flash.ld b/lib/samd51/samd51a/gcc/gcc/samd51j19a_flash.ld -index 3dfbe0d4..07ee9864 100644 ---- a/lib/samd51/samd51a/gcc/gcc/samd51j19a_flash.ld -+++ b/lib/samd51/samd51a/gcc/gcc/samd51j19a_flash.ld -@@ -35,7 +35,7 @@ SEARCH_DIR(.) - /* Memory Spaces Definitions */ - MEMORY - { -- rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000 -+ rom (rx) : ORIGIN = 0x00000000 + FLASH_START, LENGTH = 0x00080000 - FLASH_START - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 - bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 - qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 -diff --git a/lib/samd51/samd51a/gcc/gcc/samd51n19a_flash.ld b/lib/samd51/samd51a/gcc/gcc/samd51n19a_flash.ld -index ae77ba71..1c595648 100644 ---- a/lib/samd51/samd51a/gcc/gcc/samd51n19a_flash.ld -+++ b/lib/samd51/samd51a/gcc/gcc/samd51n19a_flash.ld -@@ -35,7 +35,7 @@ SEARCH_DIR(.) - /* Memory Spaces Definitions */ - MEMORY - { -- rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000 -+ rom (rx) : ORIGIN = 0x00000000 + FLASH_START, LENGTH = 0x00080000 - FLASH_START - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 - bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 - qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 -diff --git a/lib/samd51/samd51a/gcc/gcc/samd51p20a_flash.ld b/lib/samd51/samd51a/gcc/gcc/samd51p20a_flash.ld -index 60f73b47..4d8ad695 100644 ---- a/lib/samd51/samd51a/gcc/gcc/samd51p20a_flash.ld -+++ b/lib/samd51/samd51a/gcc/gcc/samd51p20a_flash.ld -@@ -35,7 +35,7 @@ SEARCH_DIR(.) - /* Memory Spaces Definitions */ - MEMORY - { -- rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000 -+ rom (rx) : ORIGIN = 0x00000000 + FLASH_START, LENGTH = 0x00100000 - FLASH_START - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000 - bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 - qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 diff --git a/lib/samd51/samd51a/gcc/gcc/startup_samd51.c b/lib/samd51/samd51a/gcc/gcc/startup_samd51.c index d00bd7a2..42575901 100644 --- a/lib/samd51/samd51a/gcc/gcc/startup_samd51.c diff --git a/lib/samd51/samd51a/gcc/gcc/samd51g19a_flash.ld b/lib/samd51/samd51a/gcc/gcc/samd51g19a_flash.ld index 551597dc..bee9c68d 100644 --- a/lib/samd51/samd51a/gcc/gcc/samd51g19a_flash.ld +++ b/lib/samd51/samd51a/gcc/gcc/samd51g19a_flash.ld @@ -35,7 +35,7 @@ SEARCH_DIR(.) /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000 + FLASH_START, LENGTH = 0x00080000 - FLASH_START + rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000 ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 diff --git a/lib/samd51/samd51a/gcc/gcc/samd51j19a_flash.ld b/lib/samd51/samd51a/gcc/gcc/samd51j19a_flash.ld index 07ee9864..3dfbe0d4 100644 --- a/lib/samd51/samd51a/gcc/gcc/samd51j19a_flash.ld +++ b/lib/samd51/samd51a/gcc/gcc/samd51j19a_flash.ld @@ -35,7 +35,7 @@ SEARCH_DIR(.) /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000 + FLASH_START, LENGTH = 0x00080000 - FLASH_START + rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000 ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 diff --git a/lib/samd51/samd51a/gcc/gcc/samd51n19a_flash.ld b/lib/samd51/samd51a/gcc/gcc/samd51n19a_flash.ld index 1c595648..ae77ba71 100644 --- a/lib/samd51/samd51a/gcc/gcc/samd51n19a_flash.ld +++ b/lib/samd51/samd51a/gcc/gcc/samd51n19a_flash.ld @@ -35,7 +35,7 @@ SEARCH_DIR(.) /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000 + FLASH_START, LENGTH = 0x00080000 - FLASH_START + rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00080000 ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000 diff --git a/lib/samd51/samd51a/gcc/gcc/samd51p20a_flash.ld b/lib/samd51/samd51a/gcc/gcc/samd51p20a_flash.ld index 4d8ad695..60f73b47 100644 --- a/lib/samd51/samd51a/gcc/gcc/samd51p20a_flash.ld +++ b/lib/samd51/samd51a/gcc/gcc/samd51p20a_flash.ld @@ -35,7 +35,7 @@ SEARCH_DIR(.) /* Memory Spaces Definitions */ MEMORY { - rom (rx) : ORIGIN = 0x00000000 + FLASH_START, LENGTH = 0x00100000 - FLASH_START + rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000 ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000 bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000 qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000