This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 4405264008 add citest support for qemu-armv8a and fvp-armv8r
4405264008 is described below
commit 4405264008e7a28c1b8940daee122c8f1dfd0c98
Author: nietingting <[email protected]>
AuthorDate: Mon Aug 21 14:07:51 2023 +0800
add citest support for qemu-armv8a and fvp-armv8r
Signed-off-by: nietingting <[email protected]>
---
.../fvp-armv8r}/configs/citest/defconfig | 31 +++++++++++++------
.../fvp-armv8r/configs/citest_smp}/defconfig | 36 +++++++++++++++-------
.../qemu/qemu-armv8a/configs/citest/defconfig | 1 +
.../configs/{citest => citest_smp}/defconfig | 16 +++++-----
4 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig
similarity index 73%
copy from boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
copy to boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig
index 9644187caa..6298a11c64 100644
--- a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
+++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig
@@ -7,11 +7,12 @@
#
CONFIG_ARCH="arm64"
CONFIG_ARCH_ARM64=y
-CONFIG_ARCH_BOARD="qemu-armv8a"
-CONFIG_ARCH_BOARD_QEMU_ARMV8A=y
-CONFIG_ARCH_CHIP="qemu"
-CONFIG_ARCH_CHIP_QEMU=y
-CONFIG_ARCH_CHIP_QEMU_A53=y
+CONFIG_ARCH_BOARD="fvp-armv8r"
+CONFIG_ARCH_BOARD_FVP_ARMV8R=y
+CONFIG_ARCH_CHIP="fvp-v8r"
+CONFIG_ARCH_CHIP_FVP_ARMV8R=y
+CONFIG_ARCH_CHIP_FVP_R82=y
+CONFIG_ARCH_EARLY_PRINT=y
CONFIG_ARCH_INTERRUPTSTACK=4096
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
@@ -31,8 +32,6 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=8192
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
@@ -45,7 +44,7 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_PTHREAD_STACK_MIN=8192
CONFIG_RAMLOG=y
CONFIG_RAM_SIZE=134217728
-CONFIG_RAM_START=0x40000000
+CONFIG_RAM_START=0x0000000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
@@ -56,13 +55,25 @@ CONFIG_STACK_COLORATION=y
CONFIG_START_MONTH=3
CONFIG_START_YEAR=2022
CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_SYSLOG_PROCESSID=y
+CONFIG_SYSLOG_PROCESS_NAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_SYSTEM=y
+CONFIG_SYSTEM_TIME64=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
-CONFIG_UART1_BASE=0x9000000
-CONFIG_UART1_IRQ=33
+CONFIG_UART0_BASE=0x9c090000
+CONFIG_UART0_IRQ=37
+CONFIG_UART0_PL011=y
+CONFIG_UART1_BASE=0x9c0a0000
+CONFIG_UART1_IRQ=38
CONFIG_UART1_PL011=y
CONFIG_UART1_SERIAL_CONSOLE=y
+CONFIG_UART2_BASE=0x9c0b0000
+CONFIG_UART2_IRQ=39
+CONFIG_UART2_PL011=y
+CONFIG_UART3_BASE=0x9c0c0000
+CONFIG_UART3_IRQ=40
+CONFIG_UART3_PL011=y
CONFIG_UART_PL011=y
CONFIG_USEC_PER_TICK=1000
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig
similarity index 70%
copy from boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
copy to boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig
index 9644187caa..49d0b532af 100644
--- a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
+++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig
@@ -7,11 +7,12 @@
#
CONFIG_ARCH="arm64"
CONFIG_ARCH_ARM64=y
-CONFIG_ARCH_BOARD="qemu-armv8a"
-CONFIG_ARCH_BOARD_QEMU_ARMV8A=y
-CONFIG_ARCH_CHIP="qemu"
-CONFIG_ARCH_CHIP_QEMU=y
-CONFIG_ARCH_CHIP_QEMU_A53=y
+CONFIG_ARCH_BOARD="fvp-armv8r"
+CONFIG_ARCH_BOARD_FVP_ARMV8R=y
+CONFIG_ARCH_CHIP="fvp-v8r"
+CONFIG_ARCH_CHIP_FVP_ARMV8R=y
+CONFIG_ARCH_CHIP_FVP_R82=y
+CONFIG_ARCH_EARLY_PRINT=y
CONFIG_ARCH_INTERRUPTSTACK=4096
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
@@ -31,8 +32,6 @@ CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=8192
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
@@ -45,24 +44,39 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_PTHREAD_STACK_MIN=8192
CONFIG_RAMLOG=y
CONFIG_RAM_SIZE=134217728
-CONFIG_RAM_START=0x40000000
+CONFIG_RAM_START=0x0000000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SPINLOCK=y
+CONFIG_SMP=y
CONFIG_STACK_COLORATION=y
CONFIG_START_MONTH=3
CONFIG_START_YEAR=2022
CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_SYSLOG_BUFFER=y
+CONFIG_SYSLOG_PROCESSID=y
+CONFIG_SYSLOG_PROCESS_NAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_SYSTEM=y
+CONFIG_SYSTEM_TASKSET=y
+CONFIG_SYSTEM_TIME64=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
-CONFIG_UART1_BASE=0x9000000
-CONFIG_UART1_IRQ=33
+CONFIG_TESTING_SMP=y
+CONFIG_UART0_BASE=0x9c090000
+CONFIG_UART0_IRQ=37
+CONFIG_UART0_PL011=y
+CONFIG_UART1_BASE=0x9c0a0000
+CONFIG_UART1_IRQ=38
CONFIG_UART1_PL011=y
CONFIG_UART1_SERIAL_CONSOLE=y
+CONFIG_UART2_BASE=0x9c0b0000
+CONFIG_UART2_IRQ=39
+CONFIG_UART2_PL011=y
+CONFIG_UART3_BASE=0x9c0c0000
+CONFIG_UART3_IRQ=40
+CONFIG_UART3_PL011=y
CONFIG_UART_PL011=y
CONFIG_USEC_PER_TICK=1000
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
b/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
index 9644187caa..b91ed7a4bf 100644
--- a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
+++ b/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
@@ -58,6 +58,7 @@ CONFIG_START_YEAR=2022
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_SYSTEM=y
+CONFIG_SYSTEM_TIME64=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
CONFIG_UART1_BASE=0x9000000
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig
similarity index 86%
copy from boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
copy to boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig
index 9644187caa..bf56e42d18 100644
--- a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig
+++ b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig
@@ -12,7 +12,7 @@ CONFIG_ARCH_BOARD_QEMU_ARMV8A=y
CONFIG_ARCH_CHIP="qemu"
CONFIG_ARCH_CHIP_QEMU=y
CONFIG_ARCH_CHIP_QEMU_A53=y
-CONFIG_ARCH_INTERRUPTSTACK=4096
+CONFIG_ARCH_INTERRUPTSTACK=8192
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_ERROR=y
@@ -25,15 +25,13 @@ CONFIG_DEBUG_SCHED_INFO=y
CONFIG_DEBUG_SCHED_WARN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEBUG_WARN=y
-CONFIG_DEFAULT_TASK_STACKSIZE=8192
+CONFIG_DEFAULT_TASK_STACKSIZE=16384
CONFIG_DEV_ZERO=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
-CONFIG_IDLETHREAD_STACKSIZE=8192
+CONFIG_IDLETHREAD_STACKSIZE=16384
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_NSH_ARCHINIT=y
@@ -42,7 +40,7 @@ CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSETC=y
CONFIG_PREALLOC_TIMERS=4
-CONFIG_PTHREAD_STACK_MIN=8192
+CONFIG_PTHREAD_STACK_MIN=16384
CONFIG_RAMLOG=y
CONFIG_RAM_SIZE=134217728
CONFIG_RAM_START=0x40000000
@@ -51,15 +49,19 @@ CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SPINLOCK=y
+CONFIG_SMP=y
CONFIG_STACK_COLORATION=y
CONFIG_START_MONTH=3
CONFIG_START_YEAR=2022
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_SYSTEM=y
+CONFIG_SYSTEM_TASKSET=y
+CONFIG_SYSTEM_TIME64=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
+CONFIG_TESTING_OSTEST_STACKSIZE=16384
+CONFIG_TESTING_SMP=y
CONFIG_UART1_BASE=0x9000000
CONFIG_UART1_IRQ=33
CONFIG_UART1_PL011=y
