aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/armvirt/32
diff options
context:
space:
mode:
authorMathew McBride <matt@traverse.com.au>2022-01-19 02:25:23 +0000
committerPetr Štetiar <ynezz@true.cz>2023-06-02 11:36:05 +0200
commite0f06ddc23b2503a1791ae7e97b02e2647e8a70d (patch)
tree803540679be5eb9e2ca7163ad459ed8df99bc940 /target/linux/armvirt/32
parent16a20512d852f6ecebf8c57cd7fa2572a06a9d0b (diff)
downloadupstream-e0f06ddc23b2503a1791ae7e97b02e2647e8a70d.tar.gz
upstream-e0f06ddc23b2503a1791ae7e97b02e2647e8a70d.tar.bz2
upstream-e0f06ddc23b2503a1791ae7e97b02e2647e8a70d.zip
armvirt: add EFI support
EFI booting is used on newer machines compatible with the Arm SystemReady specifications. This commit restructures armvirt into a more 'generic' target similar to x86. See https://github.com/openwrt/openwrt/pull/4956 for a history of this port. Signed-off-by: Mathew McBride <matt@traverse.com.au>
Diffstat (limited to 'target/linux/armvirt/32')
-rw-r--r--target/linux/armvirt/32/config-6.12
-rw-r--r--target/linux/armvirt/32/target.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/armvirt/32/config-6.1 b/target/linux/armvirt/32/config-6.1
index 931607aade7..664ef2e05b2 100644
--- a/target/linux/armvirt/32/config-6.1
+++ b/target/linux/armvirt/32/config-6.1
@@ -4,6 +4,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_ARCH_MULTIPLATFORM=y
CONFIG_ARCH_MULTI_V6_V7=y
CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MMAP_RND_BITS=8
CONFIG_ARCH_NR_GPIO=0
CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
@@ -13,6 +14,7 @@ CONFIG_ARM=y
CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARM_HAS_SG_CHAIN=y
CONFIG_ARM_HEAVY_MB=y
+# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_LPAE=y
diff --git a/target/linux/armvirt/32/target.mk b/target/linux/armvirt/32/target.mk
index 8d42a14b7cf..df220402411 100644
--- a/target/linux/armvirt/32/target.mk
+++ b/target/linux/armvirt/32/target.mk
@@ -1,6 +1,6 @@
ARCH:=arm
SUBTARGET:=32
-BOARDNAME:=QEMU ARM Virtual Machine (cortex-a15)
+BOARDNAME:=32-bit ARM QEMU Virtual Machine
CPU_TYPE:=cortex-a15
CPU_SUBTYPE:=neon-vfpv4
KERNELNAME:=zImage