From 4ba24a81bdc6baa47a9ddf92f1fb469047fd8cae Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Mon, 27 Jan 2014 10:26:29 -0300 Subject: [PATCH 1/6] ARM: dove: Remove UBI support from defconfig As NAND support is not enabled by default, it's hard to see why we'd want to have UBI support. Let's remove it. Signed-off-by: Ezequiel Garcia Signed-off-by: Jason Cooper --- arch/arm/configs/dove_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index 110105476848..7242b11682ad 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig @@ -48,7 +48,6 @@ CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_STAA=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_M25P80=y -CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 From 7fc2def52fbf6cdfebf48c51ce8ec61202a1d4b9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 10 Feb 2014 19:19:59 +0100 Subject: [PATCH 2/6] ARM: mvebu: rename mvebu_defconfig to mvebu_v7_defconfig With the merge of the Kirkwood support into arch/arm/mach-mvebu/, the mvebu platform will no longer only contain ARMv7 compatible processors (Armada 370, Armada XP, and soon Armada 375, Armada 38x and Dove), but also ARMv5 compatible processors (Kirkwood, and hopefully Orion5x in the future). However, a single mvebu_defconfig cannot work, since it is not possible to build a kernel that supports both ARMv5 and ARMv7 platforms in the same binary. As a consequence, this commit renames mvebu_defconfig to mvebu_v7_defconfig, which is the configuration that will build a kernel that supports all ARMv7 mvebu platforms. As Kirkwood support gets merged into mach-mvebu, an additional mvebu_v5_defconfig will be added. Even though we already have a multi_v7_defconfig, the mvebu developers found it more convenient for development to have a defconfig that builds only the mvebu platforms. Signed-off-by: Thomas Petazzoni Acked-by: Andrew Lunn Signed-off-by: Jason Cooper --- arch/arm/configs/{mvebu_defconfig => mvebu_v7_defconfig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename arch/arm/configs/{mvebu_defconfig => mvebu_v7_defconfig} (100%) diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_v7_defconfig similarity index 100% rename from arch/arm/configs/mvebu_defconfig rename to arch/arm/configs/mvebu_v7_defconfig From aa75fe820d269cc9e3eefeaba52f780b3593afda Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 12 Feb 2014 18:21:02 +0100 Subject: [PATCH 3/6] ARM: mvebu: enable audio options in mvebu_defconfig Since at least the Armada 370 SoC has audio support, it makes sense to enable the corresponding kernel configuration options in mvebu_defconfig. Signed-off-by: Thomas Petazzoni Signed-off-by: Jason Cooper --- arch/arm/configs/mvebu_v7_defconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 0f4511d2849f..5c58559d7a0c 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -62,6 +62,11 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_KIRKWOOD_SOC=y +CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y CONFIG_USB_SUPPORT=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y From a96beda759f10bce58c64c2f2953331ed771a734 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Mon, 10 Feb 2014 20:00:36 -0300 Subject: [PATCH 4/6] ARM: mvebu: Enable watchdog support in defconfig Now that we have proper support for Armada 370/XP watchdog let's enable it in mvebu_defconfig and multi_v7_defconfig. Signed-off-by: Ezequiel Garcia Signed-off-by: Jason Cooper --- arch/arm/configs/multi_v7_defconfig | 2 ++ arch/arm/configs/mvebu_v7_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 845bc745706b..51cee833333c 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -187,6 +187,8 @@ CONFIG_POWER_RESET_GPIO=y CONFIG_SENSORS_LM90=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_CROS_EC=y CONFIG_MFD_CROS_EC_SPI=y diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 5c58559d7a0c..0ce72c159ab8 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -67,6 +67,8 @@ CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_KIRKWOOD_SOC=y CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_USB_SUPPORT=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y From ea7621968b522bc17fb3cb681f294cffb607eca1 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Mon, 10 Feb 2014 20:00:37 -0300 Subject: [PATCH 5/6] ARM: dove: Enable watchdog support in the defconfig Now that we have watchdog support, let's add it to the defconfig. Signed-off-by: Ezequiel Garcia Signed-off-by: Jason Cooper --- arch/arm/configs/dove_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index 7242b11682ad..f15955144175 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig @@ -79,6 +79,8 @@ CONFIG_SPI_ORION=y # CONFIG_HWMON is not set CONFIG_THERMAL=y CONFIG_DOVE_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_ORION_WATCHDOG=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y From dd1d03afe8a0825d718f5d74225ad57978599a89 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 17 Feb 2014 15:23:30 +0100 Subject: [PATCH 6/6] ARM: mvebu: update defconfigs for Armada 375 and 38x This commit enables the Armada 375 and Armada 38x support in mvebu_defconfig and multi_v7_defconfig. Signed-off-by: Thomas Petazzoni Signed-off-by: Jason Cooper --- arch/arm/configs/multi_v7_defconfig | 2 ++ arch/arm/configs/mvebu_v7_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 51cee833333c..11eb6e1f38d9 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -9,6 +9,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_375=y +CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_XP=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM_MOBILE=y diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 0ce72c159ab8..62b6a37626c5 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -10,6 +10,8 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_MVEBU=y CONFIG_MACH_ARMADA_370=y +CONFIG_MACH_ARMADA_375=y +CONFIG_MACH_ARMADA_38X=y CONFIG_MACH_ARMADA_XP=y # CONFIG_CACHE_L2X0 is not set # CONFIG_SWP_EMULATE is not set