lib: Rename lib/cmsis-sam4e/ to lib/sam4e/

This is in preparation for merging the sam3 and sam4 code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

95 files changed, 19 insertions, 21 deletions

diff --git a/lib/README b/lib/README
index ff6c1f7a..a89cfeaf 100644
--- a/lib/README
+++ b/lib/README
@@ -11,6 +11,15 @@ Atmel.SAM3X_DFP.1.0.50.atpack zip file found at:
 version 1.0.50 (extracted on 20180725). It has been modified to
 compile with gcc's LTO feature. See sam3x.patch for the modifications.
 
+The sam4e directory contains code from the
+Atmel.SAM4E_DFP.1.1.57.atpack zip file found at:
+  http://packs.download.atmel.com/
+version 1.1.57 (extracted on 20180806). It has been modified to
+compile with gcc's LTO feature. Also, some AFEC register RW accesses
+have been modified to comply with the SAM4E datasheet. Finally, the
+interrupt vector table has been slightly modified to allow the code to
+run. See cmsis-sam4e8e.patch for the modifications.
+
 The samd21 directory contains code from the
 Atmel.SAMD21_DFP.1.3.304.atpack zip file found at:
   http://packs.download.atmel.com/
@@ -18,14 +27,6 @@ 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.
 
-The cmsis-sam4e8e directory contains code from the
-Atmel.SAM4E_DFP.1.1.57.atpack zip file found at:
-  http://packs.download.atmel.com/
-version 1.1.57 (extracted on 20180806). It has been modified to compile
-with gcc's LTO feature. Also, some AFEC register RW accesses have been modified
-to comply with the SAM4E datasheet. Finally, the interrupt vector table has
-been slightly modified to allow the code to run. See cmsis-sam4e8e.patch for the modifications.
-
 The lpc176x directory contains code from the mbed project:
   https://github.com/ARMmbed/mbed-os
 version mbed-os-5.8.3 (c05d72c3c005fbb7e92c3994c32bda45218ae7fe).
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e16c_flash.ld b/lib/sam4e/gcc/gcc/sam4e16c_flash.ld
index 524146f9..524146f9 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e16c_flash.ld
+++ b/lib/sam4e/gcc/gcc/sam4e16c_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e16c_sram.ld b/lib/sam4e/gcc/gcc/sam4e16c_sram.ld
index 61cefc95..61cefc95 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e16c_sram.ld
+++ b/lib/sam4e/gcc/gcc/sam4e16c_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e16e_flash.ld b/lib/sam4e/gcc/gcc/sam4e16e_flash.ld
index df595291..df595291 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e16e_flash.ld
+++ b/lib/sam4e/gcc/gcc/sam4e16e_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e16e_sram.ld b/lib/sam4e/gcc/gcc/sam4e16e_sram.ld
index 24b21415..24b21415 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e16e_sram.ld
+++ b/lib/sam4e/gcc/gcc/sam4e16e_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e8c_flash.ld b/lib/sam4e/gcc/gcc/sam4e8c_flash.ld
index 47be249f..47be249f 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e8c_flash.ld
+++ b/lib/sam4e/gcc/gcc/sam4e8c_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e8c_sram.ld b/lib/sam4e/gcc/gcc/sam4e8c_sram.ld
index faf8864f..faf8864f 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e8c_sram.ld
+++ b/lib/sam4e/gcc/gcc/sam4e8c_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e8e_flash.ld b/lib/sam4e/gcc/gcc/sam4e8e_flash.ld
index 685fa1fb..685fa1fb 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e8e_flash.ld
+++ b/lib/sam4e/gcc/gcc/sam4e8e_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e8e_sram.ld b/lib/sam4e/gcc/gcc/sam4e8e_sram.ld
index dc961346..dc961346 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e8e_sram.ld
+++ b/lib/sam4e/gcc/gcc/sam4e8e_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e_flash.ld b/lib/sam4e/gcc/gcc/sam4e_flash.ld
index 0b42920a..0b42920a 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e_flash.ld
+++ b/lib/sam4e/gcc/gcc/sam4e_flash.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/sam4e_sram.ld b/lib/sam4e/gcc/gcc/sam4e_sram.ld
index a2e4d025..a2e4d025 100644
--- a/lib/cmsis-sam4e/gcc/gcc/sam4e_sram.ld
+++ b/lib/sam4e/gcc/gcc/sam4e_sram.ld
diff --git a/lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c b/lib/sam4e/gcc/gcc/startup_sam4e.c
index 78402954..78402954 100644
--- a/lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
+++ b/lib/sam4e/gcc/gcc/startup_sam4e.c
diff --git a/lib/cmsis-sam4e/gcc/system_sam4e.c b/lib/sam4e/gcc/system_sam4e.c
index d7545f2e..d7545f2e 100644
--- a/lib/cmsis-sam4e/gcc/system_sam4e.c
+++ b/lib/sam4e/gcc/system_sam4e.c
diff --git a/lib/cmsis-sam4e/include/component/acc.h b/lib/sam4e/include/component/acc.h
index 62f74267..62f74267 100644
--- a/lib/cmsis-sam4e/include/component/acc.h
+++ b/lib/sam4e/include/component/acc.h
diff --git a/lib/cmsis-sam4e/include/component/aes.h b/lib/sam4e/include/component/aes.h
index d3875a7f..d3875a7f 100644
--- a/lib/cmsis-sam4e/include/component/aes.h
+++ b/lib/sam4e/include/component/aes.h
diff --git a/lib/cmsis-sam4e/include/component/afec.h b/lib/sam4e/include/component/afec.h
index 9a4f8f96..9a4f8f96 100644
--- a/lib/cmsis-sam4e/include/component/afec.h
+++ b/lib/sam4e/include/component/afec.h
diff --git a/lib/cmsis-sam4e/include/component/can.h b/lib/sam4e/include/component/can.h
index b3c06aa1..b3c06aa1 100644
--- a/lib/cmsis-sam4e/include/component/can.h
+++ b/lib/sam4e/include/component/can.h
diff --git a/lib/cmsis-sam4e/include/component/chipid.h b/lib/sam4e/include/component/chipid.h
index 94f468f4..94f468f4 100644
--- a/lib/cmsis-sam4e/include/component/chipid.h
+++ b/lib/sam4e/include/component/chipid.h
diff --git a/lib/cmsis-sam4e/include/component/cmcc.h b/lib/sam4e/include/component/cmcc.h
index ab2c1eda..ab2c1eda 100644
--- a/lib/cmsis-sam4e/include/component/cmcc.h
+++ b/lib/sam4e/include/component/cmcc.h
diff --git a/lib/cmsis-sam4e/include/component/crccu.h b/lib/sam4e/include/component/crccu.h
index 0e235ce8..0e235ce8 100644
--- a/lib/cmsis-sam4e/include/component/crccu.h
+++ b/lib/sam4e/include/component/crccu.h
diff --git a/lib/cmsis-sam4e/include/component/dacc.h b/lib/sam4e/include/component/dacc.h
index aeccd5bb..aeccd5bb 100644
--- a/lib/cmsis-sam4e/include/component/dacc.h
+++ b/lib/sam4e/include/component/dacc.h
diff --git a/lib/cmsis-sam4e/include/component/dmac.h b/lib/sam4e/include/component/dmac.h
index 21bf6b81..21bf6b81 100644
--- a/lib/cmsis-sam4e/include/component/dmac.h
+++ b/lib/sam4e/include/component/dmac.h
diff --git a/lib/cmsis-sam4e/include/component/efc.h b/lib/sam4e/include/component/efc.h
index 6c6f21a6..6c6f21a6 100644
--- a/lib/cmsis-sam4e/include/component/efc.h
+++ b/lib/sam4e/include/component/efc.h
diff --git a/lib/cmsis-sam4e/include/component/gmac.h b/lib/sam4e/include/component/gmac.h
index 3e9704f5..3e9704f5 100644
--- a/lib/cmsis-sam4e/include/component/gmac.h
+++ b/lib/sam4e/include/component/gmac.h
diff --git a/lib/cmsis-sam4e/include/component/gpbr.h b/lib/sam4e/include/component/gpbr.h
index de35a1c7..de35a1c7 100644
--- a/lib/cmsis-sam4e/include/component/gpbr.h
+++ b/lib/sam4e/include/component/gpbr.h
diff --git a/lib/cmsis-sam4e/include/component/hsmci.h b/lib/sam4e/include/component/hsmci.h
index 928ee37d..928ee37d 100644
--- a/lib/cmsis-sam4e/include/component/hsmci.h
+++ b/lib/sam4e/include/component/hsmci.h
diff --git a/lib/cmsis-sam4e/include/component/matrix.h b/lib/sam4e/include/component/matrix.h
index 8693f528..8693f528 100644
--- a/lib/cmsis-sam4e/include/component/matrix.h
+++ b/lib/sam4e/include/component/matrix.h
diff --git a/lib/cmsis-sam4e/include/component/pdc.h b/lib/sam4e/include/component/pdc.h
index 8d34dedc..8d34dedc 100644
--- a/lib/cmsis-sam4e/include/component/pdc.h
+++ b/lib/sam4e/include/component/pdc.h
diff --git a/lib/cmsis-sam4e/include/component/pio.h b/lib/sam4e/include/component/pio.h
index 28e5401b..28e5401b 100644
--- a/lib/cmsis-sam4e/include/component/pio.h
+++ b/lib/sam4e/include/component/pio.h
diff --git a/lib/cmsis-sam4e/include/component/pmc.h b/lib/sam4e/include/component/pmc.h
index 8bebe935..8bebe935 100644
--- a/lib/cmsis-sam4e/include/component/pmc.h
+++ b/lib/sam4e/include/component/pmc.h
diff --git a/lib/cmsis-sam4e/include/component/pwm.h b/lib/sam4e/include/component/pwm.h
index f609c670..f609c670 100644
--- a/lib/cmsis-sam4e/include/component/pwm.h
+++ b/lib/sam4e/include/component/pwm.h
diff --git a/lib/cmsis-sam4e/include/component/rstc.h b/lib/sam4e/include/component/rstc.h
index 1dd4e430..1dd4e430 100644
--- a/lib/cmsis-sam4e/include/component/rstc.h
+++ b/lib/sam4e/include/component/rstc.h
diff --git a/lib/cmsis-sam4e/include/component/rtc.h b/lib/sam4e/include/component/rtc.h
index 8e9a0a3e..8e9a0a3e 100644
--- a/lib/cmsis-sam4e/include/component/rtc.h
+++ b/lib/sam4e/include/component/rtc.h
diff --git a/lib/cmsis-sam4e/include/component/rtt.h b/lib/sam4e/include/component/rtt.h
index 21e1d2d5..21e1d2d5 100644
--- a/lib/cmsis-sam4e/include/component/rtt.h
+++ b/lib/sam4e/include/component/rtt.h
diff --git a/lib/cmsis-sam4e/include/component/smc.h b/lib/sam4e/include/component/smc.h
index 69372ae2..69372ae2 100644
--- a/lib/cmsis-sam4e/include/component/smc.h
+++ b/lib/sam4e/include/component/smc.h
diff --git a/lib/cmsis-sam4e/include/component/spi.h b/lib/sam4e/include/component/spi.h
index 76fb78c2..76fb78c2 100644
--- a/lib/cmsis-sam4e/include/component/spi.h
+++ b/lib/sam4e/include/component/spi.h
diff --git a/lib/cmsis-sam4e/include/component/supc.h b/lib/sam4e/include/component/supc.h
index b57c1ad4..b57c1ad4 100644
--- a/lib/cmsis-sam4e/include/component/supc.h
+++ b/lib/sam4e/include/component/supc.h
diff --git a/lib/cmsis-sam4e/include/component/tc.h b/lib/sam4e/include/component/tc.h
index 0a9464e3..0a9464e3 100644
--- a/lib/cmsis-sam4e/include/component/tc.h
+++ b/lib/sam4e/include/component/tc.h
diff --git a/lib/cmsis-sam4e/include/component/twi.h b/lib/sam4e/include/component/twi.h
index 66ec202f..66ec202f 100644
--- a/lib/cmsis-sam4e/include/component/twi.h
+++ b/lib/sam4e/include/component/twi.h
diff --git a/lib/cmsis-sam4e/include/component/uart.h b/lib/sam4e/include/component/uart.h
index 60181da6..60181da6 100644
--- a/lib/cmsis-sam4e/include/component/uart.h
+++ b/lib/sam4e/include/component/uart.h
diff --git a/lib/cmsis-sam4e/include/component/udp.h b/lib/sam4e/include/component/udp.h
index 154c00bf..154c00bf 100644
--- a/lib/cmsis-sam4e/include/component/udp.h
+++ b/lib/sam4e/include/component/udp.h
diff --git a/lib/cmsis-sam4e/include/component/usart.h b/lib/sam4e/include/component/usart.h
index 6d7805a9..6d7805a9 100644
--- a/lib/cmsis-sam4e/include/component/usart.h
+++ b/lib/sam4e/include/component/usart.h
diff --git a/lib/cmsis-sam4e/include/component/wdt.h b/lib/sam4e/include/component/wdt.h
index 9175adc7..9175adc7 100644
--- a/lib/cmsis-sam4e/include/component/wdt.h
+++ b/lib/sam4e/include/component/wdt.h
diff --git a/lib/cmsis-sam4e/include/instance/acc.h b/lib/sam4e/include/instance/acc.h
index 49da7fbe..49da7fbe 100644
--- a/lib/cmsis-sam4e/include/instance/acc.h
+++ b/lib/sam4e/include/instance/acc.h
diff --git a/lib/cmsis-sam4e/include/instance/aes.h b/lib/sam4e/include/instance/aes.h
index ec825afa..ec825afa 100644
--- a/lib/cmsis-sam4e/include/instance/aes.h
+++ b/lib/sam4e/include/instance/aes.h
diff --git a/lib/cmsis-sam4e/include/instance/afec0.h b/lib/sam4e/include/instance/afec0.h
index 1c23bfea..1c23bfea 100644
--- a/lib/cmsis-sam4e/include/instance/afec0.h
+++ b/lib/sam4e/include/instance/afec0.h
diff --git a/lib/cmsis-sam4e/include/instance/afec1.h b/lib/sam4e/include/instance/afec1.h
index ce296568..ce296568 100644
--- a/lib/cmsis-sam4e/include/instance/afec1.h
+++ b/lib/sam4e/include/instance/afec1.h
diff --git a/lib/cmsis-sam4e/include/instance/can0.h b/lib/sam4e/include/instance/can0.h
index ba83927e..ba83927e 100644
--- a/lib/cmsis-sam4e/include/instance/can0.h
+++ b/lib/sam4e/include/instance/can0.h
diff --git a/lib/cmsis-sam4e/include/instance/can1.h b/lib/sam4e/include/instance/can1.h
index 607f90bb..607f90bb 100644
--- a/lib/cmsis-sam4e/include/instance/can1.h
+++ b/lib/sam4e/include/instance/can1.h
diff --git a/lib/cmsis-sam4e/include/instance/chipid.h b/lib/sam4e/include/instance/chipid.h
index 34b04fa0..34b04fa0 100644
--- a/lib/cmsis-sam4e/include/instance/chipid.h
+++ b/lib/sam4e/include/instance/chipid.h
diff --git a/lib/cmsis-sam4e/include/instance/cmcc.h b/lib/sam4e/include/instance/cmcc.h
index 8e8badb9..8e8badb9 100644
--- a/lib/cmsis-sam4e/include/instance/cmcc.h
+++ b/lib/sam4e/include/instance/cmcc.h
diff --git a/lib/cmsis-sam4e/include/instance/crccu.h b/lib/sam4e/include/instance/crccu.h
index 50fc02ff..50fc02ff 100644
--- a/lib/cmsis-sam4e/include/instance/crccu.h
+++ b/lib/sam4e/include/instance/crccu.h
diff --git a/lib/cmsis-sam4e/include/instance/dacc.h b/lib/sam4e/include/instance/dacc.h
index 7c5ff497..7c5ff497 100644
--- a/lib/cmsis-sam4e/include/instance/dacc.h
+++ b/lib/sam4e/include/instance/dacc.h
diff --git a/lib/cmsis-sam4e/include/instance/dmac.h b/lib/sam4e/include/instance/dmac.h
index 8c3c18d8..8c3c18d8 100644
--- a/lib/cmsis-sam4e/include/instance/dmac.h
+++ b/lib/sam4e/include/instance/dmac.h
diff --git a/lib/cmsis-sam4e/include/instance/efc.h b/lib/sam4e/include/instance/efc.h
index e3f79e14..e3f79e14 100644
--- a/lib/cmsis-sam4e/include/instance/efc.h
+++ b/lib/sam4e/include/instance/efc.h
diff --git a/lib/cmsis-sam4e/include/instance/gmac.h b/lib/sam4e/include/instance/gmac.h
index 559b9ceb..559b9ceb 100644
--- a/lib/cmsis-sam4e/include/instance/gmac.h
+++ b/lib/sam4e/include/instance/gmac.h
diff --git a/lib/cmsis-sam4e/include/instance/gpbr.h b/lib/sam4e/include/instance/gpbr.h
index 0f66284a..0f66284a 100644
--- a/lib/cmsis-sam4e/include/instance/gpbr.h
+++ b/lib/sam4e/include/instance/gpbr.h
diff --git a/lib/cmsis-sam4e/include/instance/hsmci.h b/lib/sam4e/include/instance/hsmci.h
index e5a15817..e5a15817 100644
--- a/lib/cmsis-sam4e/include/instance/hsmci.h
+++ b/lib/sam4e/include/instance/hsmci.h
diff --git a/lib/cmsis-sam4e/include/instance/matrix.h b/lib/sam4e/include/instance/matrix.h
index 8ac5cbd8..8ac5cbd8 100644
--- a/lib/cmsis-sam4e/include/instance/matrix.h
+++ b/lib/sam4e/include/instance/matrix.h
diff --git a/lib/cmsis-sam4e/include/instance/pioa.h b/lib/sam4e/include/instance/pioa.h
index 9b3bd4ab..9b3bd4ab 100644
--- a/lib/cmsis-sam4e/include/instance/pioa.h
+++ b/lib/sam4e/include/instance/pioa.h
diff --git a/lib/cmsis-sam4e/include/instance/piob.h b/lib/sam4e/include/instance/piob.h
index 36440756..36440756 100644
--- a/lib/cmsis-sam4e/include/instance/piob.h
+++ b/lib/sam4e/include/instance/piob.h
diff --git a/lib/cmsis-sam4e/include/instance/pioc.h b/lib/sam4e/include/instance/pioc.h
index b91376d3..b91376d3 100644
--- a/lib/cmsis-sam4e/include/instance/pioc.h
+++ b/lib/sam4e/include/instance/pioc.h
diff --git a/lib/cmsis-sam4e/include/instance/piod.h b/lib/sam4e/include/instance/piod.h
index 10de19b1..10de19b1 100644
--- a/lib/cmsis-sam4e/include/instance/piod.h
+++ b/lib/sam4e/include/instance/piod.h
diff --git a/lib/cmsis-sam4e/include/instance/pioe.h b/lib/sam4e/include/instance/pioe.h
index d1696bf2..d1696bf2 100644
--- a/lib/cmsis-sam4e/include/instance/pioe.h
+++ b/lib/sam4e/include/instance/pioe.h
diff --git a/lib/cmsis-sam4e/include/instance/pmc.h b/lib/sam4e/include/instance/pmc.h
index 68f85daa..68f85daa 100644
--- a/lib/cmsis-sam4e/include/instance/pmc.h
+++ b/lib/sam4e/include/instance/pmc.h
diff --git a/lib/cmsis-sam4e/include/instance/pwm.h b/lib/sam4e/include/instance/pwm.h
index 06450ae9..06450ae9 100644
--- a/lib/cmsis-sam4e/include/instance/pwm.h
+++ b/lib/sam4e/include/instance/pwm.h
diff --git a/lib/cmsis-sam4e/include/instance/rstc.h b/lib/sam4e/include/instance/rstc.h
index 9b514e31..9b514e31 100644
--- a/lib/cmsis-sam4e/include/instance/rstc.h
+++ b/lib/sam4e/include/instance/rstc.h
diff --git a/lib/cmsis-sam4e/include/instance/rtc.h b/lib/sam4e/include/instance/rtc.h
index 06afef22..06afef22 100644
--- a/lib/cmsis-sam4e/include/instance/rtc.h
+++ b/lib/sam4e/include/instance/rtc.h
diff --git a/lib/cmsis-sam4e/include/instance/rtt.h b/lib/sam4e/include/instance/rtt.h
index 46f88c51..46f88c51 100644
--- a/lib/cmsis-sam4e/include/instance/rtt.h
+++ b/lib/sam4e/include/instance/rtt.h
diff --git a/lib/cmsis-sam4e/include/instance/smc.h b/lib/sam4e/include/instance/smc.h
index a94d2a78..a94d2a78 100644
--- a/lib/cmsis-sam4e/include/instance/smc.h
+++ b/lib/sam4e/include/instance/smc.h
diff --git a/lib/cmsis-sam4e/include/instance/spi.h b/lib/sam4e/include/instance/spi.h
index f9d2f50c..f9d2f50c 100644
--- a/lib/cmsis-sam4e/include/instance/spi.h
+++ b/lib/sam4e/include/instance/spi.h
diff --git a/lib/cmsis-sam4e/include/instance/supc.h b/lib/sam4e/include/instance/supc.h
index a16571ed..a16571ed 100644
--- a/lib/cmsis-sam4e/include/instance/supc.h
+++ b/lib/sam4e/include/instance/supc.h
diff --git a/lib/cmsis-sam4e/include/instance/tc0.h b/lib/sam4e/include/instance/tc0.h
index c7e3ee6e..c7e3ee6e 100644
--- a/lib/cmsis-sam4e/include/instance/tc0.h
+++ b/lib/sam4e/include/instance/tc0.h
diff --git a/lib/cmsis-sam4e/include/instance/tc1.h b/lib/sam4e/include/instance/tc1.h
index 7f3ee373..7f3ee373 100644
--- a/lib/cmsis-sam4e/include/instance/tc1.h
+++ b/lib/sam4e/include/instance/tc1.h
diff --git a/lib/cmsis-sam4e/include/instance/tc2.h b/lib/sam4e/include/instance/tc2.h
index 6eff9c2d..6eff9c2d 100644
--- a/lib/cmsis-sam4e/include/instance/tc2.h
+++ b/lib/sam4e/include/instance/tc2.h
diff --git a/lib/cmsis-sam4e/include/instance/twi0.h b/lib/sam4e/include/instance/twi0.h
index 43c274a0..43c274a0 100644
--- a/lib/cmsis-sam4e/include/instance/twi0.h
+++ b/lib/sam4e/include/instance/twi0.h
diff --git a/lib/cmsis-sam4e/include/instance/twi1.h b/lib/sam4e/include/instance/twi1.h
index 3370774a..3370774a 100644
--- a/lib/cmsis-sam4e/include/instance/twi1.h
+++ b/lib/sam4e/include/instance/twi1.h
diff --git a/lib/cmsis-sam4e/include/instance/uart0.h b/lib/sam4e/include/instance/uart0.h
index ce610821..ce610821 100644
--- a/lib/cmsis-sam4e/include/instance/uart0.h
+++ b/lib/sam4e/include/instance/uart0.h
diff --git a/lib/cmsis-sam4e/include/instance/uart1.h b/lib/sam4e/include/instance/uart1.h
index d8bec559..d8bec559 100644
--- a/lib/cmsis-sam4e/include/instance/uart1.h
+++ b/lib/sam4e/include/instance/uart1.h
diff --git a/lib/cmsis-sam4e/include/instance/udp.h b/lib/sam4e/include/instance/udp.h
index 3759d0bd..3759d0bd 100644
--- a/lib/cmsis-sam4e/include/instance/udp.h
+++ b/lib/sam4e/include/instance/udp.h
diff --git a/lib/cmsis-sam4e/include/instance/usart0.h b/lib/sam4e/include/instance/usart0.h
index 6eac9949..6eac9949 100644
--- a/lib/cmsis-sam4e/include/instance/usart0.h
+++ b/lib/sam4e/include/instance/usart0.h
diff --git a/lib/cmsis-sam4e/include/instance/usart1.h b/lib/sam4e/include/instance/usart1.h
index b84321d4..b84321d4 100644
--- a/lib/cmsis-sam4e/include/instance/usart1.h
+++ b/lib/sam4e/include/instance/usart1.h
diff --git a/lib/cmsis-sam4e/include/instance/wdt.h b/lib/sam4e/include/instance/wdt.h
index c9efa86f..c9efa86f 100644
--- a/lib/cmsis-sam4e/include/instance/wdt.h
+++ b/lib/sam4e/include/instance/wdt.h
diff --git a/lib/cmsis-sam4e/include/pio/sam4e16c.h b/lib/sam4e/include/pio/sam4e16c.h
index 7b77be42..7b77be42 100644
--- a/lib/cmsis-sam4e/include/pio/sam4e16c.h
+++ b/lib/sam4e/include/pio/sam4e16c.h
diff --git a/lib/cmsis-sam4e/include/pio/sam4e16e.h b/lib/sam4e/include/pio/sam4e16e.h
index 019dc920..019dc920 100644
--- a/lib/cmsis-sam4e/include/pio/sam4e16e.h
+++ b/lib/sam4e/include/pio/sam4e16e.h
diff --git a/lib/cmsis-sam4e/include/pio/sam4e8c.h b/lib/sam4e/include/pio/sam4e8c.h
index 06db7139..06db7139 100644
--- a/lib/cmsis-sam4e/include/pio/sam4e8c.h
+++ b/lib/sam4e/include/pio/sam4e8c.h
diff --git a/lib/cmsis-sam4e/include/pio/sam4e8e.h b/lib/sam4e/include/pio/sam4e8e.h
index e4be1ed3..e4be1ed3 100644
--- a/lib/cmsis-sam4e/include/pio/sam4e8e.h
+++ b/lib/sam4e/include/pio/sam4e8e.h
diff --git a/lib/cmsis-sam4e/include/sam4e.h b/lib/sam4e/include/sam4e.h
index 2c4bb3bd..2c4bb3bd 100644
--- a/lib/cmsis-sam4e/include/sam4e.h
+++ b/lib/sam4e/include/sam4e.h
diff --git a/lib/cmsis-sam4e/include/sam4e16c.h b/lib/sam4e/include/sam4e16c.h
index 8f6165be..8f6165be 100644
--- a/lib/cmsis-sam4e/include/sam4e16c.h
+++ b/lib/sam4e/include/sam4e16c.h
diff --git a/lib/cmsis-sam4e/include/sam4e16e.h b/lib/sam4e/include/sam4e16e.h
index 139cae57..139cae57 100644
--- a/lib/cmsis-sam4e/include/sam4e16e.h
+++ b/lib/sam4e/include/sam4e16e.h
diff --git a/lib/cmsis-sam4e/include/sam4e8c.h b/lib/sam4e/include/sam4e8c.h
index c0fc5976..c0fc5976 100644
--- a/lib/cmsis-sam4e/include/sam4e8c.h
+++ b/lib/sam4e/include/sam4e8c.h
diff --git a/lib/cmsis-sam4e/include/sam4e8e.h b/lib/sam4e/include/sam4e8e.h
index 078e6b90..078e6b90 100644
--- a/lib/cmsis-sam4e/include/sam4e8e.h
+++ b/lib/sam4e/include/sam4e8e.h
diff --git a/lib/cmsis-sam4e/include/system_sam4e.h b/lib/sam4e/include/system_sam4e.h
index 9be83a91..9be83a91 100644
--- a/lib/cmsis-sam4e/include/system_sam4e.h
+++ b/lib/sam4e/include/system_sam4e.h
diff --git a/lib/cmsis-sam4e/cmsis-sam4e.patch b/lib/sam4e/sam4e.patch
index f69edfb2..6e4d7b9b 100644
--- a/lib/cmsis-sam4e/cmsis-sam4e.patch
+++ b/lib/sam4e/sam4e.patch
@@ -1,5 +1,5 @@
---- a/lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
-+++ b/lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
+--- a/lib/sam4e/gcc/gcc/startup_sam4e.c
++++ b/lib/sam4e/gcc/gcc/startup_sam4e.c
 @@ -104,7 +105,7 @@ void GMAC_Handler   ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
  void UART1_Handler  ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 
@@ -37,10 +37,10 @@
 
          /* Branch to main function */
          main();
-diff --git a/lib/cmsis-sam4e/include/component/afec.h b/lib/cmsis-sam4e/include/component/afec.h
+diff --git a/lib/sam4e/include/component/afec.h b/lib/sam4e/include/component/afec.h
 index 34c4e61d..9a4f8f96 100644
---- a/lib/cmsis-sam4e/include/component/afec.h
-+++ b/lib/cmsis-sam4e/include/component/afec.h
+--- a/lib/sam4e/include/component/afec.h
++++ b/lib/sam4e/include/component/afec.h
 @@ -59,9 +59,9 @@ typedef struct {
    RoReg Reserved2[1];
    RwReg AFE_CDOR;      /**< \brief (Afec Offset: 0x5C) Channel DC Offset Register */
diff --git a/src/sam4e8e/Makefile b/src/sam4e8e/Makefile
index 4eda793d..a80741bf 100644
--- a/src/sam4e8e/Makefile
+++ b/src/sam4e8e/Makefile
@@ -7,16 +7,13 @@ dirs-y += src/sam4e8e src/generic
 CFLAGS += -mthumb -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 CFLAGS += -D__SAM4E8E__
 
-CFLAGS_klipper.elf += -L lib/cmsis-sam4e/gcc/gcc
-CFLAGS_klipper.elf += -T lib/cmsis-sam4e/gcc/gcc/sam4e8e_flash.ld
+CFLAGS_klipper.elf += -L lib/sam4e/gcc/gcc
+CFLAGS_klipper.elf += -T lib/sam4e/gcc/gcc/sam4e8e_flash.ld
 CFLAGS_klipper.elf += --specs=nano.specs --specs=nosys.specs
 
-dirs-y += lib/cmsis-sam4e/gcc \
-		  lib/cmsis-sam4e/gcc/gcc
-CFLAGS += -Ilib/cmsis-sam4e/include \
-		  -Ilib/cmsis-core
-src-y +=  ../lib/cmsis-sam4e/gcc/system_sam4e.c \
-		  ../lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
+dirs-y += lib/sam4e/gcc lib/sam4e/gcc/gcc
+CFLAGS += -Ilib/sam4e/include -Ilib/cmsis-core
+src-y += ../lib/sam4e/gcc/system_sam4e.c ../lib/sam4e/gcc/gcc/startup_sam4e.c
 
 src-$(CONFIG_HAVE_GPIO_SPI) += sam4e8e/spi.c
 src-$(CONFIG_HAVE_GPIO_I2C) += sam4e8e/i2c.c