From abca9170553c69603625087bfbd4df1ceff6124b Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Fri, 5 Apr 2024 18:49:47 +0200 Subject: [PATCH] boards: board dts and defconfig file adjustments Adjustments of dts and defconfig files to adjust for the MERGE removal. The revert of MERGE requires specific dts and defconfig files for boards which relied on the MERGE feature. Signed-off-by: Torsten Rasmussen --- boards/arm/mps2/mps2_an521_cpu0_ns_defconfig | 12 +++++++++++- ...s25_tgph.dts => intel_adsp_cavs25_tgph.dts} | 0 .../adsp/intel_adsp_cavs25_tgph_defconfig | 1 - boards/native/native_posix/native_posix_64.dts | 7 +++++++ .../native_posix/native_posix_64_defconfig | 4 ++++ boards/native/native_sim/native_sim_64.dts | 7 +++++++ .../native/native_sim/native_sim_64_defconfig | 4 ++++ .../nrf54h20dk_nrf54h20_cpuppr_xip.dts | 7 +++++++ .../lpcxpresso55s69/lpcxpresso55s69_defconfig | 12 ------------ ...t1170.dts => vmu_rt1170_mimxrt1176_cm7.dts} | 0 ...fig => vmu_rt1170_mimxrt1176_cm7_defconfig} | 0 ...rv32m1_vega_openisa_rv32m1_ri5cy_defconfig} | 0 ...m1_vega_openisa_rv32m1_zero_riscy_defconfig | 10 ++++++++++ .../qemu_riscv32_qemu_virt_riscv32_smp.dts | 17 +++++++++++++++++ .../qemu_riscv64_qemu_virt_riscv64_smp.dts | 18 ++++++++++++++++++ .../longan_nano_gd32vf103_lite_defconfig | 15 +++++++++++++++ .../snps/em_starterkit/em_starterkit_defconfig | 14 -------------- .../nsim_nsim_hs_hostlink_defconfig} | 4 ---- .../lvgl/demos/boards/native_posix_64.overlay | 11 +++++++++++ 19 files changed, 111 insertions(+), 32 deletions(-) rename boards/intel/adsp/{intel_adsp_cavs25_cavs25_tgph.dts => intel_adsp_cavs25_tgph.dts} (100%) create mode 100644 boards/native/native_posix/native_posix_64.dts create mode 100644 boards/native/native_posix/native_posix_64_defconfig create mode 100644 boards/native/native_sim/native_sim_64.dts create mode 100644 boards/native/native_sim/native_sim_64_defconfig create mode 100644 boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.dts delete mode 100644 boards/nxp/lpcxpresso55s69/lpcxpresso55s69_defconfig rename boards/nxp/vmu_rt1170/{vmu_rt1170.dts => vmu_rt1170_mimxrt1176_cm7.dts} (100%) rename boards/nxp/vmu_rt1170/{vmu_rt1170_defconfig => vmu_rt1170_mimxrt1176_cm7_defconfig} (100%) rename boards/openisa/rv32m1_vega/{rv32m1_vega_openisa_rv32m1_defconfig => rv32m1_vega_openisa_rv32m1_ri5cy_defconfig} (100%) create mode 100644 boards/openisa/rv32m1_vega/rv32m1_vega_openisa_rv32m1_zero_riscy_defconfig create mode 100644 boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.dts create mode 100644 boards/qemu/riscv64/qemu_riscv64_qemu_virt_riscv64_smp.dts create mode 100644 boards/sipeed/longan_nano/longan_nano_gd32vf103_lite_defconfig delete mode 100644 boards/snps/em_starterkit/em_starterkit_defconfig rename boards/snps/{emsdp/emsdp_defconfig => nsim/nsim_nsim_hs_hostlink_defconfig} (73%) create mode 100644 samples/modules/lvgl/demos/boards/native_posix_64.overlay diff --git a/boards/arm/mps2/mps2_an521_cpu0_ns_defconfig b/boards/arm/mps2/mps2_an521_cpu0_ns_defconfig index 7c02187aaef..bbcafede67a 100644 --- a/boards/arm/mps2/mps2_an521_cpu0_ns_defconfig +++ b/boards/arm/mps2/mps2_an521_cpu0_ns_defconfig @@ -4,8 +4,18 @@ # SPDX-License-Identifier: Apache-2.0 # +CONFIG_RUNTIME_NMI=y +CONFIG_ARM_TRUSTZONE_M=y +CONFIG_ARM_MPU=y CONFIG_QEMU_ICOUNT_SHIFT=6 +# GPIOs +CONFIG_GPIO=y + +# Serial +CONFIG_CONSOLE=y +CONFIG_UART_CONSOLE=y +CONFIG_SERIAL=y + # Build a non-secure firmware image -CONFIG_TRUSTED_EXECUTION_SECURE=n CONFIG_TRUSTED_EXECUTION_NONSECURE=y diff --git a/boards/intel/adsp/intel_adsp_cavs25_cavs25_tgph.dts b/boards/intel/adsp/intel_adsp_cavs25_tgph.dts similarity index 100% rename from boards/intel/adsp/intel_adsp_cavs25_cavs25_tgph.dts rename to boards/intel/adsp/intel_adsp_cavs25_tgph.dts diff --git a/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig b/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig index 041043937bf..7e79840a033 100644 --- a/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig +++ b/boards/intel/adsp/intel_adsp_cavs25_tgph_defconfig @@ -17,7 +17,6 @@ CONFIG_2ND_LEVEL_INTERRUPTS=y CONFIG_BUILD_OUTPUT_BIN=n CONFIG_MP_MAX_NUM_CPUS=2 -CONFIG_CORE_COUNT=2 CONFIG_DCACHE_LINE_SIZE=64 diff --git a/boards/native/native_posix/native_posix_64.dts b/boards/native/native_posix/native_posix_64.dts new file mode 100644 index 00000000000..74a3c30049b --- /dev/null +++ b/boards/native/native_posix/native_posix_64.dts @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "../native_sim/native_sim.dts" diff --git a/boards/native/native_posix/native_posix_64_defconfig b/boards/native/native_posix/native_posix_64_defconfig new file mode 100644 index 00000000000..b0033eda61f --- /dev/null +++ b/boards/native/native_posix/native_posix_64_defconfig @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_CONSOLE=y +CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000 diff --git a/boards/native/native_sim/native_sim_64.dts b/boards/native/native_sim/native_sim_64.dts new file mode 100644 index 00000000000..4ac77d414f9 --- /dev/null +++ b/boards/native/native_sim/native_sim_64.dts @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2023 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "native_sim.dts" diff --git a/boards/native/native_sim/native_sim_64_defconfig b/boards/native/native_sim/native_sim_64_defconfig new file mode 100644 index 00000000000..b0033eda61f --- /dev/null +++ b/boards/native/native_sim/native_sim_64_defconfig @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_CONSOLE=y +CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000 diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.dts new file mode 100644 index 00000000000..020f5bf8e1f --- /dev/null +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.dts @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include "nrf54h20dk_nrf54h20_cpuppr.dts" diff --git a/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_defconfig b/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_defconfig deleted file mode 100644 index 32700cd4833..00000000000 --- a/boards/nxp/lpcxpresso55s69/lpcxpresso55s69_defconfig +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright 2024 NXP -# -# SPDX-License-Identifier: Apache-2.0 -# -# Common Kconfigs for all board targets -# - -CONFIG_GPIO=y -CONFIG_PINCTRL=y - -CONFIG_RUNTIME_NMI=y diff --git a/boards/nxp/vmu_rt1170/vmu_rt1170.dts b/boards/nxp/vmu_rt1170/vmu_rt1170_mimxrt1176_cm7.dts similarity index 100% rename from boards/nxp/vmu_rt1170/vmu_rt1170.dts rename to boards/nxp/vmu_rt1170/vmu_rt1170_mimxrt1176_cm7.dts diff --git a/boards/nxp/vmu_rt1170/vmu_rt1170_defconfig b/boards/nxp/vmu_rt1170/vmu_rt1170_mimxrt1176_cm7_defconfig similarity index 100% rename from boards/nxp/vmu_rt1170/vmu_rt1170_defconfig rename to boards/nxp/vmu_rt1170/vmu_rt1170_mimxrt1176_cm7_defconfig diff --git a/boards/openisa/rv32m1_vega/rv32m1_vega_openisa_rv32m1_defconfig b/boards/openisa/rv32m1_vega/rv32m1_vega_openisa_rv32m1_ri5cy_defconfig similarity index 100% rename from boards/openisa/rv32m1_vega/rv32m1_vega_openisa_rv32m1_defconfig rename to boards/openisa/rv32m1_vega/rv32m1_vega_openisa_rv32m1_ri5cy_defconfig diff --git a/boards/openisa/rv32m1_vega/rv32m1_vega_openisa_rv32m1_zero_riscy_defconfig b/boards/openisa/rv32m1_vega/rv32m1_vega_openisa_rv32m1_zero_riscy_defconfig new file mode 100644 index 00000000000..908f07c0198 --- /dev/null +++ b/boards/openisa/rv32m1_vega/rv32m1_vega_openisa_rv32m1_zero_riscy_defconfig @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2018 Foundries.io Ltd + +CONFIG_GPIO=y +CONFIG_PINCTRL=y +CONFIG_SERIAL=y +CONFIG_CONSOLE=y +CONFIG_UART_CONSOLE=y +CONFIG_UART_INTERRUPT_DRIVEN=y +CONFIG_MULTI_LEVEL_INTERRUPTS=y diff --git a/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.dts b/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.dts new file mode 100644 index 00000000000..6c820813021 --- /dev/null +++ b/boards/qemu/riscv32/qemu_riscv32_qemu_virt_riscv32_smp.dts @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +/dts-v1/; + +#include + +/ { + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + zephyr,sram = &ram0; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/boards/qemu/riscv64/qemu_riscv64_qemu_virt_riscv64_smp.dts b/boards/qemu/riscv64/qemu_riscv64_qemu_virt_riscv64_smp.dts new file mode 100644 index 00000000000..fb96f6d3d38 --- /dev/null +++ b/boards/qemu/riscv64/qemu_riscv64_qemu_virt_riscv64_smp.dts @@ -0,0 +1,18 @@ +/* Copyright (c) 2019 BayLibre SAS */ +/* SPDX-License-Identifier: Apache-2.0 */ + +/dts-v1/; + +#include + +/ { + chosen { + zephyr,console = &uart0; + zephyr,shell-uart = &uart0; + zephyr,sram = &ram0; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/boards/sipeed/longan_nano/longan_nano_gd32vf103_lite_defconfig b/boards/sipeed/longan_nano/longan_nano_gd32vf103_lite_defconfig new file mode 100644 index 00000000000..353e533ef84 --- /dev/null +++ b/boards/sipeed/longan_nano/longan_nano_gd32vf103_lite_defconfig @@ -0,0 +1,15 @@ +# Sipeed longan nano Development Board Configuration +# +# Copyright (c) 2021 Tokita, Hiroshi +# +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_GD32_HXTAL_8MHZ=y + +CONFIG_SERIAL=y +CONFIG_UART_INTERRUPT_DRIVEN=y + +CONFIG_CONSOLE=y +CONFIG_UART_CONSOLE=y + +CONFIG_GPIO=y diff --git a/boards/snps/em_starterkit/em_starterkit_defconfig b/boards/snps/em_starterkit/em_starterkit_defconfig deleted file mode 100644 index 38979ec4912..00000000000 --- a/boards/snps/em_starterkit/em_starterkit_defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright (c) 2017 Synopsys - -CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -CONFIG_BUILD_NO_GAP_FILL=y -CONFIG_BUILD_OUTPUT_BIN=n -CONFIG_ARCV2_INTERRUPT_UNIT=y -CONFIG_ARCV2_TIMER=y -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y -CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_GPIO=y diff --git a/boards/snps/emsdp/emsdp_defconfig b/boards/snps/nsim/nsim_nsim_hs_hostlink_defconfig similarity index 73% rename from boards/snps/emsdp/emsdp_defconfig rename to boards/snps/nsim/nsim_nsim_hs_hostlink_defconfig index d8581e40fab..123983e3241 100644 --- a/boards/snps/emsdp/emsdp_defconfig +++ b/boards/snps/nsim/nsim_nsim_hs_hostlink_defconfig @@ -1,14 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 -CONFIG_XIP=n -CONFIG_BUILD_NO_GAP_FILL=y CONFIG_BUILD_OUTPUT_BIN=n CONFIG_ARCV2_INTERRUPT_UNIT=y CONFIG_ARCV2_TIMER=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_ARC_MPU_ENABLE=y -CONFIG_GPIO=y diff --git a/samples/modules/lvgl/demos/boards/native_posix_64.overlay b/samples/modules/lvgl/demos/boards/native_posix_64.overlay new file mode 100644 index 00000000000..eab17f916bd --- /dev/null +++ b/samples/modules/lvgl/demos/boards/native_posix_64.overlay @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2023, Fabian Blatz + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&sdl_dc { + compatible = "zephyr,sdl-dc"; + height = <272>; + width = <480>; +};