backport r22259 to backfire

SVN-Revision: 22566

diff --git a/target/linux/rdc/config-2.6.30 b/target/linux/rdc/config-2.6.30
index b18048b4bef9135de1fd3c5fbe3284f94b25048c..0f22bfb5d087c061c4b478d1902105b389ede6d0 100644 (file)
--- a/target/linux/rdc/config-2.6.30
+++ b/target/linux/rdc/config-2.6.30
@@ -13,6 +13,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
 CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -28,15 +29,15 @@ CONFIG_BASE_SMALL=1
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM=y
 CONFIG_BOUNCE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_CMDLINE="console=uart,io,0x3f8 rootfstype=squashfs,jffs2"
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"
 # CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_COMPAT_NET_DEV_OPS is not set
 # CONFIG_COMPAT_VDSO is not set
@@ -66,8 +67,8 @@ CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 # CONFIG_GENERIC_CPU is not set
 CONFIG_GENERIC_FIND_FIRST_BIT=y
@@ -98,8 +99,8 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FTRACE_SYSCALLS=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IOREMAP_PROT=y
@@ -108,8 +109,8 @@ CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -123,13 +124,15 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 # CONFIG_HP_WATCHDOG is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_HZ_100 is not set
 CONFIG_HZ=250
+# CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
+# CONFIG_IOMMU_API is not set
+# CONFIG_IOMMU_HELPER is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
@@ -138,18 +141,15 @@ CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 # CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
 # CONFIG_IP_MROUTE is not set
-CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
+CONFIG_ISA_DMA_API=y
 # CONFIG_ISCSI_IBFT_FIND is not set
 # CONFIG_IT8712F_WDT is not set
 # CONFIG_IT87_WDT is not set
 # CONFIG_ITCO_WDT is not set
 # CONFIG_JFFS2_SUMMARY is not set
 CONFIG_KTIME_SCALAR=y
-CONFIG_LBD=y
 # CONFIG_LEDS_ALIX2 is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
@@ -178,16 +178,14 @@ CONFIG_MATH_EMULATION=y
 # CONFIG_MMIOTRACE is not set
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
 # CONFIG_MPSC is not set
 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_NETSC520 is not set
 CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_R8610 is not set
-# CONFIG_MTD_RDC3210 is not set
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTRR is not set
 # CONFIG_MVIAC3_2 is not set
@@ -206,11 +204,11 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y
+# CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
@@ -255,16 +253,17 @@ CONFIG_USER_STACKTRACE_SUPPORT=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_W83697UG_WDT is not set
 # CONFIG_WAFER_WDT is not set
-CONFIG_X86_32_LAZY_GS=y
+CONFIG_X86=y
 CONFIG_X86_32=y
+CONFIG_X86_32_LAZY_GS=y
 # CONFIG_X86_64 is not set
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_BSWAP=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_CMPXCHG=y
-# CONFIG_X86_CPU_DEBUG is not set
-# CONFIG_X86_CPUID is not set
 CONFIG_X86_CPU=y
+# CONFIG_X86_CPUID is not set
+# CONFIG_X86_CPU_DEBUG is not set
 # CONFIG_X86_ELAN is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_F00F_BUG=y
@@ -281,12 +280,10 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_POPAD_OK=y
 # CONFIG_X86_PPRO_FENCE is not set
 CONFIG_X86_RDC321X=y
-# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_X86_REBOOTFIXUPS=y
 # CONFIG_X86_RESERVE_LOW_64K is not set
 # CONFIG_X86_UP_APIC is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
-CONFIG_X86=y
 # CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_REQUIRE_GPIOLIB=y