mpc83xx: upgrade to kernel 2.6.33.3, enable rb333 support, sync config options, refresh kernel patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21256 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 318 insertions, 57 deletions

diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile
index 9fa36d4cfe..07f83e0467 100644
--- a/target/linux/mpc83xx/Makefile
+++ b/target/linux/mpc83xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=mpc83xx
 BOARDNAME:=Freescale MPC83xx
 FEATURES:=squashfs targz broken
 
-LINUX_VERSION:=2.6.31.12
+LINUX_VERSION:=2.6.33.3
 
 include $(INCLUDE_DIR)/target.mk
 
diff --git a/target/linux/mpc83xx/config-2.6.33 b/target/linux/mpc83xx/config-2.6.33
index a55e9ba4d3..910a52e9b9 100644
--- a/target/linux/mpc83xx/config-2.6.33
+++ b/target/linux/mpc83xx/config-2.6.33
@@ -1,7 +1,7 @@
 # CONFIG_40x is not set
 # CONFIG_44x is not set
 CONFIG_6xx=y
-# CONFIG_8xxx_WDT is not set
+CONFIG_8xxx_WDT=y
 # CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_ALTIVEC is not set
 # CONFIG_AMIGAONE is not set
@@ -19,38 +19,124 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_ARPD is not set
 # CONFIG_ASP834x is not set
 CONFIG_ATA=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_BITREVERSE=y
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_SD=y
 # CONFIG_BOOTX_TEXT is not set
 CONFIG_BOUNCE=y
-CONFIG_BRIDGE=m
 # CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BUG is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_CMDLINE="console=ttyS0,115200"
+CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2"
 CONFIG_CMDLINE_BOOL=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DECOMPRESS_LZMA=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_CRC16=m
+CONFIG_CRC7=m
+CONFIG_CRC_CCITT=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_ZLIB=m
+# CONFIG_DEBUG_FS is not set
+CONFIG_DEFAULT_CFQ=y
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
 # CONFIG_DEFAULT_SECURITY_SMACK is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_DEFAULT_WESTWOOD is not set
 CONFIG_DEVPORT=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_ENGINE=y
 CONFIG_DTC=y
 # CONFIG_E200 is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EMBEDDED6xx is not set
-CONFIG_EXTRA_TARGETS="uImage.fit.mpc8377_wlan"
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_FAT_FS=m
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_FIXED_PHY=y
 CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_FSL_EMB_PERFMON is not set
+CONFIG_FSL_DMA=y
+CONFIG_FSL_EMB_PERFMON=y
+CONFIG_FSL_GTM=y
+CONFIG_FSL_LBC=y
 CONFIG_FSL_PCI=y
 CONFIG_FSL_PQ_MDIO=y
 CONFIG_FSL_SOC=y
 # CONFIG_FSL_ULI1575 is not set
 # CONFIG_FSNOTIFY is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_ATOMIC64=y
-CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CMOS_UPDATE=y
@@ -63,9 +149,11 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_NVRAM=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_GENERIC_TIME_VSYSCALL=y
-# CONFIG_GEN_RTC is not set
+CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC_X is not set
 CONFIG_GIANFAR=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_DEVICE=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -90,13 +178,28 @@ CONFIG_HAVE_LMB=y
 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_PERF_EVENTS=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM is not set
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_INITRAMFS_SOURCE=""
+CONFIG_I2C=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_IFB=y
+CONFIG_INET_AH=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_LRO=y
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_TUNNEL=m
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
@@ -125,58 +228,168 @@ CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_INPUT=y
+# CONFIG_INPUT_MISC is not set
 # CONFIG_IOMMU_HELPER is not set
+CONFIG_IOSCHED_CFQ=y
 CONFIG_IPIC=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_IP_SCTP=m
 # CONFIG_IRQSTACKS is not set
 CONFIG_IRQ_PER_CPU=y
 CONFIG_ISA_DMA_API=y
-# CONFIG_ISDN_CAPI is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_ISDN_I4L is not set
+# CONFIG_ISDN is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_LZMA is not set
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_JFFS2_ZLIB=y
 CONFIG_KERNEL_START=0xc0000000
 # CONFIG_KMETER1 is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LLC=m
+CONFIG_LIBCRC32C=y
+CONFIG_LOG_BUF_SHIFT=15
 CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MAX_ACTIVE_REGIONS=32
+# CONFIG_MCU_MPC8349EMITX is not set
+CONFIG_MDIO_BITBANG=y
+CONFIG_MDIO_GPIO=y
 # CONFIG_MMIO_NVRAM is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 CONFIG_MPC831x_RDB=y
-# CONFIG_MPC832x_MDS is not set
+CONFIG_MPC832x_MDS=y
 CONFIG_MPC832x_RDB=y
-# CONFIG_MPC834x_ITX is not set
-# CONFIG_MPC834x_MDS is not set
-# CONFIG_MPC836x_MDS is not set
-# CONFIG_MPC836x_RDK is not set
-# CONFIG_MPC837x_MDS is not set
+CONFIG_MPC834x_ITX=y
+CONFIG_MPC834x_MDS=y
+CONFIG_MPC836x_MDS=y
+CONFIG_MPC836x_RDK=y
+CONFIG_MPC837x_MDS=y
 CONFIG_MPC837x_RDB=y
-# CONFIG_MPC8xxx_GPIO is not set
+CONFIG_MPC8xxx_GPIO=y
 # CONFIG_MPIC is not set
 # CONFIG_MPIC_WEIRD is not set
+CONFIG_MSDOS_FS=m
+CONFIG_MTD_BLOCK2MTD=y
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_CONCAT=y
 CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_FSL_ELBC is not set
-# CONFIG_MTD_NAND_FSL_UPM is not set
+CONFIG_MTD_NAND_FSL_ELBC=y
+CONFIG_MTD_NAND_FSL_UPM=y
 CONFIG_MTD_NAND_RB_PPC=y
 CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NET_ACT_GACT=m
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_SIMP=m
+# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_NET_DMA is not set
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPIP=m
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_TEQL=m
+# CONFIG_NEW_LEDS is not set
+CONFIG_NLS=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
 CONFIG_NO_HZ=y
 CONFIG_NR_IRQS=512
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
 CONFIG_OF=y
 CONFIG_OF_DEVICE=y
 CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=m
 CONFIG_OF_MDIO=y
+CONFIG_OF_SPI=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
-CONFIG_PATA_RB_PPC=m
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_PATA_RB_PPC=y
 CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEPORTBUS=y
+# CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_MSI=y
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PPC=y
@@ -211,6 +424,7 @@ CONFIG_PPC_MPC831x=y
 CONFIG_PPC_MPC832x=y
 CONFIG_PPC_MPC834x=y
 CONFIG_PPC_MPC837x=y
+CONFIG_PPC_MSI_BITMAP=y
 CONFIG_PPC_OF=y
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 CONFIG_PPC_PCI_CHOICE=y
@@ -222,44 +436,89 @@ CONFIG_PPC_UDBG_16550=y
 # CONFIG_PQ2ADS is not set
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PROC_DEVICETREE=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_QE_GPIO=y
 CONFIG_QUICC_ENGINE=y
 CONFIG_RB_IOMAP=y
 CONFIG_RB_PPC=y
+CONFIG_RFKILL=m
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_SATA_FSL is not set
 # CONFIG_SBC834x is not set
 CONFIG_SCHED_HRTICK=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCSI=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-# CONFIG_SERIAL_8250_MANY_PORTS is not set
-# CONFIG_SERIAL_8250_RSA is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SCSI_LOWLEVEL is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_PROC_FS is not set
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_PCI=y
 # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
-CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_SERIAL_QE is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_SERIAL_QE=y
+CONFIG_SERIO=y
+# CONFIG_SERIO_ALTERA_PS2 is not set
+CONFIG_SERIO_I8042=y
+# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_PCIPS2=y
+CONFIG_SERIO_RAW=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_XILINX_XPS_PS2 is not set
+CONFIG_SIMPLE_GPIO=y
 CONFIG_SPARSE_IRQ=y
-CONFIG_STP=m
+CONFIG_SPI=y
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MPC8xxx=y
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SQUASHFS is not set
 # CONFIG_SWAP is not set
 # CONFIG_SWIOTLB is not set
 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TAU is not set
-# CONFIG_TINY_RCU is not set
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TREE_RCU=y
-# CONFIG_UCC_GETH is not set
+CONFIG_TUN=m
+# CONFIG_UBIFS_FS is not set
+CONFIG_UCC=y
+CONFIG_UCC_FAST=y
+CONFIG_UCC_GETH=y
+CONFIG_UCC_SLOW=y
+# CONFIG_UCC_TDM is not set
+# CONFIG_UGETH_TX_ON_DEMAND is not set
+CONFIG_VFAT_FS=m
+CONFIG_VIA_VELOCITY=y
 CONFIG_VITESSE_PHY=y
 CONFIG_VITESSE_PHY_8601_SKEW=y
-CONFIG_VLAN_8021Q=m
+CONFIG_WAN_ROUTER=m
 CONFIG_WORD_SIZE=32
-# CONFIG_YAFFS_9BYTE_TAGS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_YAFFS_9BYTE_TAGS=y
 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
 CONFIG_YAFFS_AUTO_YAFFS2=y
 # CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
 # CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-# CONFIG_YAFFS_DOES_ECC is not set
 CONFIG_YAFFS_FS=y
 CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
 CONFIG_YAFFS_YAFFS1=y
diff --git a/target/linux/mpc83xx/image/Makefile b/target/linux/mpc83xx/image/Makefile
index 9337016e08..53ab7746e1 100644
--- a/target/linux/mpc83xx/image/Makefile
+++ b/target/linux/mpc83xx/image/Makefile
@@ -7,13 +7,15 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+
 define Image/Prepare
 	$(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/mpc8377_wlan.dts > $(BIN_DIR)/openwrt-mpc83xx-mpc8377_wlan.dtb
 endef
 
 define Image/BuildKernel
-	cp $(LINUX_DIR)/arch/powerpc/boot/dtbImage.rb600.elf $(BIN_DIR)/$(IMG_PREFIX)-rb600.elf
-	cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+	cp $(LINUX_DIR)/arch/powerpc/boot/dtbImage.rb600.elf $(BIN_DIR)/openwrt-$(BOARD)-rb600.elf
+	cp $(LINUX_DIR)/arch/powerpc/boot/dtbImage.rb333.elf $(BIN_DIR)/openwrt-$(BOARD)-rb333.elf
+	cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
 endef
 
 define Image/Build
@@ -25,7 +27,7 @@ define Image/Build/squashfs
 	( \
 		dd if=$(LINUX_DIR)/arch/powerpc/boot/uImage bs=3072k conv=sync; \
 		dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
-	) > $(BIN_DIR)/$(IMG_PREFIX)-mpc8377_wlan-$(1).img
+	) > $(BIN_DIR)/openwrt-$(BOARD)-mpc8377_wlan-$(1).img
 endef
 
 $(eval $(call BuildImage))
diff --git a/target/linux/mpc83xx/patches-2.6.33/019-powerpc_create_fit_uImages.patch b/target/linux/mpc83xx/patches-2.6.33/019-powerpc_create_fit_uImages.patch
index d53c817573..251a05372c 100644
--- a/target/linux/mpc83xx/patches-2.6.33/019-powerpc_create_fit_uImages.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/019-powerpc_create_fit_uImages.patch
@@ -70,10 +70,12 @@
      # miboot and U-boot want just the bare bits, not an ELF binary
      ext=bin
      objflags="-O binary"
-@@ -277,6 +280,21 @@ uboot)
+@@ -275,6 +278,21 @@ uboot)
+     if [ -z "$cacheit" ]; then
+ 	rm -f "$vmz"
      fi
-     exit 0
-     ;;
++    exit 0
++    ;;
 +uboot.fit)
 +    rm -f "$ofile"
 +    ${MKITS} -A ppc -C gzip -a $membase -e $membase -v $version \
@@ -87,8 +89,6 @@
 +    if [ -z "$cacheit" ]; then
 +	rm -f "$vmz"
 +    fi
-+    exit 0
-+    ;;
+     exit 0
+     ;;
  esac
- 
- addsec() {
diff --git a/target/linux/mpc83xx/patches-2.6.33/100-vitesse_8601.patch b/target/linux/mpc83xx/patches-2.6.33/100-vitesse_8601.patch
index 0eb2880f98..3ac3211ab5 100644
--- a/target/linux/mpc83xx/patches-2.6.33/100-vitesse_8601.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/100-vitesse_8601.patch
@@ -58,7 +58,7 @@
  static int vsc824x_ack_interrupt(struct phy_device *phydev)
  {
  	int err = 0;
-@@ -143,6 +172,21 @@ static struct phy_driver vsc8244_driver 
+@@ -143,6 +172,21 @@ static struct phy_driver vsc8244_driver
  	.driver 	= { .owner = THIS_MODULE,},
  };