arch/arm64: cleanup defconfigs

Use CONFIG_ARCH_CHIP_QEMU instead of CONFIG_ARCH_CHIP_QEMU_A53. This is because these configurations depend on the hardware configuration of qemu (memory map, irq numbers, etc.).

Signed-off-by: Hidenori Matsubayashi <hidenori.matsubayashi@gmail.com>

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

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

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

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

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