From 4f93b213f2d3393fbb0b7ca200988f475e6cef83 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 19 Feb 2015 19:54:14 +0100 Subject: cleanup FPU support for ARM targets. --- target/config/Config.in.arm.default | 11 ----------- target/config/Config.in.cpu | 16 ++++++++++++++++ target/config/Config.in.fpu | 5 +++++ target/config/Config.in.fpu.choice | 3 +++ target/config/Config.in.fpu.default | 23 +++++++++++++++++++++++ target/config/Config.in.qemu | 1 + 6 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 target/config/Config.in.fpu create mode 100644 target/config/Config.in.fpu.choice create mode 100644 target/config/Config.in.fpu.default (limited to 'target/config') diff --git a/target/config/Config.in.arm.default b/target/config/Config.in.arm.default index 4e1e17c7e..43df6220c 100644 --- a/target/config/Config.in.arm.default +++ b/target/config/Config.in.arm.default @@ -1,14 +1,3 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -config ADK_fpu_neon - bool - -config ADK_fpu_vfp - bool - -config ADK_TARGET_FPU - string - default "vfp" if ADK_fpu_vfp - default "neon" if ADK_fpu_neon - diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 2df3567f2..823d21d86 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -4,6 +4,22 @@ config ADK_TARGET_CPU_WITH_FPU bool +config ADK_TARGET_CPU_WITH_FPU_VFP + bool + select ADK_fpu_vfp + +config ADK_TARGET_CPU_WITH_FPU_VFP3 + bool + select ADK_fpu_vfp3 + +config ADK_TARGET_CPU_WITH_FPU_VFP4 + bool + select ADK_fpu_vfp4 + +config ADK_TARGET_CPU_WITH_FPU_NEON + bool + select ADK_fpu_neon + config ADK_TARGET_CPU_WITH_VT bool diff --git a/target/config/Config.in.fpu b/target/config/Config.in.fpu new file mode 100644 index 000000000..c42d62c0a --- /dev/null +++ b/target/config/Config.in.fpu @@ -0,0 +1,5 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +source target/config/Config.in.fpu.choice +source target/config/Config.in.fpu.default diff --git a/target/config/Config.in.fpu.choice b/target/config/Config.in.fpu.choice new file mode 100644 index 000000000..43df6220c --- /dev/null +++ b/target/config/Config.in.fpu.choice @@ -0,0 +1,3 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + diff --git a/target/config/Config.in.fpu.default b/target/config/Config.in.fpu.default new file mode 100644 index 000000000..095b2cb5f --- /dev/null +++ b/target/config/Config.in.fpu.default @@ -0,0 +1,23 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +config ADK_fpu_neon + bool + +config ADK_fpu_vfp + bool + +config ADK_fpu_vfp3 + bool + +config ADK_fpu_vfp4 + bool + +config ADK_TARGET_FPU + string + depends on ADK_TARGET_ARCH_ARM + default "vfp" if ADK_fpu_vfp + default "vfp3" if ADK_fpu_vfp3 + default "vfp4" if ADK_fpu_vfp4 + default "neon" if ADK_fpu_neon + diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu index 4d13e14dd..e7b15818c 100644 --- a/target/config/Config.in.qemu +++ b/target/config/Config.in.qemu @@ -36,6 +36,7 @@ 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" -- cgit v1.2.3