diff mbox

UBUNTU: [Config] restore mmc boot on panda

Message ID 1378714952-4949-2-git-send-email-paolo.pisati@canonical.com
State New
Headers show

Commit Message

Paolo Pisati Sept. 9, 2013, 8:22 a.m. UTC 
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.master/config/amd64/config.common.amd64         | 1 +
 debian.master/config/armhf/config.flavour.generic      | 1 +
 debian.master/config/armhf/config.flavour.generic-lpae | 1 +
 debian.master/config/config.common.ubuntu              | 5 ++---
 debian.master/config/i386/config.common.i386           | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c185910..4a0b941 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -27,6 +27,7 @@  CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FONTS is not set
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_TWL6040=m
 # CONFIG_HAVE_AOUT is not set
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index c9bb0d0..a9d43f1 100644
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -16,6 +16,7 @@  CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_DDC=m
 CONFIG_FB_SVGALIB=m
 CONFIG_GPIO_GENERIC=y
+CONFIG_GPIO_TWL6040=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_MTD_SM_COMMON=m
 # CONFIG_MUSB_PIO_ONLY is not set
diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index 642c7ec..2c655c4 100644
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -16,6 +16,7 @@  CONFIG_COMPACTION=y
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_SVGALIB is not set
 CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_TWL6040=m
 CONFIG_HUGETLB_PAGE=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MUSB_PIO_ONLY=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 64b0980..a9b3944 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2118,7 +2118,6 @@  CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_TS5500=m
 CONFIG_GPIO_TWL4030=y
-CONFIG_GPIO_TWL6040=m
 CONFIG_GPIO_UCB1400=y
 CONFIG_GPIO_VIPERBOARD=m
 CONFIG_GPIO_VX855=m
@@ -4505,7 +4504,7 @@  CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SL=y
-CONFIG_PINCTRL_SINGLE=m
+CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA20=y
@@ -5886,7 +5885,7 @@  CONFIG_SPI_IMX=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_OMAP24XX=m
+CONFIG_SPI_OMAP24XX=y
 CONFIG_SPI_PL022=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_DMA=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 4d432e6..4499bf6 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -26,6 +26,7 @@  CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FONTS is not set
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_TWL6040=m
 CONFIG_HAVE_AOUT=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y