From 7f2c4c4274bdc54ae81af65b048388d6e1f2d0c7 Mon Sep 17 00:00:00 2001 From: "David S. Alessio" Date: Wed, 22 Mar 2017 12:04:32 -0600 Subject: [PATCH] XMC4xxx: Add FPU support --- arch/arm/include/xmc4/chip.h | 2 +- arch/arm/src/xmc4/Kconfig | 5 ++++- configs/xmc4500-relax/nsh/defconfig | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/xmc4/chip.h b/arch/arm/include/xmc4/chip.h index 6507917fe6..8ee065ffc3 100644 --- a/arch/arm/include/xmc4/chip.h +++ b/arch/arm/include/xmc4/chip.h @@ -56,7 +56,7 @@ # define XMC4_NUSIC 3 /* Three USIC modules: USCI0-2 */ # define XMC4_SCU_GATING 1 /* Has clock gating registers */ # define XMC4_NECAT 0 /* No EtherCAT support */ -#elif defined(CONFIG_ARCH_CHIP_XMC4700) +#elif defined(CONFIG_ARCH_CHIP_XMC4800) # define XMC4_NUSIC 3 /* Three USIC modules: USCI0-2 */ # define XMC4_SCU_GATING 1 /* Has clock gating registers */ # define XMC4_NECAT 1 /* One EtherCAT module */ diff --git a/arch/arm/src/xmc4/Kconfig b/arch/arm/src/xmc4/Kconfig index f50652cd96..5a83e363b9 100644 --- a/arch/arm/src/xmc4/Kconfig +++ b/arch/arm/src/xmc4/Kconfig @@ -12,12 +12,15 @@ choice config ARCH_CHIP_XMC4500 bool "XMC4500" + select ARCH_HAVE_FPU config ARCH_CHIP_XMC4700 bool "XMC4700" + select ARCH_HAVE_FPU config ARCH_CHIP_XMC4800 - bool "XMC4700" + bool "XMC4800" + select ARCH_HAVE_FPU endchoice diff --git a/configs/xmc4500-relax/nsh/defconfig b/configs/xmc4500-relax/nsh/defconfig index d554365209..14643afe8f 100644 --- a/configs/xmc4500-relax/nsh/defconfig +++ b/configs/xmc4500-relax/nsh/defconfig @@ -134,7 +134,7 @@ CONFIG_ARM_TOOLCHAIN_GNU=y CONFIG_ARCH_HAVE_CMNVECTOR=y CONFIG_ARMV7M_CMNVECTOR=y CONFIG_ARMV7M_LAZYFPU=y -# CONFIG_ARCH_HAVE_FPU is not set +CONFIG_ARCH_HAVE_FPU=y # CONFIG_ARCH_HAVE_DPFPU is not set # CONFIG_ARCH_HAVE_TRUSTZONE is not set CONFIG_ARM_HAVE_MPU_UNIFIED=y