kernel: refresh patches for 2.6.33.2, and drop md5sum for older 2.6.32 kernels

SVN-Revision: 21081

26 files changed, 114 insertions, 118 deletions

diff --git a/target/linux/mpc83xx/patches-2.6.33/001-boot_Makefile.patch b/target/linux/mpc83xx/patches-2.6.33/001-boot_Makefile.patch
index db9ceb3..b1cb20b 100644
--- a/target/linux/mpc83xx/patches-2.6.33/001-boot_Makefile.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/001-boot_Makefile.patch
@@ -1,6 +1,6 @@
---- a/arch/powerpc/boot/Makefile	
-+++ b/arch/powerpc/boot/Makefile	
-@@ -72,7 +72,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -73,7 +73,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
  		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \
  		cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
  		fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \
@@ -8,8 +8,8 @@
 +		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c rb600.c \
  		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
  		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
- 		cuboot-acadia.c cuboot-amigaone.c
-@@ -229,6 +229,7 @@ image-$(CONFIG_MPC834x_ITX)		+= cuImage.
+ 		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
+@@ -232,6 +232,7 @@ image-$(CONFIG_MPC834x_ITX)		+= cuImage.
  image-$(CONFIG_MPC834x_MDS)		+= cuImage.mpc834x_mds
  image-$(CONFIG_MPC836x_MDS)		+= cuImage.mpc836x_mds
  image-$(CONFIG_ASP834x)			+= dtbImage.asp834x-redboot
diff --git a/target/linux/mpc83xx/patches-2.6.33/002-boot_dts_rb600.patch b/target/linux/mpc83xx/patches-2.6.33/002-boot_dts_rb600.patch
index 92afce2..44c0319 100644
--- a/target/linux/mpc83xx/patches-2.6.33/002-boot_dts_rb600.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/002-boot_dts_rb600.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/boot/dts/rb600.dts	
-+++ b/arch/powerpc/boot/dts/rb600.dts	
+--- /dev/null
++++ b/arch/powerpc/boot/dts/rb600.dts
 @@ -0,0 +1,242 @@
 +/*
 + * RouterBOARD 600 series Device Tree Source
diff --git a/target/linux/mpc83xx/patches-2.6.33/003-boot_rb600.patch b/target/linux/mpc83xx/patches-2.6.33/003-boot_rb600.patch
index be82131..c199bdf 100644
--- a/target/linux/mpc83xx/patches-2.6.33/003-boot_rb600.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/003-boot_rb600.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/boot/rb600.c	
-+++ b/arch/powerpc/boot/rb600.c	
+--- /dev/null
++++ b/arch/powerpc/boot/rb600.c
 @@ -0,0 +1,80 @@
 +/*
 + * The RouterBOARD platform -- for booting RB600(A) RouterBOARDs.
diff --git a/target/linux/mpc83xx/patches-2.6.33/004-boot_wrapper.patch b/target/linux/mpc83xx/patches-2.6.33/004-boot_wrapper.patch
index fd8622f..91c8f03 100644
--- a/target/linux/mpc83xx/patches-2.6.33/004-boot_wrapper.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/004-boot_wrapper.patch
@@ -1,6 +1,6 @@
---- a/arch/powerpc/boot/wrapper	
-+++ b/arch/powerpc/boot/wrapper	
-@@ -201,7 +201,7 @@ ps3)
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper
+@@ -205,7 +205,7 @@ ps3)
      isection=.kernel:initrd
      link_address=''
      ;;
diff --git a/target/linux/mpc83xx/patches-2.6.33/005-kernel_Makefile.patch b/target/linux/mpc83xx/patches-2.6.33/005-kernel_Makefile.patch
index 392f62a..f88af25 100644
--- a/target/linux/mpc83xx/patches-2.6.33/005-kernel_Makefile.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/005-kernel_Makefile.patch
@@ -1,6 +1,6 @@
---- a/arch/powerpc/kernel/Makefile	
-+++ b/arch/powerpc/kernel/Makefile	
-@@ -97,9 +97,11 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= f
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile
+@@ -105,9 +105,11 @@ obj32-$(CONFIG_PPC_PERF_CTRS)	+= mpc7450
  
  obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
  
@@ -11,4 +11,4 @@
 +endif
  
  obj-$(CONFIG_PPC64)		+= $(obj64-y)
- 
+ obj-$(CONFIG_PPC32)		+= $(obj32-y)
diff --git a/target/linux/mpc83xx/patches-2.6.33/006-platforms_83xx_Kconfig.patch b/target/linux/mpc83xx/patches-2.6.33/006-platforms_83xx_Kconfig.patch
index 18f824b..01c5e4e 100644
--- a/target/linux/mpc83xx/patches-2.6.33/006-platforms_83xx_Kconfig.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/006-platforms_83xx_Kconfig.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/platforms/83xx/Kconfig	
-+++ b/arch/powerpc/platforms/83xx/Kconfig	
+--- a/arch/powerpc/platforms/83xx/Kconfig
++++ b/arch/powerpc/platforms/83xx/Kconfig
 @@ -30,6 +30,15 @@ config MPC832x_RDB
  	help
  	  This option enables support for the MPC8323 RDB board.
diff --git a/target/linux/mpc83xx/patches-2.6.33/007-platforms_83xx_rbppc.patch b/target/linux/mpc83xx/patches-2.6.33/007-platforms_83xx_rbppc.patch
index 25bfc42..71dcf60 100644
--- a/target/linux/mpc83xx/patches-2.6.33/007-platforms_83xx_rbppc.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/007-platforms_83xx_rbppc.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/platforms/83xx/Makefile	
-+++ b/arch/powerpc/platforms/83xx/Makefile	
+--- a/arch/powerpc/platforms/83xx/Makefile
++++ b/arch/powerpc/platforms/83xx/Makefile
 @@ -6,6 +6,7 @@ obj-$(CONFIG_SUSPEND)		+= suspend.o susp
  obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o
  obj-$(CONFIG_MPC831x_RDB)	+= mpc831x_rdb.o
diff --git a/target/linux/mpc83xx/patches-2.6.33/008-platforms_Kconfig.patch b/target/linux/mpc83xx/patches-2.6.33/008-platforms_Kconfig.patch
index 56f47ea..52f7291 100644
--- a/target/linux/mpc83xx/patches-2.6.33/008-platforms_Kconfig.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/008-platforms_Kconfig.patch
@@ -1,6 +1,6 @@
---- a/arch/powerpc/platforms/Kconfig	
-+++ b/arch/powerpc/platforms/Kconfig	
-@@ -142,6 +142,10 @@ config GENERIC_IOMAP
+--- a/arch/powerpc/platforms/Kconfig
++++ b/arch/powerpc/platforms/Kconfig
+@@ -147,6 +147,10 @@ config GENERIC_IOMAP
  	bool
  	default n
  
diff --git a/target/linux/mpc83xx/patches-2.6.33/009-sysdev_Makefile.patch b/target/linux/mpc83xx/patches-2.6.33/009-sysdev_Makefile.patch
index 99b2644..c0d09ca 100644
--- a/target/linux/mpc83xx/patches-2.6.33/009-sysdev_Makefile.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/009-sysdev_Makefile.patch
@@ -1,6 +1,6 @@
---- a/arch/powerpc/sysdev/Makefile	
-+++ b/arch/powerpc/sysdev/Makefile	
-@@ -50,3 +50,5 @@ obj-$(CONFIG_UCODE_PATCH)	+= micropatch.
+--- a/arch/powerpc/sysdev/Makefile
++++ b/arch/powerpc/sysdev/Makefile
+@@ -57,3 +57,5 @@ obj-$(CONFIG_PPC_MPC52xx)	+= mpc5xxx_clo
  ifeq ($(CONFIG_SUSPEND),y)
  obj-$(CONFIG_6xx)		+= 6xx-suspend.o
  endif
diff --git a/target/linux/mpc83xx/patches-2.6.33/010-sysdev_rb_iomap.patch b/target/linux/mpc83xx/patches-2.6.33/010-sysdev_rb_iomap.patch
index f8e9c2a..43c44ba 100644
--- a/target/linux/mpc83xx/patches-2.6.33/010-sysdev_rb_iomap.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/010-sysdev_rb_iomap.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/sysdev/rb_iomap.c	
-+++ b/arch/powerpc/sysdev/rb_iomap.c	
+--- /dev/null
++++ b/arch/powerpc/sysdev/rb_iomap.c
 @@ -0,0 +1,223 @@
 +#include <linux/init.h>
 +#include <linux/pci.h>
diff --git a/target/linux/mpc83xx/patches-2.6.33/011-drivers_ata_Kconfig.patch b/target/linux/mpc83xx/patches-2.6.33/011-drivers_ata_Kconfig.patch
index 6d0701a..bd63e98 100644
--- a/target/linux/mpc83xx/patches-2.6.33/011-drivers_ata_Kconfig.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/011-drivers_ata_Kconfig.patch
@@ -1,8 +1,8 @@
---- a/drivers/ata/Kconfig	
-+++ b/drivers/ata/Kconfig	
-@@ -734,5 +734,12 @@ config PATA_BF54X
+--- a/drivers/ata/Kconfig
++++ b/drivers/ata/Kconfig
+@@ -799,5 +799,12 @@ config PATA_MACIO
+           different chipsets, though generally, MacIO is one of them.
  
- 	  If unsure, say N.
  
 +config PATA_RB_PPC
 +	tristate "MikroTik RB600 PATA support"
diff --git a/target/linux/mpc83xx/patches-2.6.33/012-drivers_ata_Makefile.patch b/target/linux/mpc83xx/patches-2.6.33/012-drivers_ata_Makefile.patch
index 2a4b383..5205a3d 100644
--- a/target/linux/mpc83xx/patches-2.6.33/012-drivers_ata_Makefile.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/012-drivers_ata_Makefile.patch
@@ -1,7 +1,7 @@
---- a/drivers/ata/Makefile	
-+++ b/drivers/ata/Makefile	
-@@ -73,6 +73,7 @@ obj-$(CONFIG_PATA_OCTEON_CF)	+= pata_oct
- obj-$(CONFIG_PATA_PLATFORM)	+= pata_platform.o
+--- a/drivers/ata/Makefile
++++ b/drivers/ata/Makefile
+@@ -79,6 +79,7 @@ obj-$(CONFIG_PATA_PLATFORM)	+= pata_plat
+ obj-$(CONFIG_PATA_AT91)	+= pata_at91.o
  obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_of_platform.o
  obj-$(CONFIG_PATA_ICSIDE)	+= pata_icside.o
 +obj-$(CONFIG_PATA_RB_PPC)	+= pata_rbppc_cf.o
diff --git a/target/linux/mpc83xx/patches-2.6.33/013-drivers_ata_pata_rbppc_cf.patch b/target/linux/mpc83xx/patches-2.6.33/013-drivers_ata_pata_rbppc_cf.patch
index 487fd78..d71615c 100644
--- a/target/linux/mpc83xx/patches-2.6.33/013-drivers_ata_pata_rbppc_cf.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/013-drivers_ata_pata_rbppc_cf.patch
@@ -1,5 +1,5 @@
---- a/drivers/ata/pata_rbppc_cf.c	
-+++ b/drivers/ata/pata_rbppc_cf.c	
+--- /dev/null
++++ b/drivers/ata/pata_rbppc_cf.c
 @@ -0,0 +1,701 @@
 +/*
 + * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
diff --git a/target/linux/mpc83xx/patches-2.6.33/014-drivers_mtd_nand_Kconfig.patch b/target/linux/mpc83xx/patches-2.6.33/014-drivers_mtd_nand_Kconfig.patch
index d655005..64bfe5c 100644
--- a/target/linux/mpc83xx/patches-2.6.33/014-drivers_mtd_nand_Kconfig.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/014-drivers_mtd_nand_Kconfig.patch
@@ -1,6 +1,6 @@
---- a/drivers/mtd/nand/Kconfig	
-+++ b/drivers/mtd/nand/Kconfig	
-@@ -380,6 +380,13 @@ config MTD_NAND_PLATFORM
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -409,6 +409,13 @@ config MTD_NAND_PLATFORM
  	  devices. You will need to provide platform-specific functions
  	  via platform_data.
  
diff --git a/target/linux/mpc83xx/patches-2.6.33/015-drivers_mtd_nand_Makefile.patch b/target/linux/mpc83xx/patches-2.6.33/015-drivers_mtd_nand_Makefile.patch
index a5cc21c..b4e96e6 100644
--- a/target/linux/mpc83xx/patches-2.6.33/015-drivers_mtd_nand_Makefile.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/015-drivers_mtd_nand_Makefile.patch
@@ -1,6 +1,6 @@
---- a/drivers/mtd/nand/Makefile	
-+++ b/drivers/mtd/nand/Makefile	
-@@ -30,6 +30,7 @@ obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)	+= 
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -30,6 +30,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270)		+= cmx27
  obj-$(CONFIG_MTD_NAND_PXA3xx)		+= pxa3xx_nand.o
  obj-$(CONFIG_MTD_NAND_TMIO)		+= tmio_nand.o
  obj-$(CONFIG_MTD_NAND_PLATFORM)		+= plat_nand.o
diff --git a/target/linux/mpc83xx/patches-2.6.33/016-drivers_mtd_nand_rbppc_nand.patch b/target/linux/mpc83xx/patches-2.6.33/016-drivers_mtd_nand_rbppc_nand.patch
index 9358f7b..83cb507 100644
--- a/target/linux/mpc83xx/patches-2.6.33/016-drivers_mtd_nand_rbppc_nand.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/016-drivers_mtd_nand_rbppc_nand.patch
@@ -1,5 +1,5 @@
---- a/drivers/mtd/nand/rbppc_nand.c	
-+++ b/drivers/mtd/nand/rbppc_nand.c	
+--- /dev/null
++++ b/drivers/mtd/nand/rbppc_nand.c
 @@ -0,0 +1,252 @@
 +/*
 + * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
diff --git a/target/linux/mpc83xx/patches-2.6.33/017-platforms_83xx_rbppc.patch b/target/linux/mpc83xx/patches-2.6.33/017-platforms_83xx_rbppc.patch
index 7370ff5..67cc125 100644
--- a/target/linux/mpc83xx/patches-2.6.33/017-platforms_83xx_rbppc.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/017-platforms_83xx_rbppc.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/platforms/83xx/rbppc.c	
-+++ b/arch/powerpc/platforms/83xx/rbppc.c	
+--- /dev/null
++++ b/arch/powerpc/platforms/83xx/rbppc.c
 @@ -0,0 +1,316 @@
 +/*
 + * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
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 52899ce..d53c817 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
@@ -30,7 +30,7 @@
  treeImage.*
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -308,6 +308,9 @@ $(obj)/zImage.iseries: vmlinux
+@@ -311,6 +311,9 @@ $(obj)/zImage.iseries: vmlinux
  $(obj)/uImage: vmlinux $(wrapperbits)
  	$(call if_changed,wrap,uboot)
  
@@ -40,7 +40,7 @@
  $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
  	$(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
  
-@@ -347,7 +350,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
+@@ -350,7 +353,7 @@ install: $(CONFIGURE) $(addprefix $(obj)
  
  # anything not in $(targets)
  clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
@@ -70,7 +70,7 @@
      # miboot and U-boot want just the bare bits, not an ELF binary
      ext=bin
      objflags="-O binary"
-@@ -273,6 +276,21 @@ uboot)
+@@ -277,6 +280,21 @@ uboot)
      fi
      exit 0
      ;;
diff --git a/target/linux/mpc83xx/patches-2.6.33/020-rb333-support.patch b/target/linux/mpc83xx/patches-2.6.33/020-rb333-support.patch
index caffe85..2cab61c 100644
--- a/target/linux/mpc83xx/patches-2.6.33/020-rb333-support.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/020-rb333-support.patch
@@ -6,7 +6,7 @@
   * Copyright (C) 2008-2009 Noah Fontes <nfontes@transtruct.org>
   * Copyright (C) 2009 Michael Guntsche <mike@it-loops.com>
   * Copyright (C) Mikrotik 2007
-@@ -167,6 +168,9 @@
+@@ -167,6 +168,9 @@ static int __init rbppc_probe(void)
  	if (!model)
  		return 0;
  
@@ -16,7 +16,7 @@
  	if (strcmp(model, "RB600") == 0)
  		return 1;
  
-@@ -227,6 +231,9 @@
+@@ -227,6 +231,9 @@ static void __init rbppc_beeper_init(str
  #define SBIT(x) (0x80000000 >> (x))
  #define DBIT(x, y) ((y) << (32 - (((x % 16) + 1) * 2)))
  
@@ -26,7 +26,7 @@
  #define SICRL_RB600(x) ((x) + (0x114 >> 2))
  #define GPIO_DIR_RB600(x) ((x) + (0xc00 >> 2))
  #define GPIO_DATA_RB600(x) ((x) + (0xc08 >> 2))
-@@ -234,14 +241,38 @@
+@@ -234,14 +241,38 @@ static void __init rbppc_beeper_init(str
  static void rbppc_restart(char *cmd)
  {
  	__be32 __iomem *reg;
@@ -73,7 +73,7 @@
  }
  
  static void rbppc_halt(void)
-@@ -301,10 +332,10 @@
+@@ -301,10 +332,10 @@ static int __init rbppc_declare_of_platf
  
  	return 0;
  }
@@ -86,7 +86,7 @@
  	.probe 				= rbppc_probe,
  	.setup_arch 			= rbppc_setup_arch,
  	.init_IRQ 			= rbppc_init_IRQ,
-@@ -314,3 +345,31 @@
+@@ -314,3 +345,31 @@ define_machine(rb600) {
  	.time_init 			= mpc83xx_time_init,
  	.calibrate_decr			= generic_calibrate_decr,
  };
@@ -118,9 +118,9 @@
 +DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_pcibridge)
 +DECLARE_PCI_FIXUP_HEADER(0x3388, 0x0021, fixup_rb604)
 +
---- a/drivers/mtd/nand/Kconfig	2010-03-19 12:30:12.000000000 +0200
-+++ b/drivers/mtd/nand/Kconfig	2010-03-19 12:30:28.000000000 +0200
-@@ -387,11 +387,11 @@
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -410,11 +410,11 @@ config MTD_NAND_PLATFORM
  	  via platform_data.
  
  config MTD_NAND_RB_PPC
@@ -134,9 +134,9 @@
  
  config MTD_ALAUDA
  	tristate "MTD driver for Olympus MAUSB-10 and Fujifilm DPC-R1"
---- a/drivers/mtd/nand/rbppc_nand.c	2010-03-19 12:43:48.000000000 +0200
-+++ b/drivers/mtd/nand/rbppc_nand.c	2010-03-19 12:44:17.000000000 +0200
-@@ -126,7 +126,7 @@
+--- a/drivers/mtd/nand/rbppc_nand.c
++++ b/drivers/mtd/nand/rbppc_nand.c
+@@ -126,7 +126,7 @@ static int rbppc_nand_probe(struct of_de
  	void *baddr;
  	const unsigned *rdy, *nce, *cle, *ale;
  
@@ -145,7 +145,7 @@
  
  	info = kmalloc(sizeof(*info), GFP_KERNEL);
  
-@@ -244,7 +244,7 @@
+@@ -244,7 +244,7 @@ static void __exit rbppc_nand_exit(void)
  MODULE_AUTHOR("Mikrotikls SIA");
  MODULE_AUTHOR("Noah Fontes");
  MODULE_AUTHOR("Michael Guntsche");
@@ -154,9 +154,9 @@
  MODULE_LICENSE("GPL");
  MODULE_VERSION(DRV_VERSION);
  
---- a/arch/powerpc/platforms/83xx/Kconfig	2010-03-19 12:47:36.000000000 +0200
-+++ b/arch/powerpc/platforms/83xx/Kconfig	2010-03-19 12:50:07.000000000 +0200
-@@ -31,9 +31,10 @@
+--- a/arch/powerpc/platforms/83xx/Kconfig
++++ b/arch/powerpc/platforms/83xx/Kconfig
+@@ -31,13 +31,14 @@ config MPC832x_RDB
  	  This option enables support for the MPC8323 RDB board.
  
  config RB_PPC
@@ -168,18 +168,14 @@
  	select PPC_MPC834x
  	select RB_IOMAP
  	help
-@@ -38,7 +38,7 @@
- 	select PPC_MPC834x
- 	select RB_IOMAP
- 	help
 -	  This option enables support for MikroTik RouterBOARD 600 series boards.
 +	  This option enables support for MikroTik RouterBOARD 333/600 series boards.
  
  config MPC834x_MDS
  	bool "Freescale MPC834x MDS"
---- a/arch/powerpc/boot/Makefile	2010-03-18 21:32:32.000000000 +0200
-+++ b/arch/powerpc/boot/Makefile	2010-03-18 21:32:53.000000000 +0200
-@@ -72,7 +72,7 @@
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile
+@@ -73,7 +73,7 @@ src-plat := of.c cuboot-52xx.c cuboot-82
  		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \
  		cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
  		fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \
@@ -187,8 +183,8 @@
 +		cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c rb600.c rb333.c \
  		cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
  		virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c \
- 		cuboot-acadia.c cuboot-amigaone.c
-@@ -229,7 +229,8 @@
+ 		cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
+@@ -232,7 +232,8 @@ image-$(CONFIG_MPC834x_ITX)		+= cuImage.
  image-$(CONFIG_MPC834x_MDS)		+= cuImage.mpc834x_mds
  image-$(CONFIG_MPC836x_MDS)		+= cuImage.mpc836x_mds
  image-$(CONFIG_ASP834x)			+= dtbImage.asp834x-redboot
@@ -198,9 +194,9 @@
  
  # Board ports in arch/powerpc/platform/85xx/Kconfig
  image-$(CONFIG_MPC8540_ADS)		+= cuImage.mpc8540ads
---- a/arch/powerpc/boot/wrapper	2010-03-18 21:34:24.000000000 +0200
-+++ b/arch/powerpc/boot/wrapper	2010-03-18 21:34:45.000000000 +0200
-@@ -201,7 +201,7 @@
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper
+@@ -208,7 +208,7 @@ ps3)
      isection=.kernel:initrd
      link_address=''
      ;;
diff --git a/target/linux/mpc83xx/patches-2.6.33/021-boot_dts_rb333.patch b/target/linux/mpc83xx/patches-2.6.33/021-boot_dts_rb333.patch
index 33ff78f..f729bcc 100644
--- a/target/linux/mpc83xx/patches-2.6.33/021-boot_dts_rb333.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/021-boot_dts_rb333.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/boot/dts/rb333.dts	
-+++ b/arch/powerpc/boot/dts/rb333.dts	
+--- /dev/null
++++ b/arch/powerpc/boot/dts/rb333.dts
 @@ -0,0 +1,432 @@
 +
 +/*
diff --git a/target/linux/mpc83xx/patches-2.6.33/022-boot_rb333.patch b/target/linux/mpc83xx/patches-2.6.33/022-boot_rb333.patch
index 53bc28d..8c70a0b 100644
--- a/target/linux/mpc83xx/patches-2.6.33/022-boot_rb333.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/022-boot_rb333.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/boot/rb333.c	
-+++ b/arch/powerpc/boot/rb333.c	
+--- /dev/null
++++ b/arch/powerpc/boot/rb333.c
 @@ -0,0 +1,73 @@
 +/*
 + * The RouterBOARD platform -- for booting RB333 RouterBOARDs.
diff --git a/target/linux/mpc83xx/patches-2.6.33/023-wrapper-fix.patch b/target/linux/mpc83xx/patches-2.6.33/023-wrapper-fix.patch
index 457d782..9e06776 100644
--- a/target/linux/mpc83xx/patches-2.6.33/023-wrapper-fix.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/023-wrapper-fix.patch
@@ -1,6 +1,6 @@
---- a/arch/powerpc/boot/wrapper	
-+++ b/arch/powerpc/boot/wrapper	
-@@ -138,7 +138,7 @@
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper
+@@ -145,7 +145,7 @@ objflags=-S
  tmp=$tmpdir/zImage.$$.o
  ksection=.kernel:vmlinux.strip
  isection=.kernel:initrd
diff --git a/target/linux/mpc83xx/patches-2.6.33/024-quicc-engine-fixups.patch b/target/linux/mpc83xx/patches-2.6.33/024-quicc-engine-fixups.patch
index 3b631a5..73c6516 100644
--- a/target/linux/mpc83xx/patches-2.6.33/024-quicc-engine-fixups.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/024-quicc-engine-fixups.patch
@@ -1,7 +1,7 @@
 
---- a/arch/powerpc/platforms/83xx/rbppc.c	
-+++ b/arch/powerpc/platforms/83xx/rbppc.c	
-@@ -121,21 +121,16 @@
+--- a/arch/powerpc/platforms/83xx/rbppc.c
++++ b/arch/powerpc/platforms/83xx/rbppc.c
+@@ -121,21 +121,16 @@ static void __init rbppc_setup_arch(void
  #endif
  
  #ifdef CONFIG_QUICC_ENGINE
@@ -32,7 +32,7 @@
  
  }
  
-@@ -151,12 +146,16 @@
+@@ -151,12 +146,16 @@ void __init rbppc_init_IRQ(void)
  	}
  
  #ifdef CONFIG_QUICC_ENGINE
@@ -55,7 +55,7 @@
  }
  
  static int __init rbppc_probe(void)
-@@ -284,6 +283,8 @@
+@@ -284,6 +283,8 @@ static struct of_device_id rbppc_ids[] =
  	{ .type = "soc", },
  	{ .compatible = "soc", },
  	{ .compatible = "simple-bus", },
@@ -64,7 +64,7 @@
  	{ .compatible = "gianfar", },
  	{ },
  };
-@@ -372,4 +373,3 @@
+@@ -372,4 +373,3 @@ static void fixup_rb604(struct pci_dev *
  
  DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_pcibridge)
  DECLARE_PCI_FIXUP_HEADER(0x3388, 0x0021, fixup_rb604)
diff --git a/target/linux/mpc83xx/patches-2.6.33/025-rb600-dts-qe-boot-fixups.patch b/target/linux/mpc83xx/patches-2.6.33/025-rb600-dts-qe-boot-fixups.patch
index fc7c4da..2f6fdad 100644
--- a/target/linux/mpc83xx/patches-2.6.33/025-rb600-dts-qe-boot-fixups.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/025-rb600-dts-qe-boot-fixups.patch
@@ -1,5 +1,5 @@
---- a/arch/powerpc/boot/dts/rb600.dts	
-+++ b/arch/powerpc/boot/dts/rb600.dts	
+--- a/arch/powerpc/boot/dts/rb600.dts
++++ b/arch/powerpc/boot/dts/rb600.dts
 @@ -20,9 +20,11 @@
  	aliases {
  		ethernet0 = &enet0;
@@ -58,9 +58,9 @@
  		enet0: ethernet@25000 {
  			#address-cells = <1>;
  			#size-cells = <1>;
---- a/arch/powerpc/boot/rb600.c	2010-04-01 07:46:37.000000000 +0300
-+++ b/arch/powerpc/boot/rb600.c	2010-04-01 08:04:03.000000000 +0300
-@@ -45,14 +45,6 @@
+--- a/arch/powerpc/boot/rb600.c
++++ b/arch/powerpc/boot/rb600.c
+@@ -45,14 +45,6 @@ static void rb600_fixups(void)
  	clock = fdt_getprop(fw_dtb, node, "clock-frequency", &size);
  	dt_fixup_cpu_clocks(*clock, *timebase, 0);
  
@@ -75,9 +75,9 @@
  }
  
  void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
---- a/arch/powerpc/platforms/83xx/rbppc.c	2010-04-01 09:04:09.000000000 +0300
-+++ b/arch/powerpc/platforms/83xx/rbppc.c	2010-04-01 09:02:00.000000000 +0300
-@@ -56,6 +56,8 @@
+--- a/arch/powerpc/platforms/83xx/rbppc.c
++++ b/arch/powerpc/platforms/83xx/rbppc.c
+@@ -56,6 +56,8 @@ static void *gtm;
  static int beeper_irq;
  static unsigned beeper_gpio_pin[2];
  
@@ -86,7 +86,7 @@
  irqreturn_t rbppc_timer_irq(int irq, void *ptr)
  {
  	static int toggle = 0;
-@@ -120,6 +122,8 @@
+@@ -120,6 +122,8 @@ static void __init rbppc_setup_arch(void
  	}
  #endif
  
@@ -95,7 +95,7 @@
  #ifdef CONFIG_QUICC_ENGINE
          qe_reset();
  
-@@ -132,6 +136,8 @@
+@@ -132,6 +136,8 @@ static void __init rbppc_setup_arch(void
          }
  #endif 
  
@@ -104,7 +104,7 @@
  }
  
  void __init rbppc_init_IRQ(void)
-@@ -145,6 +151,8 @@
+@@ -145,6 +151,8 @@ void __init rbppc_init_IRQ(void)
  		of_node_put(np);
  	}
  
@@ -113,7 +113,7 @@
  #ifdef CONFIG_QUICC_ENGINE
          np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
          if (!np) {
-@@ -156,6 +164,8 @@
+@@ -156,6 +164,8 @@ void __init rbppc_init_IRQ(void)
          of_node_put(np);
  #endif                          /* CONFIG_QUICC_ENGINE */
  
@@ -122,7 +122,7 @@
  }
  
  static int __init rbppc_probe(void)
-@@ -167,8 +177,10 @@
+@@ -167,8 +177,10 @@ static int __init rbppc_probe(void)
  	if (!model)
  		return 0;
  
diff --git a/target/linux/mpc83xx/patches-2.6.33/030-ucc_tdm.patch b/target/linux/mpc83xx/patches-2.6.33/030-ucc_tdm.patch
index fad910a..1668921 100644
--- a/target/linux/mpc83xx/patches-2.6.33/030-ucc_tdm.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/030-ucc_tdm.patch
@@ -1,4 +1,4 @@
---- a/drivers/misc/ucc_tdm.h
+--- /dev/null
 +++ b/drivers/misc/ucc_tdm.h
 @@ -0,0 +1,221 @@
 +/*
@@ -1242,9 +1242,9 @@
 +MODULE_AUTHOR("Freescale Semiconductor, Inc");
 +MODULE_DESCRIPTION(DRV_DESC);
 +MODULE_LICENSE("GPL");
---- a/drivers/misc/Makefile	2010-03-15 18:09:39.000000000 +0200
-+++ b/drivers/misc/Makefile	2010-03-30 18:37:12.000000000 +0300
-@@ -8,6 +8,7 @@
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
+@@ -8,6 +8,7 @@ obj-$(CONFIG_AD525X_DPOT)	+= ad525x_dpot
  obj-$(CONFIG_ATMEL_PWM)		+= atmel_pwm.o
  obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o
  obj-$(CONFIG_ATMEL_TCLIB)	+= atmel_tclib.o
@@ -1252,9 +1252,9 @@
  obj-$(CONFIG_ICS932S401)	+= ics932s401.o
  obj-$(CONFIG_LKDTM)		+= lkdtm.o
  obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o
---- a/drivers/misc/Kconfig	2010-03-15 18:09:39.000000000 +0200
-+++ b/drivers/misc/Kconfig	2010-03-30 18:40:46.000000000 +0300
-@@ -164,6 +164,20 @@
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -164,6 +164,20 @@ config ATMEL_SSC
  
  	  If unsure, say N.
  
@@ -1275,9 +1275,9 @@
  config ENCLOSURE_SERVICES
  	tristate "Enclosure Services"
  	default n
---- a/arch/powerpc/include/asm/ucc_fast.h	2010-03-15 18:09:39.000000000 +0200
-+++ b/arch/powerpc/include/asm/ucc_fast.h	2010-03-30 19:13:29.000000000 +0300
-@@ -150,6 +150,10 @@
+--- a/arch/powerpc/include/asm/ucc_fast.h
++++ b/arch/powerpc/include/asm/ucc_fast.h
+@@ -150,6 +150,10 @@ struct ucc_fast_info {
  	enum ucc_fast_rx_decoding_method renc;
  	enum ucc_fast_transparent_tcrc tcrc;
  	enum ucc_fast_sync_len synl;
@@ -1288,9 +1288,9 @@
  };
  
  struct ucc_fast_private {
---- a/arch/powerpc/include/asm/qe.h	2010-03-15 18:09:39.000000000 +0200
-+++ b/arch/powerpc/include/asm/qe.h	2010-03-30 19:17:33.000000000 +0300
-@@ -669,6 +669,14 @@
+--- a/arch/powerpc/include/asm/qe.h
++++ b/arch/powerpc/include/asm/qe.h
+@@ -669,6 +669,14 @@ struct ucc_slow_pram {
  #define UCC_GETH_UCCE_RXF1      0x00000002
  #define UCC_GETH_UCCE_RXF0      0x00000001
  
diff --git a/target/linux/mpc83xx/patches-2.6.33/110-etsec27_war.patch b/target/linux/mpc83xx/patches-2.6.33/110-etsec27_war.patch
index dca8b33..980e0db 100644
--- a/target/linux/mpc83xx/patches-2.6.33/110-etsec27_war.patch
+++ b/target/linux/mpc83xx/patches-2.6.33/110-etsec27_war.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/gianfar.c
 +++ b/drivers/net/gianfar.c
-@@ -908,6 +908,14 @@
+@@ -908,6 +908,14 @@ static int gfar_probe(struct of_device *
  	udelay(2);
  
  	tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);