From b183114d4319332cab8457d9d19700072733e00a Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 30 Jul 2023 21:51:34 +0800 Subject: [PATCH] arch/arm: Change the default value to ARCH_TRUSTZONE_NONSECURE since nuttx normally run inside the non secure execution environment Signed-off-by: Xiang Xiao --- arch/arm/Kconfig | 2 +- boards/arm/imx6/sabre-6quad/configs/citest/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/coredump/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/elf/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/knsh/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/knsh_smp/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/libcxx/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/netnsh_ar8031/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/netnsh_wb/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/nsh/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig | 1 - boards/arm/imx6/sabre-6quad/configs/smp/defconfig | 1 - boards/arm/nrf91/nrf9160-dk/configs/mcuboot_app/defconfig | 1 + boards/arm/nrf91/nrf9160-dk/configs/mcuboot_loader/defconfig | 1 + boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig | 1 + boards/arm/nrf91/nrf9160-dk/configs/modem_ns/defconfig | 1 - boards/arm/nrf91/nrf9160-dk/configs/nsh/defconfig | 1 + boards/arm/nrf91/nrf9160-dk/configs/ostest_tickless/defconfig | 1 + boards/arm/sama5/giant-board/configs/netnsh/defconfig | 1 + boards/arm/sama5/giant-board/configs/nsh/defconfig | 1 + boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig | 1 + boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig | 1 + boards/arm/sama5/jupiter-nano/configs/netnsh/defconfig | 1 + boards/arm/sama5/jupiter-nano/configs/nsh/defconfig | 1 + .../jupiter-nano/configs/sdmmc-nsh-net-resolvconf/defconfig | 1 + boards/arm/sama5/jupiter-nano/configs/sdmmcnsh/defconfig | 1 + boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig | 1 + boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig | 1 + boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/elf/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig | 1 + boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig | 1 + boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig | 1 - boards/arm/stm32u5/b-u585i-iot02a/configs/nsh/defconfig | 1 - boards/arm/stm32u5/nucleo-u5a5zj-q/configs/nsh/defconfig | 1 - 45 files changed, 26 insertions(+), 20 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 025b23fd41..3200b5a016 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1043,7 +1043,7 @@ config ARCH_HAVE_TRUSTZONE choice prompt "TrustZone Configuration" - default ARCH_TRUSTZONE_SECURE + default ARCH_TRUSTZONE_NONSECURE depends on ARCH_HAVE_TRUSTZONE config ARCH_TRUSTZONE_SECURE diff --git a/boards/arm/imx6/sabre-6quad/configs/citest/defconfig b/boards/arm/imx6/sabre-6quad/configs/citest/defconfig index 7e6d851e00..a883e9ff38 100644 --- a/boards/arm/imx6/sabre-6quad/configs/citest/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/citest/defconfig @@ -19,7 +19,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_BOARD_LOOPSPERMSEC=99369 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y diff --git a/boards/arm/imx6/sabre-6quad/configs/coredump/defconfig b/boards/arm/imx6/sabre-6quad/configs/coredump/defconfig index 5b152e3424..8f73d5564a 100644 --- a/boards/arm/imx6/sabre-6quad/configs/coredump/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/coredump/defconfig @@ -17,7 +17,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_BOARD_COREDUMP=y CONFIG_BOARD_LOOPSPERMSEC=99369 CONFIG_BOOT_RUNFROMSDRAM=y diff --git a/boards/arm/imx6/sabre-6quad/configs/elf/defconfig b/boards/arm/imx6/sabre-6quad/configs/elf/defconfig index 8d26a6fb78..eaef250878 100644 --- a/boards/arm/imx6/sabre-6quad/configs/elf/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/elf/defconfig @@ -16,7 +16,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y CONFIG_ARMV7A_L2CC_PL310=y CONFIG_ARMV7A_WAYSIZE_64KB=y diff --git a/boards/arm/imx6/sabre-6quad/configs/knsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/knsh/defconfig index f7228bdce3..b28ba238d1 100644 --- a/boards/arm/imx6/sabre-6quad/configs/knsh/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/knsh/defconfig @@ -29,7 +29,6 @@ CONFIG_ARCH_PGPOOL_VBASE=0x18000000 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARM_SEMIHOSTING_HOSTFS=y CONFIG_BOARD_LOOPSPERMSEC=99369 CONFIG_BOOT_RUNFROMSDRAM=y diff --git a/boards/arm/imx6/sabre-6quad/configs/knsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/knsh_smp/defconfig index ec35aa25ef..af75530bc0 100644 --- a/boards/arm/imx6/sabre-6quad/configs/knsh_smp/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/knsh_smp/defconfig @@ -29,7 +29,6 @@ CONFIG_ARCH_PGPOOL_VBASE=0x18000000 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARM_SEMIHOSTING_HOSTFS=y CONFIG_BOARD_LOOPSPERMSEC=99369 CONFIG_BOOT_RUNFROMSDRAM=y diff --git a/boards/arm/imx6/sabre-6quad/configs/libcxx/defconfig b/boards/arm/imx6/sabre-6quad/configs/libcxx/defconfig index b6c2e25925..e3d0272595 100644 --- a/boards/arm/imx6/sabre-6quad/configs/libcxx/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/libcxx/defconfig @@ -18,7 +18,6 @@ CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_SETJMP_H=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y CONFIG_ARMV7A_L2CC_PL310=y CONFIG_ARMV7A_WAYSIZE_64KB=y diff --git a/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig index f286344ce8..15eac965a9 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netknsh/defconfig @@ -30,7 +30,6 @@ CONFIG_ARCH_PGPOOL_VBASE=0x18000000 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARM_SEMIHOSTING_HOSTFS=y CONFIG_BOARD_LOOPSPERMSEC=99369 CONFIG_BOOT_RUNFROMSDRAM=y diff --git a/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig index 2da2685faf..124532795c 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netknsh_smp/defconfig @@ -30,7 +30,6 @@ CONFIG_ARCH_PGPOOL_VBASE=0x18000000 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARM_SEMIHOSTING_HOSTFS=y CONFIG_BOARD_LOOPSPERMSEC=99369 CONFIG_BOOT_RUNFROMSDRAM=y diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig index 1cd431d8c7..6ca06d76b9 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig @@ -25,7 +25,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARM_SEMIHOSTING_HOSTFS=y CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARD_LOOPSPERMSEC=99369 diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh_ar8031/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh_ar8031/defconfig index f65074fa67..c75f7d72a2 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netnsh_ar8031/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netnsh_ar8031/defconfig @@ -20,7 +20,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y CONFIG_ARMV7A_L2CC_PL310=y CONFIG_ARMV7A_WAYSIZE_64KB=y diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig index 2bfeb4fe7a..2c3d163326 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig @@ -18,7 +18,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_BOARD_LOOPSPERMSEC=99369 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh_wb/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh_wb/defconfig index 44c8a507e7..0e31325f83 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netnsh_wb/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netnsh_wb/defconfig @@ -25,7 +25,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARM_SEMIHOSTING_HOSTFS=y CONFIG_BOARDCTL_APP_SYMTAB=y CONFIG_BOARD_LOOPSPERMSEC=99369 diff --git a/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig index 7da447a22f..9a444f418e 100644 --- a/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig @@ -18,7 +18,6 @@ CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_SETJMP_H=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y CONFIG_ARMV7A_L2CC_PL310=y CONFIG_ARMV7A_WAYSIZE_64KB=y diff --git a/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig b/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig index 3f13813797..6272618287 100644 --- a/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/posix_spawn/defconfig @@ -16,7 +16,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y CONFIG_ARMV7A_L2CC_PL310=y CONFIG_ARMV7A_WAYSIZE_64KB=y diff --git a/boards/arm/imx6/sabre-6quad/configs/smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig index 0c418ef3a1..72e366fcdf 100644 --- a/boards/arm/imx6/sabre-6quad/configs/smp/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig @@ -17,7 +17,6 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y CONFIG_ARMV7A_L2CC_PL310=y CONFIG_ARMV7A_WAYSIZE_64KB=y diff --git a/boards/arm/nrf91/nrf9160-dk/configs/mcuboot_app/defconfig b/boards/arm/nrf91/nrf9160-dk/configs/mcuboot_app/defconfig index b239a1a658..3d728f5722 100644 --- a/boards/arm/nrf91/nrf9160-dk/configs/mcuboot_app/defconfig +++ b/boards/arm/nrf91/nrf9160-dk/configs/mcuboot_app/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_CHIP_NRF9160=y CONFIG_ARCH_CHIP_NRF91=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LOOPSPERMSEC=5500 CONFIG_BUILTIN=y CONFIG_EXAMPLES_HELLO=y diff --git a/boards/arm/nrf91/nrf9160-dk/configs/mcuboot_loader/defconfig b/boards/arm/nrf91/nrf9160-dk/configs/mcuboot_loader/defconfig index 55c79a8bbb..357c8648d1 100644 --- a/boards/arm/nrf91/nrf9160-dk/configs/mcuboot_loader/defconfig +++ b/boards/arm/nrf91/nrf9160-dk/configs/mcuboot_loader/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_NRF9160=y CONFIG_ARCH_CHIP_NRF91=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LOOPSPERMSEC=5500 CONFIG_BOOT_MCUBOOT=y CONFIG_EXPERIMENTAL=y diff --git a/boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig b/boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig index 87806b966e..99cc5634be 100644 --- a/boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig +++ b/boards/arm/nrf91/nrf9160-dk/configs/miniboot_s/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_NRF9160=y CONFIG_ARCH_CHIP_NRF91=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_ARMV8M_CMSE=y CONFIG_BOARDCTL=y CONFIG_BOARD_LOOPSPERMSEC=5500 diff --git a/boards/arm/nrf91/nrf9160-dk/configs/modem_ns/defconfig b/boards/arm/nrf91/nrf9160-dk/configs/modem_ns/defconfig index 0bb8653dd1..17060125c8 100644 --- a/boards/arm/nrf91/nrf9160-dk/configs/modem_ns/defconfig +++ b/boards/arm/nrf91/nrf9160-dk/configs/modem_ns/defconfig @@ -17,7 +17,6 @@ CONFIG_ARCH_CHIP_NRF9160=y CONFIG_ARCH_CHIP_NRF91=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV8M_CMSE=y CONFIG_BOARD_LOOPSPERMSEC=5500 CONFIG_BUILTIN=y diff --git a/boards/arm/nrf91/nrf9160-dk/configs/nsh/defconfig b/boards/arm/nrf91/nrf9160-dk/configs/nsh/defconfig index 0fa26617b4..6aeca02987 100644 --- a/boards/arm/nrf91/nrf9160-dk/configs/nsh/defconfig +++ b/boards/arm/nrf91/nrf9160-dk/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_NRF9160=y CONFIG_ARCH_CHIP_NRF91=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LOOPSPERMSEC=5500 CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_FULLOPT=y diff --git a/boards/arm/nrf91/nrf9160-dk/configs/ostest_tickless/defconfig b/boards/arm/nrf91/nrf9160-dk/configs/ostest_tickless/defconfig index 9e9aea7b69..eea9006a93 100644 --- a/boards/arm/nrf91/nrf9160-dk/configs/ostest_tickless/defconfig +++ b/boards/arm/nrf91/nrf9160-dk/configs/ostest_tickless/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_NRF9160=y CONFIG_ARCH_CHIP_NRF91=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STDARG_H=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LOOPSPERMSEC=5500 CONFIG_BUILTIN=y CONFIG_DEBUG_FEATURES=y diff --git a/boards/arm/sama5/giant-board/configs/netnsh/defconfig b/boards/arm/sama5/giant-board/configs/netnsh/defconfig index c01a4176b5..c24ee8c7bd 100644 --- a/boards/arm/sama5/giant-board/configs/netnsh/defconfig +++ b/boards/arm/sama5/giant-board/configs/netnsh/defconfig @@ -19,6 +19,7 @@ CONFIG_ARCH_CHIP_SAMA5D2=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/giant-board/configs/nsh/defconfig b/boards/arm/sama5/giant-board/configs/nsh/defconfig index 193b917aeb..755b718411 100644 --- a/boards/arm/sama5/giant-board/configs/nsh/defconfig +++ b/boards/arm/sama5/giant-board/configs/nsh/defconfig @@ -19,6 +19,7 @@ CONFIG_ARCH_CHIP_SAMA5D2=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig b/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig index a511d44d9d..e568d7e9f4 100644 --- a/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig +++ b/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_SAMA5D2=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARDCTL_ROMDISK=y diff --git a/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig b/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig index c02cdc41b8..87ad1abaad 100644 --- a/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig +++ b/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH_CHIP_SAMA5D2=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARDCTL_ROMDISK=y diff --git a/boards/arm/sama5/jupiter-nano/configs/netnsh/defconfig b/boards/arm/sama5/jupiter-nano/configs/netnsh/defconfig index 8c34958d5c..c8865901b7 100644 --- a/boards/arm/sama5/jupiter-nano/configs/netnsh/defconfig +++ b/boards/arm/sama5/jupiter-nano/configs/netnsh/defconfig @@ -21,6 +21,7 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/jupiter-nano/configs/nsh/defconfig b/boards/arm/sama5/jupiter-nano/configs/nsh/defconfig index ec6f919096..128d985030 100644 --- a/boards/arm/sama5/jupiter-nano/configs/nsh/defconfig +++ b/boards/arm/sama5/jupiter-nano/configs/nsh/defconfig @@ -21,6 +21,7 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/jupiter-nano/configs/sdmmc-nsh-net-resolvconf/defconfig b/boards/arm/sama5/jupiter-nano/configs/sdmmc-nsh-net-resolvconf/defconfig index f9ad17850f..1a49bd8c7c 100644 --- a/boards/arm/sama5/jupiter-nano/configs/sdmmc-nsh-net-resolvconf/defconfig +++ b/boards/arm/sama5/jupiter-nano/configs/sdmmc-nsh-net-resolvconf/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH_CHIP_SAMA5D2=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/jupiter-nano/configs/sdmmcnsh/defconfig b/boards/arm/sama5/jupiter-nano/configs/sdmmcnsh/defconfig index 0a10ac27d8..99c10810cb 100644 --- a/boards/arm/sama5/jupiter-nano/configs/sdmmcnsh/defconfig +++ b/boards/arm/sama5/jupiter-nano/configs/sdmmcnsh/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH_CHIP_SAMA5D2=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARDCTL_ROMDISK=y diff --git a/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig index 26ee95553d..02b19d37b3 100644 --- a/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig +++ b/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig @@ -19,6 +19,7 @@ CONFIG_ARCH_CHIP_SAMA5D2=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig index 3622ea89c7..e32a99fe82 100644 --- a/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig +++ b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig @@ -21,6 +21,7 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig index 331c0ee9e3..e9d3f6d1ea 100644 --- a/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig +++ b/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig @@ -22,6 +22,7 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_BOARDCTL_ROMDISK=y diff --git a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig index 95e589b718..e2ea1fc2e9 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMISRAM=y CONFIG_BUILTIN=y diff --git a/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig b/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig index 91c1d651b5..34edec2391 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_CHIP_SAMA5D4=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y diff --git a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig index b2303cb927..1aed3143d6 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMISRAM=y CONFIG_BUILTIN=y diff --git a/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig index 57dc17405e..7cc1042a9f 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig @@ -29,6 +29,7 @@ CONFIG_ARCH_PGPOOL_VBASE=0x28000000 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARDCTL=y CONFIG_BOARDCTL_ROMDISK=y CONFIG_BOARD_LATE_INITIALIZE=y diff --git a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig index 07bc2a831b..8b37277f21 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig @@ -25,6 +25,7 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_WM8904=y CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig index f86ed68aa5..86794e63cf 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig @@ -30,6 +30,7 @@ CONFIG_ARCH_PGPOOL_VBASE=0x28000000 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_TEXT_VBASE=0x80000000 +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMSDRAM=y diff --git a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig index 8c02248298..d55c23b442 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO_NUM_BUFFERS=8 CONFIG_AUDIO_WM8904=y CONFIG_BOARD_LOOPSPERMSEC=65775 diff --git a/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig index 2870a00213..8967bd1298 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig @@ -27,6 +27,7 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_AUDIO=y CONFIG_AUDIO_NULL=y CONFIG_AUDIO_NUM_BUFFERS=4 diff --git a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig index 586d209b5f..dc263aa8ff 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_TRUSTZONE_SECURE=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMISRAM=y CONFIG_BUILTIN=y diff --git a/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig b/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig index ae3a461cf3..11308e8192 100644 --- a/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig +++ b/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig @@ -18,7 +18,6 @@ CONFIG_ARCH_CHIP_STM32L5=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV8M_STACKCHECK=y CONFIG_BOARD_LOOPSPERMSEC=8499 CONFIG_BUILTIN=y diff --git a/boards/arm/stm32u5/b-u585i-iot02a/configs/nsh/defconfig b/boards/arm/stm32u5/b-u585i-iot02a/configs/nsh/defconfig index d3abc806e5..2bb4ebe0d8 100644 --- a/boards/arm/stm32u5/b-u585i-iot02a/configs/nsh/defconfig +++ b/boards/arm/stm32u5/b-u585i-iot02a/configs/nsh/defconfig @@ -15,7 +15,6 @@ CONFIG_ARCH_CHIP_STM32U585AI=y CONFIG_ARCH_CHIP_STM32U5=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV8M_USEBASEPRI=y CONFIG_BOARD_LOOPSPERMSEC=4230 CONFIG_BUILTIN=y diff --git a/boards/arm/stm32u5/nucleo-u5a5zj-q/configs/nsh/defconfig b/boards/arm/stm32u5/nucleo-u5a5zj-q/configs/nsh/defconfig index 0d66854c17..e47fbe59e5 100644 --- a/boards/arm/stm32u5/nucleo-u5a5zj-q/configs/nsh/defconfig +++ b/boards/arm/stm32u5/nucleo-u5a5zj-q/configs/nsh/defconfig @@ -16,7 +16,6 @@ CONFIG_ARCH_CHIP_STM32U5=y CONFIG_ARCH_CHIP_STM32U5A5ZJT=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH_TRUSTZONE_NONSECURE=y CONFIG_ARMV8M_USEBASEPRI=y CONFIG_BOARD_LOOPSPERMSEC=7997 CONFIG_BUILTIN=y