Skip to content

Commit 006ea0f

Browse files
nordicjmcarlescufi
nordicjm
authored and
carlescufi
committed
boards: Split merged board file configuration up
Splits configuration up that was merged as part of hwmv2 due to the merged configuration feature being reverted Signed-off-by: Jamie McCrae <[email protected]>
1 parent 79fe21c commit 006ea0f

File tree

53 files changed

+548
-19
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+548
-19
lines changed

‎boards/actinius/icarus/actinius_icarus_nrf9160_ns_defconfig

+19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
# Enable MPU
4+
CONFIG_ARM_MPU=y
5+
6+
# Enable hardware stack protection
7+
CONFIG_HW_STACK_PROTECTION=y
8+
9+
# Enable TrustZone-M
10+
CONFIG_ARM_TRUSTZONE_M=y
11+
12+
# Enable GPIO
13+
CONFIG_GPIO=y
14+
15+
# Enable UART driver
16+
CONFIG_SERIAL=y
17+
18+
# Enable console
19+
CONFIG_CONSOLE=y
20+
CONFIG_UART_CONSOLE=y
21+
322
# This board implies building Non-Secure firmware
423
CONFIG_TRUSTED_EXECUTION_NONSECURE=y

‎boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160_ns_defconfig

+19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
# Enable MPU
4+
CONFIG_ARM_MPU=y
5+
6+
# Enable hardware stack protection
7+
CONFIG_HW_STACK_PROTECTION=y
8+
9+
# Enable TrustZone-M
10+
CONFIG_ARM_TRUSTZONE_M=y
11+
12+
# Enable GPIO
13+
CONFIG_GPIO=y
14+
15+
# Enable UART driver
16+
CONFIG_SERIAL=y
17+
18+
# Enable console
19+
CONFIG_CONSOLE=y
20+
CONFIG_UART_CONSOLE=y
21+
322
# This board implies building Non-Secure firmware
423
CONFIG_TRUSTED_EXECUTION_NONSECURE=y

‎boards/actinius/icarus_som/actinius_icarus_som_nrf9160_ns_defconfig

+19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
# Enable MPU
4+
CONFIG_ARM_MPU=y
5+
6+
# Enable hardware stack protection
7+
CONFIG_HW_STACK_PROTECTION=y
8+
9+
# Enable TrustZone-M
10+
CONFIG_ARM_TRUSTZONE_M=y
11+
12+
# Enable GPIO
13+
CONFIG_GPIO=y
14+
15+
# Enable UART driver
16+
CONFIG_SERIAL=y
17+
18+
# Enable console
19+
CONFIG_CONSOLE=y
20+
CONFIG_UART_CONSOLE=y
21+
322
# This board implies building Non-Secure firmware
423
CONFIG_TRUSTED_EXECUTION_NONSECURE=y

‎boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns_defconfig

+19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
# Enable MPU
4+
CONFIG_ARM_MPU=y
5+
6+
# Enable hardware stack protection
7+
CONFIG_HW_STACK_PROTECTION=y
8+
9+
# Enable TrustZone-M
10+
CONFIG_ARM_TRUSTZONE_M=y
11+
12+
# Enable GPIO
13+
CONFIG_GPIO=y
14+
15+
# Enable UART driver
16+
CONFIG_SERIAL=y
17+
18+
# Enable console
19+
CONFIG_CONSOLE=y
20+
CONFIG_UART_CONSOLE=y
21+
322
# This board implies building Non-Secure firmware
423
CONFIG_TRUSTED_EXECUTION_NONSECURE=y

‎boards/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch32_smp_defconfig

+22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
11
# Copyright (c) 2023 Arm Limited (or its affiliates). All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
CONFIG_ARM_MPU=y
5+
6+
CONFIG_ISR_STACK_SIZE=1024
7+
CONFIG_THREAD_STACK_INFO=y
8+
9+
# Enable Timer and Sys clock
10+
CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
11+
CONFIG_ARM_ARCH_TIMER=y
12+
13+
# Enable UART driver
14+
CONFIG_SERIAL=y
15+
16+
# Enable serial port
17+
CONFIG_UART_INTERRUPT_DRIVEN=y
18+
19+
# Enable console
20+
CONFIG_CONSOLE=y
21+
CONFIG_UART_CONSOLE=y
22+
23+
CONFIG_CACHE_MANAGEMENT=y
24+
CONFIG_DCACHE=n
25+
426
CONFIG_USE_SWITCH=y
527
CONFIG_SMP=y
628
CONFIG_MP_MAX_NUM_CPUS=4

‎boards/arm/fvp_baser_aemv8r/fvp_baser_aemv8r_fvp_aemv8r_aarch64_smp_defconfig

+19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
# Copyright (c) 2021 Arm Limited (or its affiliates). All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
# Cache management
5+
CONFIG_CACHE_MANAGEMENT=y
6+
7+
CONFIG_THREAD_STACK_INFO=y
8+
9+
# Enable Timer and Sys clock
10+
CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
11+
CONFIG_ARM_ARCH_TIMER=y
12+
13+
# Enable UART driver
14+
CONFIG_SERIAL=y
15+
16+
# Enable serial port
17+
CONFIG_UART_INTERRUPT_DRIVEN=y
18+
19+
# Enable console
20+
CONFIG_CONSOLE=y
21+
CONFIG_UART_CONSOLE=y
22+
423
# Enable simulated CPU power management
524
CONFIG_SOC_FVP_AEMV8R_SIMULATE_CPU_PM=y
625
CONFIG_PM_CPU_OPS=y

‎boards/arm/v2m_musca_b1/v2m_musca_b1_musca_b1_ns_defconfig

+9
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,13 @@
44
# SPDX-License-Identifier: Apache-2.0
55
#
66

7+
CONFIG_RUNTIME_NMI=y
8+
CONFIG_ARM_TRUSTZONE_M=y
9+
CONFIG_ARM_MPU=y
10+
11+
# Serial
12+
CONFIG_CONSOLE=y
13+
CONFIG_UART_CONSOLE=y
14+
CONFIG_SERIAL=y
15+
716
CONFIG_TRUSTED_EXECUTION_NONSECURE=y

‎boards/arm/v2m_musca_s1/v2m_musca_s1_musca_s1_ns_defconfig

+9
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,13 @@
44
# SPDX-License-Identifier: Apache-2.0
55
#
66

7+
CONFIG_RUNTIME_NMI=y
8+
CONFIG_ARM_TRUSTZONE_M=y
9+
CONFIG_ARM_MPU=y
10+
11+
# Serial
12+
CONFIG_CONSOLE=y
13+
CONFIG_UART_CONSOLE=y
14+
CONFIG_SERIAL=y
15+
716
CONFIG_TRUSTED_EXECUTION_NONSECURE=y

‎boards/firefly/roc_rk3568_pc/roc_rk3568_pc_rk3568_smp_defconfig

+21-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,32 @@
22
# Copyright 2022 openEuler SIG-Zephyr
33
# SPDX-License-Identifier: Apache-2.0
44

5+
# Platform Configuration
6+
CONFIG_ARM_ARCH_TIMER=y
7+
8+
# Serial Drivers
9+
CONFIG_SERIAL=y
10+
CONFIG_UART_NS16550=y
11+
CONFIG_UART_INTERRUPT_DRIVEN=y
12+
13+
# Enable console
14+
CONFIG_CONSOLE=y
15+
CONFIG_UART_CONSOLE=y
16+
17+
# ARMv8 NS world with cache management
18+
CONFIG_ARMV8_A_NS=y
19+
CONFIG_CACHE_MANAGEMENT=y
20+
CONFIG_DCACHE=y
21+
22+
# Clock support
23+
CONFIG_CLOCK_CONTROL=y
24+
CONFIG_TICKLESS_KERNEL=y
25+
526
# SMP support
627
CONFIG_SMP=y
728
CONFIG_MP_MAX_NUM_CPUS=4
829
CONFIG_MAX_THREAD_BYTES=4
930

10-
# ARMv8 NS world with cache management
11-
CONFIG_DCACHE=y
12-
1331
# PSCI support
1432
CONFIG_PM_CPU_OPS=y
1533
CONFIG_PM_CPU_OPS_PSCI=y

‎boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig

+17-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,23 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
CONFIG_DAI_SSP_HAS_POWER_CONTROL=y
5+
CONFIG_MAIN_STACK_SIZE=2048
6+
7+
CONFIG_GEN_ISR_TABLES=y
8+
CONFIG_GEN_IRQ_VECTOR_TABLE=n
9+
10+
CONFIG_XTENSA_RESET_VECTOR=y
11+
12+
CONFIG_XTENSA_USE_CORE_CRT1=y
13+
14+
CONFIG_MULTI_LEVEL_INTERRUPTS=y
15+
CONFIG_2ND_LEVEL_INTERRUPTS=y
16+
17+
CONFIG_BUILD_OUTPUT_BIN=n
618

719
CONFIG_MP_MAX_NUM_CPUS=2
820
CONFIG_CORE_COUNT=2
21+
22+
CONFIG_DCACHE_LINE_SIZE=64
23+
24+
CONFIG_DAI_SSP_HAS_POWER_CONTROL=y

‎boards/lairdconnect/bl5340_dvk/bl5340_dvk_nrf5340_defconfig

-1
This file was deleted.

‎boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_defconfig

-1
This file was deleted.

‎boards/nordic/nrf54h20dk/nrf54h20dk_defconfig

-9
This file was deleted.

‎boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_defconfig

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4+
# Enable UART driver
5+
CONFIG_SERIAL=y
6+
7+
# Enable console
8+
CONFIG_CONSOLE=y
9+
CONFIG_UART_CONSOLE=y
10+
411
CONFIG_USE_DT_CODE_PARTITION=y
512

613
# Enable MPU

‎boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_defconfig

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4+
# Enable UART driver
5+
CONFIG_SERIAL=y
6+
7+
# Enable console
8+
CONFIG_CONSOLE=y
9+
CONFIG_UART_CONSOLE=y
10+
411
CONFIG_USE_DT_CODE_PARTITION=y
512

613
# Execute from RAM

‎boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_defconfig

+9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4+
# Enable UART driver
5+
CONFIG_SERIAL=y
6+
7+
# Enable console
8+
CONFIG_CONSOLE=y
9+
CONFIG_UART_CONSOLE=y
10+
11+
CONFIG_USE_DT_CODE_PARTITION=y
12+
413
CONFIG_XIP=y

‎boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_defconfig

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4+
# Enable UART driver
5+
CONFIG_SERIAL=y
6+
7+
# Enable console
8+
CONFIG_CONSOLE=y
9+
CONFIG_UART_CONSOLE=y
10+
411
CONFIG_USE_DT_CODE_PARTITION=y
512

613
# Enable MPU

‎boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4+
# Enable UART driver
5+
CONFIG_SERIAL=y
6+
7+
# Enable console
8+
CONFIG_CONSOLE=y
9+
CONFIG_UART_CONSOLE=y
10+
411
# Enable MPU
512
CONFIG_ARM_MPU=y
613

‎boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_defconfig

-1
This file was deleted.

‎boards/nordic/thingy53/thingy53_nrf5340_defconfig

-1
This file was deleted.

‎boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0_defconfig

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
# SPDX-License-Identifier: Apache-2.0
55
#
66

7+
CONFIG_GPIO=y
8+
CONFIG_PINCTRL=y
9+
10+
CONFIG_RUNTIME_NMI=y
11+
712
CONFIG_CONSOLE=y
813
CONFIG_UART_CONSOLE=y
914
CONFIG_SERIAL=y

‎boards/nxp/lpcxpresso55s69/lpcxpresso55s69_lpc55s69_cpu0_ns_defconfig

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
# SPDX-License-Identifier: Apache-2.0
55
#
66

7+
CONFIG_GPIO=y
8+
CONFIG_PINCTRL=y
9+
10+
CONFIG_RUNTIME_NMI=y
11+
712
CONFIG_CONSOLE=y
813
CONFIG_UART_CONSOLE=y
914
CONFIG_SERIAL=y

‎boards/nxp/ls1046ardb/ls1046ardb_ls1046a_smp_4cores_defconfig

+18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
# Platform Configuration
4+
CONFIG_ARM64_VA_BITS_40=y
5+
CONFIG_ARM64_PA_BITS_40=y
6+
# 25 MHz system clock
7+
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
8+
9+
# Zephyr Kernel Configuration
10+
CONFIG_XIP=n
11+
CONFIG_AARCH64_IMAGE_HEADER=y
12+
13+
# Serial Drivers
14+
CONFIG_SERIAL=y
15+
CONFIG_UART_INTERRUPT_DRIVEN=y
16+
17+
# Enable Console
18+
CONFIG_CONSOLE=y
19+
CONFIG_UART_CONSOLE=y
20+
321
# SMP support
422
CONFIG_MP_MAX_NUM_CPUS=4

‎boards/nxp/ls1046ardb/ls1046ardb_ls1046a_smp_defconfig

+18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3+
# Platform Configuration
4+
CONFIG_ARM64_VA_BITS_40=y
5+
CONFIG_ARM64_PA_BITS_40=y
6+
# 25 MHz system clock
7+
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
8+
9+
# Zephyr Kernel Configuration
10+
CONFIG_XIP=n
11+
CONFIG_AARCH64_IMAGE_HEADER=y
12+
13+
# Serial Drivers
14+
CONFIG_SERIAL=y
15+
CONFIG_UART_INTERRUPT_DRIVEN=y
16+
17+
# Enable Console
18+
CONFIG_CONSOLE=y
19+
CONFIG_UART_CONSOLE=y
20+
321
# Zephyr Kernel Configuration
422
CONFIG_MAX_THREAD_BYTES=5
523
CONFIG_MAX_XLAT_TABLES=10

0 commit comments

Comments
 (0)