diff options
| -rw-r--r-- | target/config/Config.in.cpu | 11 | ||||
| -rw-r--r-- | target/config/Config.in.fpu.default | 6 | ||||
| -rw-r--r-- | target/config/Config.in.qemu | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 4 |
4 files changed, 9 insertions, 14 deletions
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index dc0cc5478..748f72b96 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -81,13 +81,13 @@ config ADK_CPU_CORTEX_A7 bool select ADK_TARGET_WITH_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_CPU_WITH_FPU_VFP4 + select ADK_TARGET_CPU_WITH_FPU_VFPV4 config ADK_CPU_CORTEX_A9 bool select ADK_TARGET_WITH_NPTL select ADK_TARGET_WITH_MMU - select ADK_TARGET_CPU_WITH_FPU_VFP3 + select ADK_TARGET_CPU_WITH_FPU_VFPV3 config ADK_CPU_CORTEX_A53 bool @@ -228,17 +228,14 @@ config ADK_TARGET_CPU_WITH_FPU config ADK_TARGET_CPU_WITH_FPU_VFP bool select ADK_TARGET_CPU_WITH_FPU - select ADK_fpu_vfp -config ADK_TARGET_CPU_WITH_FPU_VFP3 +config ADK_TARGET_CPU_WITH_FPU_VFPV3 bool select ADK_TARGET_CPU_WITH_FPU - select ADK_fpu_vfp3 -config ADK_TARGET_CPU_WITH_FPU_VFP4 +config ADK_TARGET_CPU_WITH_FPU_VFPV4 bool select ADK_TARGET_CPU_WITH_FPU - select ADK_fpu_vfp4 config ADK_TARGET_CPU_WITH_VT bool diff --git a/target/config/Config.in.fpu.default b/target/config/Config.in.fpu.default index 0fd8f616c..c55b0a602 100644 --- a/target/config/Config.in.fpu.default +++ b/target/config/Config.in.fpu.default @@ -4,7 +4,7 @@ config ADK_TARGET_FPU string depends on ADK_TARGET_ARCH_ARM - default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP - default "vfp3" if ADK_TARGET_CPU_WITH_FPU_VFP3 - default "vfp4" if ADK_TARGET_CPU_WITH_FPU_VFP4 default "neon" if ADK_TARGET_CPU_WITH_NEON + default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP + default "vfpv3" if ADK_TARGET_CPU_WITH_FPU_VFPV3 + default "vfpv4" if ADK_TARGET_CPU_WITH_FPU_VFPV4 diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu index e7b15818c..2e16341ba 100644 --- a/target/config/Config.in.qemu +++ b/target/config/Config.in.qemu @@ -35,8 +35,6 @@ depends on ADK_TARGET_SYSTEM_QEMU_ARM config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 bool "ARM Ltd. Versatile Express with Cortex-A9" select ADK_CPU_CORTEX_A9 - select ADK_TARGET_CPU_WITH_FPU - select ADK_TARGET_CPU_WITH_FPU_NEON config ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3 bool "Stellaris LM3S6965EVB with Cortex-M3" diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 68dfae242..5bd0b647b 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -184,11 +184,11 @@ config ADK_KERNEL_VFP config ADK_KERNEL_VFPv3 bool - default y if ADK_TARGET_CPU_WITH_FPU_VFP3 + default y if ADK_TARGET_CPU_WITH_FPU_VFPV3 config ADK_KERNEL_VFPv4 bool - default y if ADK_TARGET_CPU_WITH_FPU_VFP4 + default y if ADK_TARGET_CPU_WITH_FPU_VFPV4 config ADK_KERNEL_NEON bool |