---

yaml --- r: 97033 b: refs/heads/master c: 4b7afb0 h: refs/heads/master i: 97031: cd6a351 v: v3
git-mirror · May 20, 2008 · 21d65a7 · 21d65a7
1 parent 2c9b32b
commit 21d65a7
Show file tree

Hide file tree

Showing 35 changed files with 630 additions and 791 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 424de91dd6163808729d7082de55c319e1096bee
+refs/heads/master: 4b7afb0d0d23b298a7e6d30eaba0679449542d2e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -982,6 +982,13 @@ L:	bonding-devel@lists.sourceforge.net
 W:	http://sourceforge.net/projects/bonding/
 S:	Supported
 
+BROADBAND PROCESSOR ARCHITECTURE
+P:	Arnd Bergmann
+M:	arnd@arndb.de
+L:	linuxppc-dev@ozlabs.org
+W:	http://www.penguinppc.org/ppc64/
+S:	Supported
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 P:	Gary Zambrano
 M:	zambrano@broadcom.com
@@ -1045,14 +1052,6 @@ L:	linux-kernel@vger.kernel.org
 L:	discuss@x86-64.org
 S:	Maintained
 
-CELL BROADBAND ENGINE ARCHITECTURE
-P:	Arnd Bergmann
-M:	arnd@arndb.de
-L:	linuxppc-dev@ozlabs.org
-L:	cbe-oss-dev@ozlabs.org
-W:	http://www.ibm.com/developerworks/power/cell/
-S:	Supported
-
 CFAG12864B LCD DRIVER
 P:	Miguel Ojeda Sandonis
 M:	maxextreme@gmail.com
@@ -3777,14 +3776,6 @@ M:	dbrownell@users.sourceforge.net
 L:	spi-devel-general@lists.sourceforge.net
 S:	Maintained
 
-SPU FILE SYSTEM
-P:	Jeremy Kerr
-M:	jk@ozlabs.org
-L:	linuxppc-dev@ozlabs.org
-L:	cbe-oss-dev@ozlabs.org
-W:	http://www.ibm.com/developerworks/power/cell/
-S:	Supported
-
 STABLE BRANCH:
 P:	Greg Kroah-Hartman
 M:	greg@kroah.com

diff --git a/trunk/arch/powerpc/boot/.gitignore b/trunk/arch/powerpc/boot/.gitignore
@@ -20,19 +20,21 @@ kernel-vmlinux.strip.gz
 mktree
 uImage
 cuImage.*
-dtbImage.*
 treeImage.*
 zImage
-zImage.initrd
 zImage.bin.*
 zImage.chrp
 zImage.coff
-zImage.holly
+zImage.coff.lds
+zImage.ep*
 zImage.iseries
 zImage.*lds
 zImage.miboot
 zImage.pmac
 zImage.pseries
+zImage.redboot*
+zImage.sandpoint
+zImage.vmode
 zconf.h
 zlib.h
 zutil.h
diff --git a/trunk/arch/powerpc/boot/Makefile b/trunk/arch/powerpc/boot/Makefile
@@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct
 	@cp $< $@
 
 clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
-		empty.c zImage.coff.lds zImage.ps3.lds zImage.lds
+		empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds
 
 quiet_cmd_bootcc = BOOTCC  $@
       cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -339,9 +339,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
 	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<
 
 # anything not in $(targets)
-clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
-	zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
-	zImage.iseries zImage.miboot zImage.pmac zImage.pseries \
+clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
 	otheros.bld *.dtb
 
 # clean up files cached by wrapper

diff --git a/trunk/arch/powerpc/boot/dts/mpc8377_mds.dts b/trunk/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -271,35 +271,27 @@
 		dma@82a8 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			compatible = "fsl,mpc8377-dma", "fsl,elo-dma";
+			compatible = "fsl,mpc8349-dma";
 			reg = <0x82a8 4>;
 			ranges = <0 0x8100 0x1a8>;
 			interrupt-parent = <&ipic>;
 			interrupts = <0x47 8>;
 			cell-index = <0>;
 			dma-channel@0 {
-				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
+				compatible = "fsl,mpc8349-dma-channel";
 				reg = <0 0x80>;
-				interrupt-parent = <&ipic>;
-				interrupts = <0x47 8>;
 			};
 			dma-channel@80 {
-				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
+				compatible = "fsl,mpc8349-dma-channel";
 				reg = <0x80 0x80>;
-				interrupt-parent = <&ipic>;
-				interrupts = <0x47 8>;
 			};
 			dma-channel@100 {
-				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
+				compatible = "fsl,mpc8349-dma-channel";
 				reg = <0x100 0x80>;
-				interrupt-parent = <&ipic>;
-				interrupts = <0x47 8>;
 			};
 			dma-channel@180 {
-				compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
+				compatible = "fsl,mpc8349-dma-channel";
 				reg = <0x180 0x28>;
-				interrupt-parent = <&ipic>;
-				interrupts = <0x47 8>;
 			};
 		};