From c7f094d5e829892eb87684d5ac885e865ac0d3c2 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Mon, 24 Feb 2014 21:56:19 +0100 Subject: [PATCH] ARM: mvebu: don't select CONFIG_NEON CONFIG_NEON is meant to be user-selectable. Turning it on unconditionally means we can't build a smaller kernel when we don't need it, and causes build errors if CONFIG_VFP is not also enabled. To still have neon enabled however, we need to turn it on now in multi_v7_defconfig and mvebu_v7_defconfig. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Gregory Clement <gregory.clement@free-electrons.com> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> --- arch/arm/configs/multi_v7_defconfig | 1 + arch/arm/configs/mvebu_defconfig | 1 + arch/arm/mach-mvebu/Kconfig | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 1b4821bc5c7a..4863cdc3fb95 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -56,6 +56,7 @@ CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_ARCH_VIRT=y CONFIG_ARCH_WM8850=y CONFIG_ARCH_ZYNQ=y +CONFIG_NEON=y CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_PCI=y CONFIG_PCI_MSI=y diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig index 0f4511d2849f..2ffba3d7b5a5 100644 --- a/arch/arm/configs/mvebu_defconfig +++ b/arch/arm/configs/mvebu_defconfig @@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y +CONFIG_NEON=y # CONFIG_CACHE_L2X0 is not set # CONFIG_SWP_EMULATE is not set CONFIG_PCI=y diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 485513cb98c4..b24a082b355b 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -39,7 +39,6 @@ config MACH_ARMADA_375 select ARMADA_375_CLK select CPU_V7 select MACH_MVEBU_V7 - select NEON select PINCTRL_ARMADA_375 help Say 'Y' here if you want your kernel to support boards based @@ -53,7 +52,6 @@ config MACH_ARMADA_38X select ARMADA_38X_CLK select CPU_V7 select MACH_MVEBU_V7 - select NEON select PINCTRL_ARMADA_38X help Say 'Y' here if you want your kernel to support boards based -- 2.20.1