From d0139d1206d8383a7b7c34bd694ca2a4d8ca1d50 Mon Sep 17 00:00:00 2001 From: hujun5 Date: Wed, 10 May 2023 08:47:05 +0800 Subject: [PATCH] arch/arm64: change config order Signed-off-by: hujun5 --- .../fvp-v8r/fvp-armv8r/configs/nsh/defconfig | 26 +++++++++---------- .../fvp-armv8r/configs/nsh_smp/defconfig | 26 +++++++++---------- .../qemu/qemu-armv8a/configs/citest/defconfig | 8 +++--- .../qemu/qemu-armv8a/configs/netnsh/defconfig | 8 +++--- .../qemu-armv8a/configs/netnsh_smp/defconfig | 8 +++--- .../qemu/qemu-armv8a/configs/nsh/defconfig | 8 +++--- .../qemu-armv8a/configs/nsh_gicv2/defconfig | 8 +++--- .../qemu-armv8a/configs/nsh_smp/defconfig | 8 +++--- .../configs/nsh_smp_tickless/defconfig | 8 +++--- 9 files changed, 54 insertions(+), 54 deletions(-) diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig index 9a7dd51de8..bf1a985d2f 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig @@ -33,19 +33,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y -CONFIG_UART0_PL011=y -CONFIG_UART0_BASE=0x9c090000 -CONFIG_UART0_IRQ=37 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9c0a0000 -CONFIG_UART1_IRQ=38 -CONFIG_UART2_PL011=y -CONFIG_UART2_BASE=0x9c0b0000 -CONFIG_UART2_IRQ=39 -CONFIG_UART3_PL011=y -CONFIG_UART3_BASE=0x9c0c0000 -CONFIG_UART3_IRQ=40 -CONFIG_UART_PL011=y CONFIG_IDLETHREAD_STACKSIZE=8192 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y @@ -76,5 +63,18 @@ CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=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/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig index 22fd417b8d..ea25788059 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig @@ -33,19 +33,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y CONFIG_FS_ROMFS=y -CONFIG_UART0_PL011=y -CONFIG_UART0_BASE=0x9c090000 -CONFIG_UART0_IRQ=37 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9c0a0000 -CONFIG_UART1_IRQ=38 -CONFIG_UART2_PL011=y -CONFIG_UART2_BASE=0x9c0b0000 -CONFIG_UART2_IRQ=39 -CONFIG_UART3_PL011=y -CONFIG_UART3_BASE=0x9c0c0000 -CONFIG_UART3_IRQ=40 -CONFIG_UART_PL011=y CONFIG_IDLETHREAD_STACKSIZE=8192 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INTELHEX_BINARY=y @@ -79,5 +66,18 @@ CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y 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 b2c18b5552..9644187caa 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig @@ -43,10 +43,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_MIN=8192 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9000000 -CONFIG_UART1_IRQ=33 -CONFIG_UART_PL011=y CONFIG_RAMLOG=y CONFIG_RAM_SIZE=134217728 CONFIG_RAM_START=0x40000000 @@ -64,5 +60,9 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y +CONFIG_UART1_BASE=0x9000000 +CONFIG_UART1_IRQ=33 +CONFIG_UART1_PL011=y CONFIG_UART1_SERIAL_CONSOLE=y +CONFIG_UART_PL011=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig index 48397c7174..d3bb170182 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig @@ -59,10 +59,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_MIN=8192 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9000000 -CONFIG_UART1_IRQ=33 -CONFIG_UART_PL011=y CONFIG_RAM_SIZE=134217728 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -86,4 +82,8 @@ CONFIG_SYSTEM_TELNETD_SESSION_STACKSIZE=8192 CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y +CONFIG_UART1_BASE=0x9000000 +CONFIG_UART1_IRQ=33 +CONFIG_UART1_PL011=y CONFIG_UART1_SERIAL_CONSOLE=y +CONFIG_UART_PL011=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig index ec582e26ac..cba974ea4b 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig @@ -61,10 +61,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_MIN=8192 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9000000 -CONFIG_UART1_IRQ=33 -CONFIG_UART_PL011=y CONFIG_RAM_SIZE=134217728 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -91,4 +87,8 @@ CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y +CONFIG_UART1_BASE=0x9000000 +CONFIG_UART1_IRQ=33 +CONFIG_UART1_PL011=y CONFIG_UART1_SERIAL_CONSOLE=y +CONFIG_UART_PL011=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig index cc0f09e2c6..80ada4a69a 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig @@ -45,10 +45,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_MIN=8192 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9000000 -CONFIG_UART1_IRQ=33 -CONFIG_UART_PL011=y CONFIG_RAMLOG=y CONFIG_RAM_SIZE=134217728 CONFIG_RAM_START=0x40000000 @@ -67,5 +63,9 @@ 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_UART1_PL011=y CONFIG_UART1_SERIAL_CONSOLE=y +CONFIG_UART_PL011=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig index 469550af2c..aa5512b078 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig @@ -44,10 +44,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_MIN=8192 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9000000 -CONFIG_UART1_IRQ=33 -CONFIG_UART_PL011=y CONFIG_RAMLOG=y CONFIG_RAM_SIZE=134217728 CONFIG_RAM_START=0x40000000 @@ -66,5 +62,9 @@ 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_UART1_PL011=y CONFIG_UART1_SERIAL_CONSOLE=y +CONFIG_UART_PL011=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig index a69116a788..307fb19e21 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig @@ -43,10 +43,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_MIN=16384 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9000000 -CONFIG_UART1_IRQ=33 -CONFIG_UART_PL011=y CONFIG_RAMLOG=y CONFIG_RAM_SIZE=134217728 CONFIG_RAM_START=0x40000000 @@ -68,5 +64,9 @@ 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 CONFIG_UART1_SERIAL_CONSOLE=y +CONFIG_UART_PL011=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig index a143f19244..296d298389 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig @@ -43,10 +43,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_MIN=16384 -CONFIG_UART1_PL011=y -CONFIG_UART1_BASE=0x9000000 -CONFIG_UART1_IRQ=33 -CONFIG_UART_PL011=y CONFIG_RAMLOG=y CONFIG_RAM_SIZE=134217728 CONFIG_RAM_START=0x40000000 @@ -69,5 +65,9 @@ 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 CONFIG_UART1_SERIAL_CONSOLE=y +CONFIG_UART_PL011=y CONFIG_USEC_PER_TICK=1000