diff --git a/.config b/.config
index 4a8ca5f..0bf69f4 100644
--- a/.config
+++ b/.config
@@ -5,24 +5,23 @@
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_GPIO is not set
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_ARCH_HAS_CPUFREQ=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_ZONE_DMA=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
 
 #
 # General setup
@@ -34,28 +33,15 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_GROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
 CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -136,12 +122,10 @@
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_FREEZER is not set
 
 #
 # System Type
 #
-CONFIG_MMU=y
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_FEROCEON_ORION is not set
@@ -151,72 +135,54 @@
 # CONFIG_ARCH_REALVIEW is not set
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_GEMINI is not set
+# CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_STMP3XXX is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_MSM is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5PC1XX is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_U300 is not set
-# CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_BCMRING is not set
 
 #
 # Feroceon SoC options
 #
 CONFIG_MV88F6500=y
-CONFIG_MACH_GFLT200=y
+CONFIG_MV_KERN_VER_2_6_22=y
 # CONFIG_JTAG_DEBUG is not set
 
 #
 # Feroceon SoC Included Features
 #
-CONFIG_MV_NAND_SUPPORT=y
 CONFIG_MV_INCLUDE_PEX=y
 CONFIG_MV_INCLUDE_USB=y
-CONFIG_MV_INCLUDE_XOR=y
-# CONFIG_MV_INCLUDE_CESA is not set
-# CONFIG_MV_INCLUDE_NFC is not set
-CONFIG_MV_INCLUDE_LEGACY_NAND=y
-# CONFIG_MV_INCLUDE_INTEG_SATA is not set
+# CONFIG_MV_INCLUDE_XOR is not set
+CONFIG_MV_INCLUDE_CESA=y
+CONFIG_MV_INCLUDE_NAND=y
+CONFIG_MV_INCLUDE_INTEG_SATA=y
 CONFIG_MV_INCLUDE_TDM=y
 CONFIG_MV_INCLUDE_GIG_ETH=y
 CONFIG_MV_INCLUDE_SPI=y
-CONFIG_MV_INCLUDE_SDIO=y
+# CONFIG_MV_INCLUDE_SDIO is not set
 # CONFIG_MV_INCLUDE_TS is not set
 CONFIG_MV_INCLUDE_PON=y
-CONFIG_MV_INCLUDE_TPM=y
-CONFIG_MV_INCLUDE_CUST=y
 CONFIG_MV_INCLUDE_SWITCH=y
 CONFIG_MV_GPP_MAX_PINS=70
 CONFIG_MV_DCACHE_SIZE=0x4000
@@ -225,33 +191,34 @@
 #
 # Feroceon SoC MTD support
 #
-CONFIG_MV_FLASH_CTRL=y
-CONFIG_MV_INCLUDE_SFLASH_MTD=y
-# CONFIG_MTD_NAND_LNC is not set
+# CONFIG_MV_FLASH_CTRL is not set
+# CONFIG_MV_INCLUDE_NORFLASH_MTD is not set
+# CONFIG_MV_INCLUDE_SFLASH_MTD is not set
+# CONFIG_MV_INCLUDE_MFLASH_MTD is not set
+CONFIG_MV_NAND=y
+CONFIG_MV_NAND_BOOT=y
+CONFIG_NAND_RS_ECC_SUPPORT=y
+# CONFIG_MV_NAND_8BYTE_READ is not set
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_USE_DSP=y
+CONFIG_L2_CACHE_ENABLE=y
+# CONFIG_CPU_L2_DCACHE_WRITETHROUGH is not set
 CONFIG_MV_SP_I_FTCH_DB_INV=y
 # CONFIG_MV_SP_I_FTCH_LCK_L2_ICACHE is not set
 # CONFIG_MV_SP_I_FTCH_NONE is not set
 # CONFIG_MV_INTERNAL_REGS_SELECTIVE_MAPPING is not set
 CONFIG_FEROCEON_PROC=y
+CONFIG_MV_PMU_PROC=y
 CONFIG_UBOOT_STRUCT=y
 # CONFIG_MV_DBG_TRACE is not set
 CONFIG_MV_REAL_TIME=y
 # CONFIG_MV_CPU_PERF_CNTRS is not set
 # CONFIG_MV_CPU_L2_PERF_CNTRS is not set
-
-#
-# Power-Management options
-#
-CONFIG_MV_PMU_PROC=y
-CONFIG_MV_PM_IDLE_WFI_SR=y
-# CONFIG_MV_PM_IDLE_DEEPIDLE_SR is not set
+# CONFIG_MV_PM_IDLE_WFI_SR is not set
 
 #
 # Soc DMA accelerations
 #
-# CONFIG_MV_USE_XOR_ENGINE is not set
 
 #
 # SoC Networking support
@@ -270,29 +237,27 @@
 CONFIG_MV_ETH_TXQ=8
 # CONFIG_MV_ETH_TSO is not set
 CONFIG_MV_ETH_TOOL=y
+CONFIG_MV_ETH_PROC=y
 # CONFIG_MV_LINUX_COUNTERS_DISABLE is not set
 CONFIG_NET_SKB_HEADROOM=96
-CONFIG_NET_SKB_RECYCLE=y
-CONFIG_NET_SKB_RECYCLE_DEF=1
-# CONFIG_MV_ETH_NFP is not set
 
 #
 # BM configuration
 #
 CONFIG_MV_ETH_BM=y
-# CONFIG_MV_ETH_BM_CPU is not set
-CONFIG_MV_ETH_BM_0_PKT_SIZE=2016
-CONFIG_MV_ETH_BM_1_PKT_SIZE=256
-CONFIG_MV_ETH_BM_2_PKT_SIZE=2016
+CONFIG_MV_ETH_BM_CPU=y
+CONFIG_MV_ETH_BM_0_PKT_SIZE=0
+CONFIG_MV_ETH_BM_1_PKT_SIZE=0
+CONFIG_MV_ETH_BM_2_PKT_SIZE=0
 CONFIG_MV_ETH_BM_3_PKT_SIZE=256
 CONFIG_MV_ETH_BM_PORT_0=y
 CONFIG_MV_ETH_BM_PORT_0_LONG_POOL=0
-CONFIG_MV_ETH_BM_PORT_0_SHORT_POOL=1
+CONFIG_MV_ETH_BM_PORT_0_SHORT_POOL=3
 CONFIG_MV_ETH_BM_PORT_0_LONG_BUF_NUM=2048
 CONFIG_MV_ETH_BM_PORT_0_SHORT_BUF_NUM=4096
 CONFIG_MV_ETH_BM_PORT_1=y
-CONFIG_MV_ETH_BM_PORT_1_LONG_POOL=0
-CONFIG_MV_ETH_BM_PORT_1_SHORT_POOL=1
+CONFIG_MV_ETH_BM_PORT_1_LONG_POOL=1
+CONFIG_MV_ETH_BM_PORT_1_SHORT_POOL=3
 CONFIG_MV_ETH_BM_PORT_1_LONG_BUF_NUM=2048
 CONFIG_MV_ETH_BM_PORT_1_SHORT_BUF_NUM=4096
 CONFIG_MV_ETH_BM_PORT_2=y
@@ -301,19 +266,16 @@
 CONFIG_MV_ETH_BM_PORT_2_LONG_BUF_NUM=2048
 CONFIG_MV_ETH_BM_PORT_2_SHORT_BUF_NUM=4096
 CONFIG_MV_ETH_PNC=y
-CONFIG_MV_PNC_TCAM_LINES=512
+CONFIG_MV_ETH_PNC_PARSER=y
 CONFIG_MV_ETH_PNC_MCAST_NUM=8
-CONFIG_MV_ETH_PNC_VLAN_PRIO=7
+CONFIG_MV_ETH_PNC_VLAN_PRIO=1
+# CONFIG_MV_ETH_PNC_SNAP is not set
 CONFIG_MV_ETH_PNC_ETYPE=0
 CONFIG_MV_ETH_PNC_DSCP_PRIO=4
-# CONFIG_MV_ETH_PNC_L3_FLOW is not set
-# CONFIG_MV_ETH_PNC_WOL is not set
 CONFIG_MV_ETH_HWF=y
 CONFIG_MV_ETH_HWF_TXQ_DROP=60
 CONFIG_MV_ETH_HWF_TXQ_DROP_RND=0
 CONFIG_MV_ETH_PMT=y
-CONFIG_MV_ETH_PMT_FLOWS=256
-CONFIG_MV_ETH_PMT_CMD_PER_FLOW=12
 
 #
 # Network Interface configuration
@@ -324,7 +286,7 @@
 #
 CONFIG_MV_ETH_RXQ_DESC=128
 CONFIG_MV_ETH_RXQ_DEF=0
-CONFIG_MV_ETH_TXQ_DESC=3072
+CONFIG_MV_ETH_TXQ_DESC=532
 CONFIG_MV_ETH_TXQ_DEF=0
 
 #
@@ -356,27 +318,8 @@
 CONFIG_MV_ETH_RX_COAL_USEC=100
 # CONFIG_MV_ETH_RX_DESC_PREFETCH is not set
 # CONFIG_MV_ETH_RX_PKT_PREFETCH is not set
-CONFIG_MV_ETH_RX_SPECIAL=y
-CONFIG_MV_ETH_TX_SPECIAL=y
-# CONFIG_MV_ETH_L2FW is not set
-CONFIG_MV_ETH_RX_POLL_WEIGHT=64
-CONFIG_MV_ETH_EXTRA_BUF_SIZE=120
-CONFIG_MV_ETH_EXTRA_BUF_NUM=532
-
-#
-# NFP support
-#
-
-#
-# NAPI GROUPS
-#
-CONFIG_MV_ETH_NAPI_GROUPS=1
-
-#
-# Group 0
-#
-CONFIG_MV_ETH_GROUP0_CPU=0x1
-CONFIG_MV_ETH_GROUP0_RXQ=0xff
+# CONFIG_MV_ETH_RX_SPECIAL is not set
+# CONFIG_MV_ETH_TX_SPECIAL is not set
 
 #
 # PON support for Network driver
@@ -395,9 +338,14 @@
 CONFIG_MV_ETH_SWITCH_LINK=y
 
 #
-# ERRATA / WA
+# Cesa options
 #
-# CONFIG_MV_ETH_6601_LB_WA is not set
+CONFIG_MV_CESA=y
+CONFIG_MV_CESA_TOOL=y
+CONFIG_MV_CESA_CHANNELS=2
+CONFIG_MV_CESA_CHAIN_MODE=y
+CONFIG_MV_CESA_OCF=y
+# CONFIG_MV_CESA_TEST is not set
 
 #
 # Telephony options
@@ -408,99 +356,45 @@
 # CONFIG_SILABS_SLIC_SUPPORT is not set
 CONFIG_ZARLINK_SLIC_SUPPORT=y
 CONFIG_ZARLINK_SLIC_VE880=y
-# CONFIG_ZARLINK_SLIC_VE890 is not set
 # CONFIG_ZARLINK_SLIC_VE792 is not set
 CONFIG_MV_TDM_PCM_CLK_8MHZ=y
 # CONFIG_MV_TDM_PCM_CLK_4MHZ is not set
 # CONFIG_MV_TDM_PCM_CLK_2MHZ is not set
-# CONFIG_MV_TDM_USE_INTERNAL_PCLK_SOURCE is not set
-# CONFIG_MV_TDM_USE_EXTERNAL_PCLK_SOURCE is not set
-CONFIG_MV_TDM_USE_DCO=y
-CONFIG_MV_TDM_DUMMY=y
 # CONFIG_MV_PHONE_USE_IRQ_PROCESSING is not set
-# CONFIG_MV_PHONE_USE_FIQ_PROCESSING is not set
+# CONFIG_MV_TDM_USE_EXTERNAL_PCLK_SOURCE is not set
 CONFIG_MV_PHONE_USE_SLIC_LIBS=y
-# CONFIG_MV_TDM_EXT_STATS is not set
-
-#
-# SoC CUST support
-#
-CONFIG_MV_CUST=y
-CONFIG_MV_CUST_IGMP_HANDLE=y
-CONFIG_MV_CUST_MLD_HANDLE=y
-CONFIG_MV_CUST_LPBK_DETECT_HANDLE=y
-# CONFIG_MV_CUST_UDP_SAMPLE_HANDLE is not set
-CONFIG_MV_CUST_FLOW_MAP_HANDLE=y
 
 #
 # SoC PON support
 #
 CONFIG_MV_PON_TCONTS=8
-CONFIG_MV_EPON_LLID=1
-# CONFIG_PON_Z1 is not set
-CONFIG_PON_Z2=y
-# CONFIG_PON_FPGA is not set
-CONFIG_MV_GPON=y
-CONFIG_MV_EPON=y
+# CONFIG_MV_GPON is not set
+# CONFIG_MV_EPON is not set
+CONFIG_SCSI_MVSATA=y
 
 #
-# GPON Driver Options
+# Sata options
 #
-CONFIG_MV_GPON_HW_INTERRUPT=y
-CONFIG_MV_GPON_DEBUG_PRINT=y
-CONFIG_MV_GPON_STATIC_GEM_PORT=y
-# CONFIG_MV_GPON_PERFORMANCE_CHECK is not set
-
-#
-# EPON Driver Options
-#
-CONFIG_MV_EPON_HW_INTERRUPT=y
-CONFIG_MV_EPON_DBA_LOW_RATE_VALUE=2000
-CONFIG_MV_EPON_DBA_LOW_RATE_THRESHOLD=20
-CONFIG_MV_EPON_DBA_LOW_RATE_CONST_VALUE=256
-CONFIG_MV_EPON_DBA_HIGH_RATE_THRESHOLD=8192
-CONFIG_MV_EPON_DBA_HIGH_RATE_VALUE=2000
-
-#
-# SoC TPM support
-#
-CONFIG_MV_TPM=y
-
-#
-# TPM Driver Options
-#
-# CONFIG_MV_TPM_Z1_VER is not set
-CONFIG_MV_TPM_Z2_VER=y
-# CONFIG_MV_TPM_FPGA_VER is not set
-CONFIG_MV_TPM_INT_LOCK=y
-# CONFIG_MV_TPM_DEBUG_PRINT is not set
-# CONFIG_MV_TPM_SFS_2_IOCTL is not set
-CONFIG_MV_TPM_SYSFS_HELP=y
-
-#
-# SoC MAC learning support
-#
-CONFIG_MV_MAC_LEARN=y
+# CONFIG_MV_SATA_SUPPORT_ATAPI is not set
+CONFIG_MV_SATA_ENABLE_1MB_IOS=y
+CONFIG_SATA_NO_DEBUG=y
+# CONFIG_SATA_DEBUG_ON_ERROR is not set
+# CONFIG_SATA_FULL_DEBUG is not set
 # CONFIG_PCIE_VIRTUAL_BRIDGE_SUPPORT is not set
-CONFIG_MV_UART_POLLING_MODE=y
+# CONFIG_MV_UART_POLLING_MODE is not set
 # CONFIG_MV_PRINTK_SLICE_SUPPORT is not set
-CONFIG_MV_DRAM_DEFAULT_ACCESS_CFG=y
-# CONFIG_MV_DRAM_FASTPATH_ACCESS_CFG is not set
-# CONFIG_MV_DRAM_XBAR_ACCESS_CFG is not set
 CONFIG_ARCH_FEROCEON=y
 
 #
 # Processor Type
 #
 CONFIG_CPU_32=y
-CONFIG_CPU_FEROCEON=y
-# CONFIG_CPU_FEROCEON_OLD_ID is not set
+CONFIG_CPU_ARM926T=y
 CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_ABRT_EV5TJ=y
 CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_FEROCEON=y
-CONFIG_CPU_TLB_FEROCEON=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
 
@@ -511,63 +405,43 @@
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
-CONFIG_OUTER_CACHE=y
-CONFIG_CACHE_FEROCEON_L2=y
-# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
-CONFIG_ARM_L1_CACHE_SHIFT=5
-CONFIG_ARM_ARMV5_L2_CACHE_COHERENCY_FIX=y
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
 
 #
 # Bus support
 #
 CONFIG_PCI=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-# CONFIG_PCI_MSI is not set
-CONFIG_PCI_LEGACY=y
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_IOV is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
 # CONFIG_PCCARD is not set
 
 #
 # Kernel Features
 #
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
+# CONFIG_NO_IDLE_HZ is not set
 CONFIG_HZ=100
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
-# CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set
-CONFIG_REORDER=y
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_HIGHMEM is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
+# CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_LEDS is not set
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_LEDS=y
+# CONFIG_LEDS_TIMER is not set
+# CONFIG_LEDS_CPU is not set
 CONFIG_ALIGNMENT_TRAP=y
-CONFIG_UACCESS_WITH_MEMCPY=y
 
 #
 # Boot options
@@ -579,26 +453,21 @@
 # CONFIG_KEXEC is not set
 
 #
-# CPU Power Management
+# CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
 # CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_FEROCEON_KW2 is not set
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_FREQ_FEROCEON_KW2=y
 
 #
 # Floating point emulation
@@ -615,8 +484,6 @@
 # Userspace binary formats
 #
 CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_HAVE_AOUT=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 
@@ -624,12 +491,16 @@
 # Power management options
 #
 # CONFIG_PM is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
+
+#
+# Networking
+#
 CONFIG_NET=y
 
 #
 # Networking options
 #
+# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
@@ -637,7 +508,6 @@
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -660,16 +530,19 @@
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
 CONFIG_IPV6=y
 # CONFIG_IPV6_PRIVACY is not set
 # CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_INET6_AH is not set
 # CONFIG_INET6_ESP is not set
 # CONFIG_INET6_IPCOMP is not set
@@ -764,13 +637,14 @@
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
-# CONFIG_MTD_OOPS is not set
 
 #
 # RAM/ROM/Flash chip drivers
 #
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_CFI=y
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -781,15 +655,22 @@
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
@@ -808,33 +689,30 @@
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_CMD="nand_mtd:0x200000@0x0(uboot)ro,0x400000@0x200000(uimageU),-@0x600000(rootfsU)"
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
+
+#
+# OneNAND Flash Device Drivers
+#
 # CONFIG_MTD_ONENAND is not set
 
 #
-# LPDDR flash memory drivers
+# Parallel port support
 #
-# CONFIG_MTD_LPDDR is not set
+# CONFIG_PARPORT is not set
 
 #
-# UBI - Unsorted block images
+# Plug and Play support
 #
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_PNPACPI is not set
 
 #
-# UBI debugging options
+# Block devices
 #
 # CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_PARPORT is not set
@@ -1067,12 +945,12 @@
 # CONFIG_APPLICOM is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
-CONFIG_DEVPORT=y
+
+#
+# I2C support
+#
 CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_HELPER_AUTO=y
 
 #
 # I2C Hardware Bus support
@@ -1095,6 +973,9 @@
 # CONFIG_I2C_SIS96X is not set
 # CONFIG_I2C_VIA is not set
 # CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_ISA is not set
+CONFIG_I2C_MV64XXX=y
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
@@ -1196,6 +1077,8 @@
 # CONFIG_AB3100_CORE is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
 
 #
 # Graphics support
@@ -1211,6 +1094,8 @@
 # Display device support
 #
 # CONFIG_DISPLAY_SUPPORT is not set
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 
 #
 # Console display driver support