Browse Source

fix qemu arm emulation for vexpress-a9

Waldemar Brodkorb 10 years ago
parent
commit
08d45a5164
2 changed files with 8 additions and 10 deletions
  1. 4 6
      target/arm/kernel/qemu-arm-vexpress-a9
  2. 4 4
      target/config/Config.in.qemu

+ 4 - 6
target/arm/kernel/qemu-arm-vexpress-a9

@@ -1,13 +1,11 @@
 CONFIG_ARM=y
 CONFIG_ARM=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_VEXPRESS=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_KUSER_HELPERS=y
-CONFIG_ARM_AMBA=y
 CONFIG_ATAGS=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=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

+ 4 - 4
target/config/Config.in.qemu

@@ -32,14 +32,14 @@ choice
 prompt "Qemu ARM Emulation"
 prompt "Qemu ARM Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_ARM
 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
 config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	bool "ARM Ltd. Versatile Express with Cortex-A9"
 	bool "ARM Ltd. Versatile Express with Cortex-A9"
 	select ADK_CPU_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
 config ADK_TARGET_QEMU_ARM_MODEL_TERRIER
 	bool "Xscale PXA270 Terrier PDA with XSCALE"
 	bool "Xscale PXA270 Terrier PDA with XSCALE"
 	select ADK_CPU_XSCALE
 	select ADK_CPU_XSCALE