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>

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).

lib/sam4e/sam4e.patch

@@ -1,5 +1,5 @@
---- a/lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
+--- a/lib/sam4e/gcc/gcc/startup_sam4e.c
-+++ b/lib/cmsis-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
+--- a/lib/sam4e/include/component/afec.h
-+++ b/lib/cmsis-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 */

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 += -L lib/sam4e/gcc/gcc
-CFLAGS_klipper.elf += -T lib/cmsis-sam4e/gcc/gcc/sam4e8e_flash.ld
+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 \
+dirs-y += lib/sam4e/gcc lib/sam4e/gcc/gcc
-		  lib/cmsis-sam4e/gcc/gcc
+CFLAGS += -Ilib/sam4e/include -Ilib/cmsis-core
-CFLAGS += -Ilib/cmsis-sam4e/include \
+src-y += ../lib/sam4e/gcc/system_sam4e.c ../lib/sam4e/gcc/gcc/startup_sam4e.c
-		  -Ilib/cmsis-core
-src-y +=  ../lib/cmsis-sam4e/gcc/system_sam4e.c \
-		  ../lib/cmsis-sam4e/gcc/gcc/startup_sam4e.c
 
 src-$(CONFIG_HAVE_GPIO_SPI) += sam4e8e/spi.c
 src-$(CONFIG_HAVE_GPIO_I2C) += sam4e8e/i2c.c