From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Fri, 10 Apr 2020 07:37:21 +0000 (+0200)
Subject: qemu: don't allow to select 32- and 64-bit
X-Git-Tag: v2020.07-rc1~17^2~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a555557ddc289af2f3d75e45fb808bcb2066162d;p=oweals%2Fu-boot.git

qemu: don't allow to select 32- and 64-bit

TARGET_QEMU_ARM_64BIT and TARGET_QEMU_ARM_32BIT should be mutually
exclusive.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig
index a2e4b98b88..588d2d3102 100644
--- a/arch/arm/mach-qemu/Kconfig
+++ b/arch/arm/mach-qemu/Kconfig
@@ -9,16 +9,20 @@ config SYS_BOARD
 config SYS_CONFIG_NAME
 	default "qemu-arm"
 
-endif
+choice
+	prompt "QEMU ARM architecture"
+	default TARGET_QEMU_ARM_64BIT
 
 config TARGET_QEMU_ARM_32BIT
-	bool "Support qemu_arm"
-	depends on ARCH_QEMU
+	bool "ARMv7-A, 32bit"
 	select ARCH_SUPPORT_PSCI
 	select CPU_V7A
 	select SYS_ARCH_TIMER
 
 config TARGET_QEMU_ARM_64BIT
-	bool "Support qemu_arm64"
-	depends on ARCH_QEMU
+	bool "ARMv8, 64bit"
 	select ARM64
+
+endchoice
+
+endif