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

[openwrt.git] / target / linux / kirkwood / config-default

diff --git a/target/linux/kirkwood/config-default b/target/linux/kirkwood/config-default
index 613ca97..ee0dfe2 100644 (file)
--- a/target/linux/kirkwood/config-default
+++ b/target/linux/kirkwood/config-default
@@ -8,8 +8,8 @@ CONFIG_ARCH_KIRKWOOD=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 is not set
 # CONFIG_ARM_THUMB is not set

+CONFIG_ARM=y

 # CONFIG_ARPD is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ARPD is not set
 CONFIG_ATA=m
 # CONFIG_ATA_NONSTANDARD is not set


@@ -17,21 +17,22 @@ CONFIG_ATA=m
 CONFIG_ATA_SFF=y
 CONFIG_BASE_SMALL=0
 CONFIG_BITREVERSE=y
 CONFIG_ATA_SFF=y
 CONFIG_BASE_SMALL=0
 CONFIG_BITREVERSE=y

-CONFIG_CACHE_FEROCEON_L2=y

 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set

-CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
-CONFIG_COMPAT_NET_DEV_OPS=y
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_CPU_32=y
+CONFIG_CACHE_FEROCEON_L2=y
+CONFIG_CMDLINE="rootdelay=1 root=/dev/mmcblk0p1 noinitrd console=ttyS0,115200"

 CONFIG_CPU_32v5=y
 CONFIG_CPU_32v5=y

+CONFIG_CPU_32=y

 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_FEROCEON=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_FEROCEON=y

-CONFIG_CPU_CP15=y

 CONFIG_CPU_CP15_MMU=y
 CONFIG_CPU_CP15_MMU=y

+CONFIG_CPU_CP15=y
+# CONFIG_CPU_FEROCEON_OLD_ID is not set

 CONFIG_CPU_FEROCEON=y
 CONFIG_CPU_FEROCEON=y

-CONFIG_CPU_FEROCEON_OLD_ID=y

 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set

+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE=y

 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_FEROCEON=y
 CONFIG_CRC16=y
 CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_FEROCEON=y
 CONFIG_CRC16=y


@@ -47,14 +48,15 @@ CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_DSCC4 is not set
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_LEGACY is not set

+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y

 # CONFIG_FARSYNC is not set
 # CONFIG_FCOE is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_FARSYNC is not set
 # CONFIG_FCOE is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FRAME_POINTER=y

-# CONFIG_FREEZER is not set
-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=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y


@@ -72,26 +74,27 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y

-CONFIG_HDLC=m

 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m
 CONFIG_HDLC_CISCO=m
 CONFIG_HDLC_FR=m

+CONFIG_HDLC=m

 CONFIG_HDLC_PPP=m
 CONFIG_HDLC_RAW=m
 CONFIG_HDLC_PPP=m
 CONFIG_HDLC_RAW=m

-CONFIG_HWMON=y

 # CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set

+CONFIG_HWMON=y

 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM=y

-CONFIG_I2C=y

 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MV64XXX=y

+CONFIG_I2C=y

 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y

+CONFIG_JBD=y

 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_GPIO is not set

-CONFIG_LEGACY_PTYS=y

 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LEGACY_PTY_COUNT=256

+CONFIG_LEGACY_PTYS=y

 # CONFIG_LIB80211 is not set
 # CONFIG_LIBFC is not set
 # CONFIG_MACH_DB88F6281_BP is not set
 # CONFIG_LIB80211 is not set
 # CONFIG_LIBFC is not set
 # CONFIG_MACH_DB88F6281_BP is not set


@@ -99,32 +102,33 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MACH_RD88F6281 is not set
 CONFIG_MACH_SHEEVAPLUG=y
 # CONFIG_MACH_TS219 is not set
 # CONFIG_MACH_RD88F6281 is not set
 CONFIG_MACH_SHEEVAPLUG=y
 # CONFIG_MACH_TS219 is not set

-# CONFIG_MAC_PARTITION is not set

 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_FILESYSTEMS=y

-CONFIG_MMC=m

 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK=m

-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC=m

 CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_MVSDIO=m

-# CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_TIFM_SD is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MTD_PHYSMAP=y
+CONFIG_MMC_MVSDIO=y
+CONFIG_MMC=y
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_NAND=y

 # CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_PHYSMAP_COMPAT is not set

-CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_REDBOOT_PARTSis not set
+# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
+# CONFIG_MTD_ROOTFS_SPLIT is not set

 CONFIG_MV643XX_ETH=y
 # CONFIG_NATSEMI is not set
 CONFIG_MV643XX_ETH=y
 # CONFIG_NATSEMI is not set

-CONFIG_NET_DSA=y

 # CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_NET_DSA_MV88E6123_61_65 is not set
 CONFIG_NET_DSA_MV88E6131=y
 # CONFIG_NET_DSA_MV88E6060 is not set
 # CONFIG_NET_DSA_MV88E6123_61_65 is not set
 CONFIG_NET_DSA_MV88E6131=y

-CONFIG_NET_DSA_MV88E6XXX=y

 CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
 CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y

+CONFIG_NET_DSA_MV88E6XXX=y

 CONFIG_NET_DSA_TAG_DSA=y
 # CONFIG_NET_DSA_TAG_EDSA is not set
 # CONFIG_NET_DSA_TAG_TRAILER is not set
 CONFIG_NET_DSA_TAG_DSA=y
 # CONFIG_NET_DSA_TAG_EDSA is not set
 # CONFIG_NET_DSA_TAG_TRAILER is not set

+CONFIG_NET_DSA=y

 # CONFIG_NET_SCH_DRR is not set
 # CONFIG_NET_SCH_DRR is not set

-# CONFIG_NF_DEFRAG_IPV4 is not set

 # CONFIG_NO_IOPORT is not set
 # CONFIG_NVRAM is not set
 CONFIG_OUTER_CACHE=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NVRAM is not set
 CONFIG_OUTER_CACHE=y


@@ -132,29 +136,26 @@ CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PATA_ARTOP=m
 # CONFIG_PATA_SCH is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PATA_ARTOP=m
 # CONFIG_PATA_SCH is not set

-CONFIG_PCI=y

 # CONFIG_PCI_STUB is not set
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_STUB is not set
 CONFIG_PCI_SYSCALL=y

+CONFIG_PCI=y

 CONFIG_PHYLIB=y
 CONFIG_PHYLIB=y

-# CONFIG_PHYS_ADDR_T_64BIT is not set

 CONFIG_PLAT_ORION=y
 CONFIG_RTC_CLASS=y
 CONFIG_PLAT_ORION=y
 CONFIG_RTC_CLASS=y

-CONFIG_RTC_DRV_ISL1208=y
-# CONFIG_RTC_DRV_MV is not set
+CONFIG_RTC_DRV_MV=y

 CONFIG_SATA_PMP=y
 CONFIG_SCSI=m
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SATA_PMP=y
 CONFIG_SCSI=m
 # CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SDIO_UART is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set

-# CONFIG_SHMEM is not set

 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SPLIT_PTLOCK_CPUS=4096

-# CONFIG_SWAP is not set
+CONFIG_SWAP=y

 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_UID16=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_UID16=y

-CONFIG_USB=m

 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_GPIO_VBUS is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_GPIO_VBUS is not set

+CONFIG_USB=m

 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m