diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-24 13:04:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-24 13:04:38 -0400 |
| commit | 18b9c98024ec89e00a57707f07ff6ada06089d26 (patch) | |
| tree | 60b4659a673d7a9dff309ee0d0b324c242a53cfc /arch/arm | |
| parent | b897306341024695d17296efc1f9d83d06368209 (diff) | |
| parent | 08140dba0f539842d4836afb56fe43a33d8ba045 (diff) | |
Merge branch '2020-04-24-master-imports'
- Assorted minor bugfixes.
- Resync fixdep with Linux v5.7-rc1
- Numerous changes to reduce SPL in various cases including when we have
read-only env support.
- Allow mkimage to align the header on FIT images to a specific size.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-qemu/Kconfig | 14 |
1 files changed, 9 insertions, 5 deletions
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 |