Browse Source

soc: use HWMv2 for arm mps3 SoC

This commit move the arm mps3 SoC to soc/v2 and adopt HWMv2.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
pull/69687/head
Torsten Rasmussen 2 years ago committed by Jamie McCrae
parent
commit
7dc2c9db0c
  1. 10
      soc/arm/arm/mps3/Kconfig.series
  2. 2
      soc/v2/arm/mps3/CMakeLists.txt
  3. 10
      soc/v2/arm/mps3/Kconfig
  4. 5
      soc/v2/arm/mps3/Kconfig.defconfig
  5. 3
      soc/v2/arm/mps3/Kconfig.defconfig.mps3_an547
  6. 17
      soc/v2/arm/mps3/Kconfig.soc
  7. 0
      soc/v2/arm/mps3/soc.c
  8. 0
      soc/v2/arm/mps3/soc.h
  9. 4
      soc/v2/arm/mps3/soc.yml

10
soc/arm/arm/mps3/Kconfig.series

@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
# Copyright (c) 2021 Linaro Limited
# SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_MPS3
bool "Arm MPS3 MCU Series"
select ARM
select SOC_FAMILY_ARM
select GPIO_MMIO32 if GPIO
help
Enable support for ARM MPS3 MCU Series

2
soc/arm/arm/mps3/CMakeLists.txt → soc/v2/arm/mps3/CMakeLists.txt

@ -5,4 +5,6 @@ zephyr_sources( @@ -5,4 +5,6 @@ zephyr_sources(
soc.c
)
zephyr_include_directories(.)
set(SOC_LINKER_SCRIPT ${ZEPHYR_BASE}/include/zephyr/arch/arm/cortex_m/scripts/linker.ld CACHE INTERNAL "")

10
soc/arm/arm/mps3/Kconfig.soc → soc/v2/arm/mps3/Kconfig

@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
# Copyright (c) 2017-2021 Linaro Limited
# SPDX-License-Identifier: Apache-2.0
choice
prompt "Arm MPS3 SoCs"
depends on SOC_SERIES_MPS3
config SOC_SERIES_MPS3
select ARM
select SOC_FAMILY_ARM
select GPIO_MMIO32 if GPIO
config SOC_MPS3_AN547
bool "Arm Cortex-M55 SSE-300 on MPS3 (AN547)"
select CPU_CORTEX_M55
select CPU_HAS_ARM_SAU
select CPU_HAS_ARM_MPU
@ -16,8 +16,6 @@ config SOC_MPS3_AN547 @@ -16,8 +16,6 @@ config SOC_MPS3_AN547
select ARMV8_1_M_MVEF
select ARMV8_1_M_PMU
endchoice
config ARMV8_1_M_PMU_EVENTCNT
int
default 8 if SOC_MPS3_AN547

5
soc/arm/arm/mps3/Kconfig.defconfig.series → soc/v2/arm/mps3/Kconfig.defconfig

@ -3,12 +3,9 @@ @@ -3,12 +3,9 @@
if SOC_SERIES_MPS3
config SOC_SERIES
default "mps3"
config SYS_CLOCK_HW_CYCLES_PER_SEC
default 25000000
source "soc/arm/arm/mps3/Kconfig.defconfig.mps3*"
rsource "Kconfig.defconfig.mps3*"
endif # SOC_SERIES_MPS3

3
soc/arm/arm/mps3/Kconfig.defconfig.mps3_an547 → soc/v2/arm/mps3/Kconfig.defconfig.mps3_an547

@ -3,9 +3,6 @@ @@ -3,9 +3,6 @@
if SOC_MPS3_AN547
config SOC
default "mps3_an547"
config NUM_IRQS
default 128

17
soc/v2/arm/mps3/Kconfig.soc

@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
# Copyright (c) 2017-2021 Linaro Limited
# SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_MPS3
bool
help
Enable support for ARM MPS3 MCU Series
config SOC_SERIES
default "mps3" if SOC_SERIES_MPS3
config SOC_MPS3_AN547
bool
select SOC_SERIES_MPS3
config SOC
default "mps3_an547" if SOC_MPS3_AN547

0
soc/arm/arm/mps3/soc.c → soc/v2/arm/mps3/soc.c

0
soc/arm/arm/mps3/soc.h → soc/v2/arm/mps3/soc.h

4
soc/v2/arm/mps3/soc.yml

@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
series:
- name: mps3
socs:
- name: an547
Loading…
Cancel
Save