arch: arm: Move ARM code to AArch32 sub-directory

Before introducing the code for ARM64 (AArch64) we need to relocate the current ARM code to a new AArch32 sub-directory. For now we can assume that no code is shared between ARM and ARM64. There are no functional changes. The code is moved to the new location and the file paths are fixed to reflect this change. Signed-off-by: Carlo Caione <ccaione@baylibre.com>
2019-11-09 17:49:36 +00:00 · 2019-11-09 17:49:36 +00:00 · aec9a8c4be
commit aec9a8c4be
parent 8e5e812252
203 changed files with 199 additions and 196 deletions
--- a/soc/arm/st_stm32/stm32f0/linker.ld
+++ b/soc/arm/st_stm32/stm32f0/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32f0/soc.c
+++ b/soc/arm/st_stm32/stm32f0/soc.c
@ -12,7 +12,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>
 #include <linker/linker-defs.h>
 #include <string.h>

--- a/soc/arm/st_stm32/stm32f1/linker.ld
+++ b/soc/arm/st_stm32/stm32f1/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32f1/soc.c
+++ b/soc/arm/st_stm32/stm32f1/soc.c
@ -12,7 +12,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 /**
 * @brief Perform basic hardware initialization at boot.
--- a/soc/arm/st_stm32/stm32f2/linker.ld
+++ b/soc/arm/st_stm32/stm32f2/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32f2/soc.c
+++ b/soc/arm/st_stm32/stm32f2/soc.c
@ -14,7 +14,7 @@
 #include <init.h>
 #include <soc.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>
 #include <linker/linker-defs.h>
 #include <string.h>

--- a/soc/arm/st_stm32/stm32f3/linker.ld
+++ b/soc/arm/st_stm32/stm32f3/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32f3/soc.c
+++ b/soc/arm/st_stm32/stm32f3/soc.c
@ -12,7 +12,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 /**
 * @brief Perform basic hardware initialization at boot.
--- a/soc/arm/st_stm32/stm32f4/linker.ld
+++ b/soc/arm/st_stm32/stm32f4/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32f4/soc.c
+++ b/soc/arm/st_stm32/stm32f4/soc.c
@ -13,7 +13,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 /**
 * @brief Perform basic hardware initialization at boot.
--- a/soc/arm/st_stm32/stm32f7/linker.ld
+++ b/soc/arm/st_stm32/stm32f7/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32f7/soc.c
+++ b/soc/arm/st_stm32/stm32f7/soc.c
@ -14,7 +14,7 @@
 #include <init.h>
 #include <soc.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 /**
 * @brief Perform basic hardware initialization at boot.
--- a/soc/arm/st_stm32/stm32g0/linker.ld
+++ b/soc/arm/st_stm32/stm32g0/linker.ld
@ -7,4 +7,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32g0/soc.c
+++ b/soc/arm/st_stm32/stm32g0/soc.c
@ -13,7 +13,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>
 #include <linker/linker-defs.h>
 #include <string.h>

--- a/soc/arm/st_stm32/stm32g4/linker.ld
+++ b/soc/arm/st_stm32/stm32g4/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32g4/soc.c
+++ b/soc/arm/st_stm32/stm32g4/soc.c
@ -12,7 +12,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 /**
 * @brief Perform basic hardware initialization at boot.
--- a/soc/arm/st_stm32/stm32h7/linker.ld
+++ b/soc/arm/st_stm32/stm32h7/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32h7/soc_m4.c
+++ b/soc/arm/st_stm32/stm32h7/soc_m4.c
@ -14,7 +14,7 @@
 #include <init.h>
 #include <soc.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 #if defined(CONFIG_STM32H7_BOOT_CM4_CM7)
 void stm32h7_m4_boot_stop(void)
--- a/soc/arm/st_stm32/stm32h7/soc_m7.c
+++ b/soc/arm/st_stm32/stm32h7/soc_m7.c
@ -14,7 +14,7 @@
 #include <init.h>
 #include <soc.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 #if defined(CONFIG_STM32H7_DUAL_CORE)
 static int stm32h7_m4_wakeup(struct device *arg)
--- a/soc/arm/st_stm32/stm32l0/linker.ld
+++ b/soc/arm/st_stm32/stm32l0/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32l0/soc.c
+++ b/soc/arm/st_stm32/stm32l0/soc.c
@ -12,7 +12,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>
 #include <linker/linker-defs.h>
 #include <string.h>

--- a/soc/arm/st_stm32/stm32l1/linker.ld
+++ b/soc/arm/st_stm32/stm32l1/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32l1/soc.c
+++ b/soc/arm/st_stm32/stm32l1/soc.c
@ -12,7 +12,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>
 #include <linker/linker-defs.h>
 #include <string.h>

--- a/soc/arm/st_stm32/stm32l4/linker.ld
+++ b/soc/arm/st_stm32/stm32l4/linker.ld
@ -6,4 +6,4 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32l4/soc.c
+++ b/soc/arm/st_stm32/stm32l4/soc.c
@ -13,7 +13,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 /**
 * @brief Perform basic hardware initialization at boot.
--- a/soc/arm/st_stm32/stm32mp1/linker.ld
+++ b/soc/arm/st_stm32/stm32mp1/linker.ld
@ -7,7 +7,7 @@
 */


-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>

 SECTIONS
    {
@ -20,4 +20,4 @@ SECTIONS
 		KEEP(*(.resource_table*))
    	} GROUP_LINK_IN(ROMABLE_REGION)
 #endif
-}
+}
--- a/soc/arm/st_stm32/stm32mp1/soc.c
+++ b/soc/arm/st_stm32/stm32mp1/soc.c
@ -14,7 +14,7 @@
 #include <init.h>
 #include <soc.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 /**
 * @brief Perform basic hardware initialization at boot.
--- a/soc/arm/st_stm32/stm32wb/linker.ld
+++ b/soc/arm/st_stm32/stm32wb/linker.ld
@ -11,4 +11,4 @@
 #define RAM2_SIZE (20 * 1K)
 #define RAM2_ADDR 0x20038000

-#include <arch/arm/cortex_m/scripts/linker.ld>
+#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
--- a/soc/arm/st_stm32/stm32wb/soc.c
+++ b/soc/arm/st_stm32/stm32wb/soc.c
@ -12,7 +12,7 @@
 #include <device.h>
 #include <init.h>
 #include <arch/cpu.h>
-#include <arch/arm/cortex_m/cmsis.h>
+#include <arch/arm/aarch32/cortex_m/cmsis.h>

 /**
 * @brief Perform basic hardware initialization at boot.