michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc: arm: musca: Fix SoC Kconfig naming

Browse Source 
Fixes the Kconfig name of this so that it matches the value from
soc.yml, this has not been deprecated because this SoC is a virtual
SoC used only with the 2 boards in zephyr meaning it should not
cause any breakage of out-of-tree boards

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae
2026-01-16 06:48:25 +00:00
committed by Fabio Baltieri
parent 4ae5f63aa9
commit bf5460b661
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boards/arm/v2m_musca_b1/Kconfig.v2m_musca_b1
View File

@@ -2,4 +2,4 @@
# SPDX-License-Identifier: Apache-2.0
config BOARD_V2M_MUSCA_B1
select SOC_V2M_MUSCA_B1
select SOC_MUSCA_B1

2
boards/arm/v2m_musca_s1/Kconfig.v2m_musca_s1
View File

@@ -2,4 +2,4 @@
# SPDX-License-Identifier: Apache-2.0
config BOARD_V2M_MUSCA_S1
select SOC_V2M_MUSCA_S1
select SOC_MUSCA_S1

2
samples/subsys/ipc/openamp/remote/src/main.c
View File

@@ -56,7 +56,7 @@ static uint32_t ipc_virtio_get_features(struct virtio_device *dev)
static void ipc_virtio_notify(struct virtqueue *vq)
{
#if defined(CONFIG_SOC_MPS2_AN521) || \
defined(CONFIG_SOC_V2M_MUSCA_B1)
defined(CONFIG_SOC_MUSCA_B1)
uint32_t current_core = sse_200_platform_get_cpu_id();
ipm_send(ipm_handle, 0, current_core ? 0 : 1, 0, 1);

4
samples/subsys/ipc/openamp/src/main.c
View File

@@ -66,7 +66,7 @@ static void ipc_virtio_set_features(struct virtio_device *dev, uint32_t features
static void ipc_virtio_notify(struct virtqueue *vq)
{
#if defined(CONFIG_SOC_MPS2_AN521) || \
defined(CONFIG_SOC_V2M_MUSCA_B1)
defined(CONFIG_SOC_MUSCA_B1)
uint32_t current_core = sse_200_platform_get_cpu_id();
ipm_send(ipm_handle, 0, current_core ? 0 : 1, 0, 1);
@@ -254,7 +254,7 @@ int main(void)
NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
#if defined(CONFIG_SOC_MPS2_AN521) || \
defined(CONFIG_SOC_V2M_MUSCA_B1)
defined(CONFIG_SOC_MUSCA_B1)
wakeup_cpu1();
k_msleep(500);
#endif /* #if defined(CONFIG_SOC_MPS2_AN521) */

2
samples/subsys/ipc/rpmsg_service/src/main.c
View File

@@ -88,7 +88,7 @@ int main(void)
k_thread_create(&thread_data, thread_stack, CONFIG_MAIN_APP_TASK_STACK_SIZE, app_task,
NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
#if defined(CONFIG_SOC_MPS2_AN521) || defined(CONFIG_SOC_V2M_MUSCA_B1)
#if defined(CONFIG_SOC_MPS2_AN521) || defined(CONFIG_SOC_MUSCA_B1)
wakeup_cpu1();
k_msleep(500);
#endif /* #if defined(CONFIG_SOC_MPS2_AN521) */

4
soc/arm/musca/CMakeLists.txt
View File

@@ -4,10 +4,10 @@
# SPDX-License-Identifier: Apache-2.0
#
if(CONFIG_SOC_V2M_MUSCA_B1)
if(CONFIG_SOC_MUSCA_B1)
zephyr_sources(b1/soc.c)
zephyr_include_directories(b1)
elseif(CONFIG_SOC_V2M_MUSCA_S1)
elseif(CONFIG_SOC_MUSCA_S1)
zephyr_include_directories(s1)
endif()

4
soc/arm/musca/Kconfig
View File

@@ -5,13 +5,13 @@ config SOC_SERIES_MUSCA
select ARM
select BUILD_OUTPUT_HEX
config SOC_V2M_MUSCA_B1
config SOC_MUSCA_B1
select CPU_CORTEX_M33
select CPU_HAS_ARM_SAU
select CPU_HAS_ARM_MPU
select CPU_CORTEX_M_HAS_DWT
config SOC_V2M_MUSCA_S1
config SOC_MUSCA_S1
select CPU_CORTEX_M33
select CPU_HAS_ARM_SAU
select CPU_HAS_ARM_MPU

4
soc/arm/musca/Kconfig.defconfig
View File

@@ -2,8 +2,8 @@
# SPDX-License-Identifier: Apache-2.0
config SYS_CLOCK_HW_CYCLES_PER_SEC
default 40000000 if SOC_V2M_MUSCA_B1
default 50000000 if SOC_V2M_MUSCA_S1
default 40000000 if SOC_MUSCA_B1
default 50000000 if SOC_MUSCA_S1
config NUM_IRQS
default 96 if SOC_SERIES_MUSCA

8
soc/arm/musca/Kconfig.soc
View File

@@ -7,13 +7,13 @@ config SOC_SERIES_MUSCA
help
ARM v2m MUSCA MCU Series
config SOC_V2M_MUSCA_B1
config SOC_MUSCA_B1
bool
select SOC_SERIES_MUSCA
help
ARM Cortex-M33 SMM-SSE-200 on V2M-MUSCA-B1
config SOC_V2M_MUSCA_S1
config SOC_MUSCA_S1
bool
select SOC_SERIES_MUSCA
help
@@ -23,5 +23,5 @@ config SOC_SERIES
default "musca" if SOC_SERIES_MUSCA
config SOC
default "musca_b1" if SOC_V2M_MUSCA_B1
default "musca_s1" if SOC_V2M_MUSCA_S1
default "musca_b1" if SOC_MUSCA_B1
default "musca_s1" if SOC_MUSCA_S1

2
subsys/ipc/rpmsg_service/rpmsg_backend.c
View File

@@ -106,7 +106,7 @@ static void ipc_virtio_notify(struct virtqueue *vq)
#elif defined(CONFIG_RPMSG_SERVICE_SINGLE_IPM_SUPPORT)
#if defined(CONFIG_SOC_MPS2_AN521) || \
defined(CONFIG_SOC_V2M_MUSCA_B1)
defined(CONFIG_SOC_MUSCA_B1)
uint32_t current_core = sse_200_platform_get_cpu_id();
status = ipm_send(ipm_handle, 0, current_core ? 0 : 1, 0, 1);