aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/kexecboot
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2010-04-10 02:00:00 +0200
committerAndrea Adami <andrea.adami@gmail.com>2010-04-10 02:01:20 +0200
commit07dc1447e08174481804e9b82dc334209eb00de7 (patch)
treeae5ceb5258be509e993727b1b4131ea22bdc69c8 /recipes/kexecboot
parentad555a158aa48b4f7ee6cb84a38eb57c6b40ac42 (diff)
downloadopenembedded-07dc1447e08174481804e9b82dc334209eb00de7.tar.gz
openembedded-07dc1447e08174481804e9b82dc334209eb00de7.tar.bz2
openembedded-07dc1447e08174481804e9b82dc334209eb00de7.zip
linux-kexecboot: fix/refine defconfigs of collie and tosa for 2.6.34
Diffstat (limited to 'recipes/kexecboot')
-rw-r--r--recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/collie/defconfig32
-rw-r--r--recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/tosa/defconfig8
2 files changed, 23 insertions, 17 deletions
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/collie/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/collie/defconfig
index 576e55c126..a151952a5d 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/collie/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/collie/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.34-rc3
-# Fri Apr 9 02:14:33 2010
+# Sat Apr 10 01:34:25 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -298,7 +298,8 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
@@ -357,8 +358,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
#
# At least one emulation must be selected
#
-# CONFIG_FPE_NWFPE is not set
-CONFIG_FPE_FASTFPE=y
#
# Userspace binary formats
@@ -367,7 +366,6 @@ CONFIG_BINFMT_ELF=y
CONFIG_HAVE_AOUT=y
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
#
# Power management options
@@ -584,7 +582,7 @@ CONFIG_KEYBOARD_LOCOMO=y
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
# CONFIG_TOUCHSCREEN_AD7877 is not set
# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
@@ -634,7 +632,10 @@ CONFIG_HW_CONSOLE=y
# Non-8250 serial port support
#
# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_SA1100 is not set
+CONFIG_SERIAL_SA1100=y
+CONFIG_SERIAL_SA1100_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -747,6 +748,7 @@ CONFIG_PDA_POWER=y
CONFIG_APM_POWER=y
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2782 is not set
+CONFIG_BATTERY_COLLIE=y
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_HWMON is not set
@@ -791,7 +793,10 @@ CONFIG_SSB_POSSIBLE=y
#
# Multimedia Capabilities Port drivers
#
-# CONFIG_MCP_SA11X0 is not set
+CONFIG_MCP=y
+CONFIG_MCP_SA11X0=y
+CONFIG_MCP_UCB1200=y
+CONFIG_MCP_UCB1200_TS=y
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -804,9 +809,9 @@ CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
# CONFIG_FB_SYS_FILLRECT is not set
# CONFIG_FB_SYS_COPYAREA is not set
@@ -822,7 +827,7 @@ CONFIG_FB=y
#
# Frame buffer hardware drivers
#
-# CONFIG_FB_SA1100 is not set
+CONFIG_FB_SA1100=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
@@ -897,7 +902,7 @@ CONFIG_LEDS_CLASS=y
#
# LED drivers
#
-# CONFIG_LEDS_LOCOMO is not set
+CONFIG_LEDS_LOCOMO=y
# CONFIG_LEDS_PCA9532 is not set
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_GPIO_PLATFORM=y
@@ -1081,6 +1086,7 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_ARM_UNWIND is not set
# CONFIG_DEBUG_USER is not set
# CONFIG_OC_ETM is not set
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/tosa/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/tosa/defconfig
index a34e1b2994..86cb45c9e8 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/tosa/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/tosa/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.34-rc3
-# Fri Apr 9 01:40:22 2010
+# Sat Apr 10 01:43:49 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -123,7 +123,7 @@ CONFIG_BASE_SMALL=1
# CONFIG_MODULES is not set
CONFIG_BLOCK=y
# CONFIG_LBDAF is not set
-CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
#
@@ -376,7 +376,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3 "
+CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3"
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
CONFIG_ATAGS_PROC=y
@@ -792,7 +792,7 @@ CONFIG_PDA_POWER=y
CONFIG_APM_POWER=y
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2782 is not set
-CONFIG_BATTERY_TOSA=y
+# CONFIG_BATTERY_TOSA is not set
# CONFIG_BATTERY_WM97XX is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set