aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-05-25 09:06:17 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2011-05-26 09:59:57 +0200
commit608e60f0ef16122568f868f79e673e955c52c709 (patch)
tree9937109bfe0a3e50720d498d172bfacd220f276b /recipes/linux
parent05509a1986556aac7dd3124a318038c12f18866d (diff)
downloadopenembedded-608e60f0ef16122568f868f79e673e955c52c709.tar.gz
linux-2.6.39: sync om-gta02 defconfig with defconfig from larsc a bit
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux-2.6.39/om-gta02/defconfig23
1 files changed, 6 insertions, 17 deletions
diff --git a/recipes/linux/linux-2.6.39/om-gta02/defconfig b/recipes/linux/linux-2.6.39/om-gta02/defconfig
index d70175071a..58d1ff3f02 100644
--- a/recipes/linux/linux-2.6.39/om-gta02/defconfig
+++ b/recipes/linux/linux-2.6.39/om-gta02/defconfig
@@ -5,31 +5,22 @@ CONFIG_SYSVIPC=y
CONFIG_IKCONFIG=m
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=18
-CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_RD_LZO=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_LBDAF is not set
-CONFIG_IOSCHED_CFQ=m
+# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_S3C2410=y
-CONFIG_S3C_BOOT_WATCHDOG=y
-CONFIG_S3C_BOOT_ERROR_RESET=y
CONFIG_S3C_LOWLEVEL_UART_PORT=2
CONFIG_SAMSUNG_GPIO_EXTRA=64
CONFIG_S3C24XX_PWM=y
-CONFIG_S3C2410_DMA=y
CONFIG_MACH_NEO1973_GTA02=y
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
@@ -38,6 +29,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="unused -- bootloader passes ATAG list quiet"
CONFIG_CPU_IDLE=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -272,24 +264,20 @@ CONFIG_I2C_S3C2410=y
CONFIG_SPI=y
CONFIG_SPI_GPIO=y
CONFIG_SPI_S3C24XX=y
-CONFIG_SPI_S3C24XX_GPIO=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_GLAMO=y
-CONFIG_BATTERY_PLATFORM=m
-CONFIG_BATTERY_BQ27x00=y
+CONFIG_BATTERY_PLATFORM=y
CONFIG_CHARGER_PCF50633=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_SOFT_WATCHDOG=y
CONFIG_S3C2410_WATCHDOG=y
CONFIG_PCF50633_ADC=y
CONFIG_MFD_GLAMO=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_PCF50633=y
-CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
+CONFIG_FB_S3C2410=y
CONFIG_FB_GLAMO=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
@@ -404,6 +392,7 @@ CONFIG_USB_MASS_STORAGE=m
CONFIG_USB_G_SERIAL=m
CONFIG_USB_CDC_COMPOSITE=m
CONFIG_MMC=y
+CONFIG_MMC_DEBUG=y
CONFIG_MMC_UNSAFE_RESUME=y
CONFIG_MMC_S3C=y
CONFIG_MMC_GLAMO=y