[PATCH 3/8] UBUNTU: [Config] FTBFS arm[hf|el]/omap: disable MTD_ONENAND_SIM

[Paolo Pisati]

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    1 +
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/armhf/config.flavour.highbank |    1 +
 debian.master/config/armhf/config.flavour.omap     |    1 +
 debian.master/config/config.common.ubuntu          |    1 -
 debian.master/config/i386/config.common.i386       |    1 +
 debian.master/config/powerpc/config.common.powerpc |    1 +
 debian.master/config/ppc64/config.common.ppc64     |    1 +
 8 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c012188..e9f937d 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -139,6 +139,7 @@ CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_ONENAND_SIM=m
 CONFIG_MTD_SM_COMMON=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_NEED_DMA_MAP_STATE=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index a7b77ef..01b69bd 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -144,6 +144,7 @@ CONFIG_MTD_NAND_BCH=y
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_IDS=y
 CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_ONENAND_SIM is not set
 # CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_NEED_DMA_MAP_STATE=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 4b4af25..59bf13c 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -99,6 +99,7 @@ CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_ONENAND_SIM=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_NET_CALXEDA_XGMAC=y
 # CONFIG_NET_DMA is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 6e3bb6f..9495145 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -99,6 +99,7 @@ CONFIG_MTD_NAND_BCH=y
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_IDS=y
 CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_ONENAND_SIM is not set
 # CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_DMA=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f7b0dcd..919e0bb 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3559,7 +3559,6 @@ CONFIG_MTD_ONENAND_2X_PROGRAM=y
 CONFIG_MTD_ONENAND_GENERIC=m
 CONFIG_MTD_ONENAND_OMAP2=m
 # CONFIG_MTD_ONENAND_OTP is not set
-CONFIG_MTD_ONENAND_SIM=m
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 CONFIG_MTD_OOPS=m
 CONFIG_MTD_PCI=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index ecea18c..8937caa 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -138,6 +138,7 @@ CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_ONENAND_SIM=m
 CONFIG_MTD_SM_COMMON=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_NEED_DMA_MAP_STATE=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 75604a7..b31b24b 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -129,6 +129,7 @@ CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_ONENAND_SIM=m
 CONFIG_MTD_SM_COMMON=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_NET_DMA=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 9f0015d..6595a09 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -146,6 +146,7 @@ CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_ONENAND_SIM=m
 CONFIG_MTD_SM_COMMON=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_NEED_DMA_MAP_STATE=y
-- 
1.7.10.4