diff --git a/arch/arm64/include/qemu/chip.h b/arch/arm64/include/qemu/chip.h index e504249c3c9..745876852bf 100644 --- a/arch/arm64/include/qemu/chip.h +++ b/arch/arm64/include/qemu/chip.h @@ -33,7 +33,7 @@ #define MB(x) (KB(x) << 10) #define GB(x) (MB(UINT64_C(x)) << 10) -#if defined(CONFIG_ARCH_CHIP_QEMU_A53) +#if defined(CONFIG_ARCH_CHIP_QEMU) #define CONFIG_GICD_BASE 0x8000000 #define CONFIG_GICR_BASE 0x80a0000 diff --git a/arch/arm64/src/qemu/qemu_serial.h b/arch/arm64/src/qemu/qemu_serial.h index d5aec1209c4..9b5ea88f954 100644 --- a/arch/arm64/src/qemu/qemu_serial.h +++ b/arch/arm64/src/qemu/qemu_serial.h @@ -48,7 +48,7 @@ * Public Data ****************************************************************************/ -#ifdef CONFIG_ARCH_CHIP_QEMU_A53 +#ifdef CONFIG_ARCH_CHIP_QEMU #define CONFIG_QEMU_UART_BASE 0x9000000 #define CONFIG_QEMU_UART_IRQ (GIC_SPI_INT_BASE + 1) #endif diff --git a/boards/Kconfig b/boards/Kconfig index ae6fedfe507..35212731fe3 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -1709,7 +1709,7 @@ config ARCH_BOARD_SABRE_6QUAD config ARCH_BOARD_QEMU_A53 bool "Qemu A53 board" - depends on ARCH_CHIP_QEMU_A53 + depends on ARCH_CHIP_QEMU select ARCH_HAVE_IRQBUTTONS ---help--- This options selects support for NuttX on the QEMU A53 diff --git a/boards/arm64/qemu/qemu-a53/configs/nsh/defconfig b/boards/arm64/qemu/qemu-a53/configs/nsh/defconfig index 5473bde0dff..7bd65af2f1c 100644 --- a/boards/arm64/qemu/qemu-a53/configs/nsh/defconfig +++ b/boards/arm64/qemu/qemu-a53/configs/nsh/defconfig @@ -11,7 +11,6 @@ CONFIG_ARCH_BOARD="qemu-a53" CONFIG_ARCH_BOARD_QEMU_A53=y CONFIG_ARCH_CHIP="qemu" CONFIG_ARCH_CHIP_QEMU=y -CONFIG_ARCH_CHIP_QEMU_A53=y CONFIG_ARCH_INTERRUPTSTACK=4096 CONFIG_BUILTIN=y CONFIG_DEBUG_ASSERTIONS=y diff --git a/boards/arm64/qemu/qemu-a53/configs/nsh_smp/defconfig b/boards/arm64/qemu/qemu-a53/configs/nsh_smp/defconfig index b206e7ac4b5..248feee1eee 100644 --- a/boards/arm64/qemu/qemu-a53/configs/nsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-a53/configs/nsh_smp/defconfig @@ -12,7 +12,6 @@ CONFIG_ARCH_BOARD="qemu-a53" CONFIG_ARCH_BOARD_QEMU_A53=y CONFIG_ARCH_CHIP="qemu" CONFIG_ARCH_CHIP_QEMU=y -CONFIG_ARCH_CHIP_QEMU_A53=y CONFIG_ARCH_INTERRUPTSTACK=8192 CONFIG_BUILTIN=y CONFIG_DEBUG_ASSERTIONS=y