From 03b2767f7eaf0c525fa5f179e3805501ec03112d Mon Sep 17 00:00:00 2001 From: Nikolay Agishev Date: Tue, 28 May 2024 16:37:29 +0300 Subject: [PATCH] ARC: nSIM: Fix XIP config Workaround for https://github.com/zephyrproject-rtos/zephyr/issues/72793. Because of pointed issue CONFIG_XIP should be defined explicitly. Signed-off-by: Nikolay Agishev --- boards/snps/nsim/nsim_nsim_em11d_defconfig | 1 + boards/snps/nsim/nsim_nsim_em7d_v22_defconfig | 1 + boards/snps/nsim/nsim_nsim_em_defconfig | 1 + boards/snps/nsim/nsim_nsim_hs5x_defconfig | 1 + boards/snps/nsim/nsim_nsim_hs5x_smp_defconfig | 1 + boards/snps/nsim/nsim_nsim_hs6x_defconfig | 1 + boards/snps/nsim/nsim_nsim_hs6x_smp_defconfig | 1 + boards/snps/nsim/nsim_nsim_hs_defconfig | 1 + boards/snps/nsim/nsim_nsim_hs_hostlink_defconfig | 1 + boards/snps/nsim/nsim_nsim_hs_smp_defconfig | 1 + boards/snps/nsim/nsim_nsim_hs_sram_defconfig | 1 + boards/snps/nsim/nsim_nsim_sem_defconfig | 1 + boards/snps/nsim/nsim_nsim_sem_mpu_stack_guard_defconfig | 1 + 13 files changed, 13 insertions(+) diff --git a/boards/snps/nsim/nsim_nsim_em11d_defconfig b/boards/snps/nsim/nsim_nsim_em11d_defconfig index 1cdf8a0b67e..2146e4d8b06 100644 --- a/boards/snps/nsim/nsim_nsim_em11d_defconfig +++ b/boards/snps/nsim/nsim_nsim_em11d_defconfig @@ -9,3 +9,4 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_em7d_v22_defconfig b/boards/snps/nsim/nsim_nsim_em7d_v22_defconfig index 1cdf8a0b67e..2146e4d8b06 100644 --- a/boards/snps/nsim/nsim_nsim_em7d_v22_defconfig +++ b/boards/snps/nsim/nsim_nsim_em7d_v22_defconfig @@ -9,3 +9,4 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_em_defconfig b/boards/snps/nsim/nsim_nsim_em_defconfig index 1cdf8a0b67e..2146e4d8b06 100644 --- a/boards/snps/nsim/nsim_nsim_em_defconfig +++ b/boards/snps/nsim/nsim_nsim_em_defconfig @@ -9,3 +9,4 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_hs5x_defconfig b/boards/snps/nsim/nsim_nsim_hs5x_defconfig index 5a48971e06d..717569e757c 100644 --- a/boards/snps/nsim/nsim_nsim_hs5x_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs5x_defconfig @@ -8,3 +8,4 @@ CONFIG_ARCV2_TIMER=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_hs5x_smp_defconfig b/boards/snps/nsim/nsim_nsim_hs5x_smp_defconfig index c55df123e9f..0b02b73960a 100644 --- a/boards/snps/nsim/nsim_nsim_hs5x_smp_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs5x_smp_defconfig @@ -11,3 +11,4 @@ CONFIG_SERIAL=y CONFIG_SMP=y CONFIG_MP_MAX_NUM_CPUS=2 CONFIG_TICKET_SPINLOCKS=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_hs6x_defconfig b/boards/snps/nsim/nsim_nsim_hs6x_defconfig index 5a48971e06d..717569e757c 100644 --- a/boards/snps/nsim/nsim_nsim_hs6x_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs6x_defconfig @@ -8,3 +8,4 @@ CONFIG_ARCV2_TIMER=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_hs6x_smp_defconfig b/boards/snps/nsim/nsim_nsim_hs6x_smp_defconfig index c55df123e9f..0b02b73960a 100644 --- a/boards/snps/nsim/nsim_nsim_hs6x_smp_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs6x_smp_defconfig @@ -11,3 +11,4 @@ CONFIG_SERIAL=y CONFIG_SMP=y CONFIG_MP_MAX_NUM_CPUS=2 CONFIG_TICKET_SPINLOCKS=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_hs_defconfig b/boards/snps/nsim/nsim_nsim_hs_defconfig index 123983e3241..d22ebd5ea25 100644 --- a/boards/snps/nsim/nsim_nsim_hs_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs_defconfig @@ -8,3 +8,4 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_ARC_MPU_ENABLE=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_hs_hostlink_defconfig b/boards/snps/nsim/nsim_nsim_hs_hostlink_defconfig index 123983e3241..d22ebd5ea25 100644 --- a/boards/snps/nsim/nsim_nsim_hs_hostlink_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs_hostlink_defconfig @@ -8,3 +8,4 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_ARC_MPU_ENABLE=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_hs_smp_defconfig b/boards/snps/nsim/nsim_nsim_hs_smp_defconfig index 351a2b9660b..60b058efa91 100644 --- a/boards/snps/nsim/nsim_nsim_hs_smp_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs_smp_defconfig @@ -11,3 +11,4 @@ CONFIG_ARC_MPU_ENABLE=n CONFIG_SMP=y CONFIG_MP_MAX_NUM_CPUS=2 CONFIG_TICKET_SPINLOCKS=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_hs_sram_defconfig b/boards/snps/nsim/nsim_nsim_hs_sram_defconfig index 1ee8bc1dad0..0d0380c8e64 100644 --- a/boards/snps/nsim/nsim_nsim_hs_sram_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs_sram_defconfig @@ -9,3 +9,4 @@ CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_ARC_MPU_ENABLE=y CONFIG_HARVARD=n +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_sem_defconfig b/boards/snps/nsim/nsim_nsim_sem_defconfig index deb2c9c0571..fb80da70390 100644 --- a/boards/snps/nsim/nsim_nsim_sem_defconfig +++ b/boards/snps/nsim/nsim_nsim_sem_defconfig @@ -9,3 +9,4 @@ CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_TRUSTED_EXECUTION_SECURE=y +CONFIG_XIP=n diff --git a/boards/snps/nsim/nsim_nsim_sem_mpu_stack_guard_defconfig b/boards/snps/nsim/nsim_nsim_sem_mpu_stack_guard_defconfig index 1162d5f132b..ce7181282ea 100644 --- a/boards/snps/nsim/nsim_nsim_sem_mpu_stack_guard_defconfig +++ b/boards/snps/nsim/nsim_nsim_sem_mpu_stack_guard_defconfig @@ -10,3 +10,4 @@ CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_TRUSTED_EXECUTION_SECURE=y CONFIG_ARC_HAS_STACK_CHECKING=n +CONFIG_XIP=n