From e39d2873e6c41aa86f0d31b91f28154ca6a2de1e Mon Sep 17 00:00:00 2001 From: Jaiprakash Singh Date: Tue, 4 Nov 2014 10:45:25 +0530 Subject: Enable CONFIG_MEMORY for powerpc CONFIG_MEMORY is required for IFC Signed-off-by: Jaiprakash Singh Change-Id: I6605a908a4ee2bd0e8ef5b4f81456ee697138c63 Reviewed-on: http://git.am.freescale.net:8181/22565 Tested-by: Review Code-CDREVIEW Reviewed-by: Matthew Weigel diff --git a/arch/powerpc/configs/85xx/bsc913x_defconfig b/arch/powerpc/configs/85xx/bsc913x_defconfig index be14cc0..d1aec67 100644 --- a/arch/powerpc/configs/85xx/bsc913x_defconfig +++ b/arch/powerpc/configs/85xx/bsc913x_defconfig @@ -152,6 +152,7 @@ CONFIG_FSL_DMA=y # CONFIG_NET_DMA is not set CONFIG_ASYNC_TX_DMA=y CONFIG_UIO=y +CONFIG_MEMORY=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set diff --git a/arch/powerpc/configs/85xx/bsc913x_smp_defconfig b/arch/powerpc/configs/85xx/bsc913x_smp_defconfig index a108997..e3032e3 100644 --- a/arch/powerpc/configs/85xx/bsc913x_smp_defconfig +++ b/arch/powerpc/configs/85xx/bsc913x_smp_defconfig @@ -154,6 +154,7 @@ CONFIG_FSL_DMA=y # CONFIG_NET_DMA is not set CONFIG_ASYNC_TX_DMA=y CONFIG_UIO=y +CONFIG_MEMORY=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set diff --git a/arch/powerpc/configs/85xx/e6500rev2_defconfig b/arch/powerpc/configs/85xx/e6500rev2_defconfig index d974089..febc373 100644 --- a/arch/powerpc/configs/85xx/e6500rev2_defconfig +++ b/arch/powerpc/configs/85xx/e6500rev2_defconfig @@ -156,6 +156,7 @@ CONFIG_FSL_PME2=y CONFIG_FSL_PAMU=y CONFIG_VIRT_DRIVERS=y CONFIG_FSL_HV_MANAGER=y +CONFIG_MEMORY=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set diff --git a/arch/powerpc/configs/85xx/p1023_defconfig b/arch/powerpc/configs/85xx/p1023_defconfig index 7335639..1a88f2f 100644 --- a/arch/powerpc/configs/85xx/p1023_defconfig +++ b/arch/powerpc/configs/85xx/p1023_defconfig @@ -149,6 +149,7 @@ CONFIG_DMADEVICES=y CONFIG_FSL_DMA=y # CONFIG_NET_DMA is not set CONFIG_STAGING=y +CONFIG_MEMORY=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set diff --git a/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig b/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig index f7c321b..1b9f07c6 100644 --- a/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig +++ b/arch/powerpc/configs/corenet32_fmanv3_smp_defconfig @@ -161,6 +161,7 @@ CONFIG_FSL_PME2=y CONFIG_FSL_PAMU=y CONFIG_VIRT_DRIVERS=y CONFIG_FSL_HV_MANAGER=y +CONFIG_MEMORY=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set diff --git a/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig b/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig index 86bd8f7..4b2830b 100644 --- a/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig +++ b/arch/powerpc/configs/corenet64_fmanv3_smp_defconfig @@ -168,6 +168,7 @@ CONFIG_FSL_PME2=y CONFIG_FSL_PAMU=y CONFIG_VIRT_DRIVERS=y CONFIG_FSL_HV_MANAGER=y +CONFIG_MEMORY=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_ISO9660_FS=m diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index 57721ed..0e2fff7 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -53,6 +53,7 @@ config TEGRA30_MC config FSL_IFC bool "Freescale Integrated Flash Controller" depends on FSL_SOC + default y help This driver is for the Integrated Flash Controller(IFC) module available in Freescale SoCs. This controller allows to handle -- cgit v0.10.2