From d0030f2a56a345cd2bac55514991fc3082f687cb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 26 Oct 2017 11:19:25 +0100 Subject: [PATCH] arm64: minor cleanups for mvebu --- baseconfig/arm/{armv7 => }/CONFIG_MTD_NAND_PXA3xx | 0 baseconfig/arm/armv7/CONFIG_RTC_DRV_ARMADA38X | 1 - kernel-aarch64-debug.config | 1 + kernel-aarch64.config | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) rename baseconfig/arm/{armv7 => }/CONFIG_MTD_NAND_PXA3xx (100%) delete mode 100644 baseconfig/arm/armv7/CONFIG_RTC_DRV_ARMADA38X diff --git a/baseconfig/arm/armv7/CONFIG_MTD_NAND_PXA3xx b/baseconfig/arm/CONFIG_MTD_NAND_PXA3xx similarity index 100% rename from baseconfig/arm/armv7/CONFIG_MTD_NAND_PXA3xx rename to baseconfig/arm/CONFIG_MTD_NAND_PXA3xx diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_ARMADA38X b/baseconfig/arm/armv7/CONFIG_RTC_DRV_ARMADA38X deleted file mode 100644 index 7dcdafcbb..000000000 --- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_ARMADA38X +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RTC_DRV_ARMADA38X=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 35a9ab2fb..0a06ce464 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3265,6 +3265,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_NAND is not set # CONFIG_MTD_NAND_OMAP2 is not set # CONFIG_MTD_NAND_OXNAS is not set +CONFIG_MTD_NAND_PXA3xx=m CONFIG_MTD_OF_PARTS=m # CONFIG_MTD_ONENAND is not set # CONFIG_MTD_OOPS is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 200f6838a..f5124a607 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3244,6 +3244,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_NAND is not set # CONFIG_MTD_NAND_OMAP2 is not set # CONFIG_MTD_NAND_OXNAS is not set +CONFIG_MTD_NAND_PXA3xx=m CONFIG_MTD_OF_PARTS=m # CONFIG_MTD_ONENAND is not set # CONFIG_MTD_OOPS is not set