summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2015-05-22 23:27:35 (GMT)
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-05-22 23:27:35 (GMT)
commit08d45a516480167a6ab344d9f63b09d2b8c28dc7 (patch)
tree35ea676ca58d82c222035eb923b3706f70e1c0f7
parent2ac4acec69505a6bc7100a842a082e320163fd02 (diff)
fix qemu arm emulation for vexpress-a9
-rw-r--r--target/arm/kernel/qemu-arm-vexpress-a910
-rw-r--r--target/config/Config.in.qemu8
2 files changed, 8 insertions, 10 deletions
diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9
index 1f92ace..53285d1 100644
--- a/target/arm/kernel/qemu-arm-vexpress-a9
+++ b/target/arm/kernel/qemu-arm-vexpress-a9
@@ -1,13 +1,11 @@
CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
-CONFIG_ARCH_VEXPRESS_CA9X4=y
-CONFIG_ARCH_VEXPRESS_DCSCB=y
-CONFIG_ARCH_VEXPRESS_TC2_PM=y
CONFIG_KUSER_HELPERS=y
-CONFIG_ARM_AMBA=y
CONFIG_ATAGS=y
+CONFIG_SWP_EMULATE=y
+CONFIG_CLKSRC_VERSATILE=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu
index dd00b6c..863353c 100644
--- a/target/config/Config.in.qemu
+++ b/target/config/Config.in.qemu
@@ -32,14 +32,14 @@ choice
prompt "Qemu ARM Emulation"
depends on ADK_TARGET_SYSTEM_QEMU_ARM
-config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
- bool "ARM Ltd. Versatile/PB with ARM926EJ-S"
- select ADK_CPU_ARM926EJ_S
-
config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
bool "ARM Ltd. Versatile Express with Cortex-A9"
select ADK_CPU_CORTEX_A9
+config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
+ bool "ARM Ltd. Versatile/PB with ARM926EJ-S"
+ select ADK_CPU_ARM926EJ_S
+
config ADK_TARGET_QEMU_ARM_MODEL_TERRIER
bool "Xscale PXA270 Terrier PDA with XSCALE"
select ADK_CPU_XSCALE