X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c5d266aa2a7762741af4353b6e8852e4a9fb9dae..6983aacd37e799b035732187aab6896f46f57a60:/target/linux/mpc83xx/patches-2.6.33/020-rb333-support.patch

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 caffe855f..2cab61c19 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=''
      ;;