summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2012-03-02 14:30:52 +0800
committerAndy Green <andy.green@linaro.org>2012-03-03 03:26:26 +0800
commit602c724edc2be7f39cdbe46fc7f64c7b8ad41c84 (patch)
treecbad3fff605a9d4ba274715fc35202d04418b15b
parentcce019502506e80b03aa911976a249eb229a7e66 (diff)
config edid bitbang gpiolibtilt-3.3-omap5-eng-1
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--arch/arm/configs/omap_5430evm_defconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/omap_5430evm_defconfig b/arch/arm/configs/omap_5430evm_defconfig
index 9a21b23f99a..eeaf401fb5e 100644
--- a/arch/arm/configs/omap_5430evm_defconfig
+++ b/arch/arm/configs/omap_5430evm_defconfig
@@ -32,7 +32,7 @@ CONFIG_PREEMPT=y
CONFIG_HIGHMEM=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/ram0 rw mem=512M console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 earlyprintk"
+CONFIG_CMDLINE="console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootwait earlyprintk earlycon=ttyO2.115200n8"
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
@@ -91,6 +91,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DETECT_IRQ=y
CONFIG_SERIAL_8250_RSA=y
CONFIG_HW_RANDOM=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_GPIO=y
CONFIG_SENSORS_OMAP_TEMP_SENSOR=y
CONFIG_SENSORS_TMP102=y
CONFIG_OMAP4460PLUS_SCM=y
@@ -98,7 +100,6 @@ CONFIG_OMAP4460PLUS_TEMP_SENSOR=y
CONFIG_MFD_PALMAS=y
CONFIG_MFD_PALMAS_GPADC=y
CONFIG_MFD_PALMAS_RESOURCE=y
-CONFIG_REGULATOR_DEBUG=y
CONFIG_REGULATOR_DUMMY=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_PALMAS=y
@@ -132,7 +133,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_MMC=y
-CONFIG_MMC_DEBUG=y
CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_OMAP_HS=y
CONFIG_STAGING=y