| Message ID | 20200410073721.56796-1-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | a555557ddc289af2f3d75e45fb808bcb2066162d |
| Headers | show |
| Series | qemu: don't allow to select 32- and 64-bit | expand |
On Fri, Apr 10, 2020 at 09:37:21AM +0200, Heinrich Schuchardt wrote: > TARGET_QEMU_ARM_64BIT and TARGET_QEMU_ARM_32BIT should be mutually > exclusive. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de> Applied to u-boot/master, thanks!
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
TARGET_QEMU_ARM_64BIT and TARGET_QEMU_ARM_32BIT should be mutually exclusive. Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de> --- arch/arm/mach-qemu/Kconfig | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- 2.25.1