[generic/3.3]: refresh patches to -rc3

[openwrt.git] / target / linux / goldfish / config-2.6.30

diff --git a/target/linux/goldfish/config-2.6.30 b/target/linux/goldfish/config-2.6.30
index d6b98a6..3a4c345 100644 (file)
--- a/target/linux/goldfish/config-2.6.30
+++ b/target/linux/goldfish/config-2.6.30
@@ -1,4 +1,3 @@
-CONFIG_AEABI=y

 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_ARCH_GOLDFISH=y
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_ARCH_GOLDFISH=y


@@ -9,11 +8,9 @@ CONFIG_ARCH_GOLDFISH=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y

-CONFIG_ARM=y

 CONFIG_ARM_THUMB=y
 CONFIG_ARM_THUMB=y

+CONFIG_ARM=y

 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set

-CONFIG_BASE_SMALL=0
-# CONFIG_BATTERY_DS2760 is not set

 CONFIG_BATTERY_GOLDFISH=y
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 CONFIG_BATTERY_GOLDFISH=y
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y


@@ -23,15 +20,15 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_CMDLINE="console=/dev/ttyS0 root=mtdblock0 rootdelay=1 rootfstype=yaffs2"
 # CONFIG_CONSOLE_EARLYSUSPEND is not set
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CMDLINE="console=/dev/ttyS0 root=mtdblock0 rootdelay=1 rootfstype=yaffs2"
 # CONFIG_CONSOLE_EARLYSUSPEND is not set
 CONFIG_CONSOLE_TRANSLATIONS=y

-CONFIG_CPU_32=y

 CONFIG_CPU_32v5=y
 CONFIG_CPU_32v5=y

+CONFIG_CPU_32=y

 CONFIG_CPU_ABRT_EV5TJ=y
 CONFIG_CPU_ARM926T=y
 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_V4WB=y
 CONFIG_CPU_ABRT_EV5TJ=y
 CONFIG_CPU_ARM926T=y
 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_V4WB=y

-CONFIG_CPU_CP15=y

 CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_CP15_MMU=y

+CONFIG_CPU_CP15=y

 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_NOIFAR=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_PABRT_NOIFAR=y


@@ -52,8 +49,8 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_LL is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_LL is not set

-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set

+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_OBJECTS is not set


@@ -74,7 +71,6 @@ CONFIG_DEVKMEM=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLYSUSPEND=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_EARLYSUSPEND=y
 # CONFIG_FAULT_INJECTION is not set

-CONFIG_FB=y

 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y


@@ -82,17 +78,18 @@ CONFIG_FB_EARLYSUSPEND=y
 CONFIG_FB_GOLDFISH=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_GOLDFISH=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y

+CONFIG_FB=y

 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_EDID is not set

-# CONFIG_FONTS is not set

 CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y

-CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set

 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

+CONFIG_FRAMEBUFFER_CONSOLE=y

 CONFIG_FRAME_POINTER=y
 CONFIG_FREEZER=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FREEZER=y

-CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

+CONFIG_GENERIC_CLOCKEVENTS=y

 CONFIG_GENERIC_FIND_LAST_BIT=y
 # CONFIG_GENERIC_GPIO is not set
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 # CONFIG_GENERIC_GPIO is not set
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y


@@ -114,23 +111,21 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_OPROFILE=y

-CONFIG_HID=y

 CONFIG_HID_SUPPORT=y
 CONFIG_HID_SUPPORT=y

+CONFIG_HID=y

 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set

-# CONFIG_I2C is not set

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INITRAMFS_SOURCE=""

-CONFIG_INPUT=y

 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_GPIO=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_KEYRESET=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_GPIO=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_KEYRESET=y

-CONFIG_INPUT_MOUSEDEV=y

 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

+CONFIG_INPUT_MOUSEDEV=y

 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_TOUCHSCREEN=y

-# CONFIG_ISDN is not set
+CONFIG_INPUT=y

 # CONFIG_JFFS2_CMODE_PRIORITY is not set
 CONFIG_JFFS2_CMODE_SIZE=y
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_JFFS2_CMODE_PRIORITY is not set
 CONFIG_JFFS2_CMODE_SIZE=y
 # CONFIG_KEYBOARD_ATKBD is not set


@@ -144,31 +139,31 @@ CONFIG_KEYBOARD_GOLDFISH_EVENTS=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOGO is not set
 CONFIG_MACH_GOLDFISH=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOGO is not set
 CONFIG_MACH_GOLDFISH=y

+# CONFIG_MMC_GOLDFISH is not set

 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_GOLDFISH_NAND=y
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_CFI is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_GOLDFISH_NAND=y
 CONFIG_MTD_NAND=y

-CONFIG_MTD_UBI=y

 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_MTD_UBI_GLUEBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_MTD_UBI_GLUEBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096

+CONFIG_MTD_UBI=y

 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set

-# CONFIG_OABI_COMPAT is not set

 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PDA_POWER is not set

-CONFIG_PM=y

 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP=y

-CONFIG_POWER_SUPPLY=y
+CONFIG_PM=y

 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_POWER_SUPPLY_DEBUG is not set

+CONFIG_POWER_SUPPLY=y

 # CONFIG_PROVE_LOCKING is not set
 CONFIG_QEMU_TRACE=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_PROVE_LOCKING is not set
 CONFIG_QEMU_TRACE=y
 # CONFIG_RCU_TORTURE_TEST is not set


@@ -177,17 +172,16 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_DRV_GOLDFISH=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RTC_DRV_CMOS is not set
 CONFIG_RTC_DRV_GOLDFISH=y
 # CONFIG_RT_MUTEX_TESTER is not set

-# CONFIG_SCHEDSTATS is not set

 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHED_DEBUG=y

+# CONFIG_SCHEDSTATS is not set

 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SMC91X=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SLOW_WORK is not set
 CONFIG_SMC91X=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096

-CONFIG_SUSPEND=y

 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND_FREEZER=y

+CONFIG_SUSPEND=y

 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

-CONFIG_TICK_ONESHOT=y

 # CONFIG_TIMER_STATS is not set
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_UBIFS_FS is not set
 # CONFIG_TIMER_STATS is not set
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_UBIFS_FS is not set


@@ -198,11 +192,11 @@ CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VFP=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_VFP=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y

-CONFIG_VT=y

 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y

-CONFIG_WAKELOCK=y
+CONFIG_VT=y

 CONFIG_WAKELOCK_STAT=y
 CONFIG_WAKELOCK_STAT=y

+CONFIG_WAKELOCK=y

 # CONFIG_WATCHDOG is not set
 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0
 # CONFIG_WATCHDOG is not set
 CONFIG_ZBOOT_ROM_BSS=0
 CONFIG_ZBOOT_ROM_TEXT=0