[x86] add olpc 2.6.31 configuration, forward port the block2mtd patch, refresh patches

[openwrt.git] / target / linux / adm5120 / router_be / config-2.6.28

diff --git a/target/linux/adm5120/router_be/config-2.6.28 b/target/linux/adm5120/router_be/config-2.6.28
index 21cd614..dac488f 100644 (file)
--- a/target/linux/adm5120/router_be/config-2.6.28
+++ b/target/linux/adm5120/router_be/config-2.6.28
@@ -2,6 +2,7 @@ CONFIG_32BIT=y
 # CONFIG_64BIT is not set
 CONFIG_ADM5120=y
 CONFIG_ADM5120_ENET=y
 # CONFIG_64BIT is not set
 CONFIG_ADM5120=y
 CONFIG_ADM5120_ENET=y

+# CONFIG_ADM5120_MACH_5GXI is not set

 CONFIG_ADM5120_MACH_P_334WT=y
 CONFIG_ADM5120_MACH_P_335=y
 # CONFIG_ADM5120_OEM_CELLVISION is not set
 CONFIG_ADM5120_MACH_P_334WT=y
 CONFIG_ADM5120_MACH_P_335=y
 # CONFIG_ADM5120_OEM_CELLVISION is not set


@@ -10,6 +11,7 @@ CONFIG_ADM5120_MACH_P_335=y
 # CONFIG_ADM5120_OEM_INFINEON is not set
 # CONFIG_ADM5120_OEM_MIKROTIK is not set
 # CONFIG_ADM5120_OEM_MOTOROLA is not set
 # CONFIG_ADM5120_OEM_INFINEON is not set
 # CONFIG_ADM5120_OEM_MIKROTIK is not set
 # CONFIG_ADM5120_OEM_MOTOROLA is not set

+# CONFIG_ADM5120_OEM_OSBRIDGE is not set

 CONFIG_ADM5120_OEM_ZYXEL=y
 CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y
 CONFIG_ADM5120_OEM_ZYXEL=y
 CONFIG_ADM5120_SOC_BGA=y
 CONFIG_ADM5120_WDT=y


@@ -119,6 +121,7 @@ CONFIG_MII=m
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set

+# CONFIG_MIPS_FPU_EMU is not set

 CONFIG_MIPS_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 CONFIG_MIPS_MACHINE=y
 # CONFIG_MIPS_MALTA is not set


@@ -148,7 +151,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_PROBE_INITRD_HEADER is not set

-# CONFIG_PROM_EMU is not set

 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 # CONFIG_SCSI_DMA is not set
 # CONFIG_SERIAL_8250 is not set