Merge branch 'mpc86xx'

2 files changed, 3 insertions, 403 deletions

diff --git a/board/mpc8641hpcn/Makefile b/board/mpc8641hpcn/Makefile
index 0ebed87bce..f70f44ba2a 100644
--- a/board/mpc8641hpcn/Makefile
+++ b/board/mpc8641hpcn/Makefile
@@ -25,27 +25,15 @@ include $(TOPDIR)/config.mk
 
 LIB	= lib$(BOARD).a
 
-OBJS	:= $(BOARD).o pixis.o sys_eeprom.o oftree.o
+OBJS	:= $(BOARD).o pixis.o sys_eeprom.o
 SOBJS	:= init.o
 
 $(LIB):	$(OBJS) $(SOBJS)
 	$(AR) crv $@ $(OBJS)
 
-ifndef DTC
-DTC	:= dtc
-endif
-
-%.dtb: %.dts
-	$(DTC) -f -V 0x10 -I dts -O dtb $< >$@
-
-%.c: %.dtb
-	xxd -i $< \
-    | sed -e "s/^unsigned char/const unsigned char/g" \
-    | sed -e "s/^unsigned int/const unsigned int/g" > $@
-
-
 clean:
-	rm -f $(OBJS) $(SOBJS) *.dtb oftree.c
+	rm -f $(OBJS) $(SOBJS)
+
 .PHONY: distclean
 distclean:	clean
 	rm -f $(LIB) core *.bak .depend
diff --git a/board/mpc8641hpcn/oftree.dts b/board/mpc8641hpcn/oftree.dts
deleted file mode 100644
index 99d75ca621..0000000000
--- a/board/mpc8641hpcn/oftree.dts
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * MPC8641 HPCN Device Tree Source
- *
- * Copyright 2006 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-
-/ {
-	model = "MPC8641HPCN";
-	compatible = "mpc86xx";
-	#address-cells = <1>;
-	#size-cells = <1>;
-	linux,phandle = <100>;
-
-	cpus {
-		#cpus = <2>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		linux,phandle = <200>;
-
-		PowerPC,8641@0 {
-			device_type = "cpu";
-			reg = <0>;
-			d-cache-line-size = <20>;	// 32 bytes
-			i-cache-line-size = <20>;	// 32 bytes
-			d-cache-size = <8000>;		// L1, 32K
-			i-cache-size = <8000>;		// L1, 32K
-			timebase-frequency = <0>;	// 33 MHz, from uboot
-			bus-frequency = <0>;		// From uboot
-			clock-frequency = <0>;		// From uboot
-			32-bit;
-			linux,phandle = <201>;
-			linux,boot-cpu;
-		};
-		PowerPC,8641@1 {
-			device_type = "cpu";
-			reg = <1>;
-			d-cache-line-size = <20>;	// 32 bytes
-			i-cache-line-size = <20>;	// 32 bytes
-			d-cache-size = <8000>;		// L1, 32K
-			i-cache-size = <8000>;		// L1, 32K
-			timebase-frequency = <0>;	// 33 MHz, from uboot
-			bus-frequency = <0>;		// From uboot
-			clock-frequency = <0>;		// From uboot
-			32-bit;
-			linux,phandle = <202>;
-		};
-	};
-
-	memory {
-		device_type = "memory";
-		linux,phandle = <300>;
-		reg = <00000000 40000000>;	// 1G at 0x0
-	};
-
-	soc8641@f8000000 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		#interrupt-cells = <2>;
-		device_type = "soc";
-		ranges = <0 f8000000 00100000>;
-		reg = <f8000000 00100000>;	// CCSRBAR 1M
-		bus-frequency = <0>;
-
-		i2c@3000 {
-			device_type = "i2c";
-			compatible = "fsl-i2c";
-			reg = <3000 100>;
-			interrupts = <2b 2>;
-			interrupt-parent = <40000>;
-			dfsrr;
-		};
-
-		i2c@3100 {
-			device_type = "i2c";
-			compatible = "fsl-i2c";
-			reg = <3100 100>;
-			interrupts = <2b 2>;
-			interrupt-parent = <40000>;
-			dfsrr;
-		};
-
-		mdio@24520 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			device_type = "mdio";
-			compatible = "gianfar";
-			reg = <24520 20>;
-			linux,phandle = <24520>;
-			ethernet-phy@0 {
-				linux,phandle = <2452000>;
-				interrupt-parent = <40000>;
-				interrupts = <4a 1>;
-				reg = <0>;
-				device_type = "ethernet-phy";
-			};
-			ethernet-phy@1 {
-				linux,phandle = <2452001>;
-				interrupt-parent = <40000>;
-				interrupts = <4a 1>;
-				reg = <1>;
-				device_type = "ethernet-phy";
-			};
-			ethernet-phy@2 {
-				linux,phandle = <2452002>;
-				interrupt-parent = <40000>;
-				interrupts = <4a 1>;
-				reg = <2>;
-				device_type = "ethernet-phy";
-			};
-			ethernet-phy@3 {
-				linux,phandle = <2452003>;
-				interrupt-parent = <40000>;
-				interrupts = <4a 1>;
-				reg = <3>;
-				device_type = "ethernet-phy";
-			};
-		};
-
-		ethernet@24000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			device_type = "network";
-			model = "TSEC";
-			compatible = "gianfar";
-			reg = <24000 1000>;
-			address = [ 00 E0 0C 00 73 00 ];
-			interrupts = <1d 2 1e 2 22 2>;
-			interrupt-parent = <40000>;
-			phy-handle = <2452000>;
-		};
-
-		ethernet@25000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			device_type = "network";
-			model = "TSEC";
-			compatible = "gianfar";
-			reg = <25000 1000>;
-			address = [ 00 E0 0C 00 73 01 ];
-			interrupts = <23 2 24 2 28 2>;
-			interrupt-parent = <40000>;
-			phy-handle = <2452001>;
-		};
-		
-		ethernet@26000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			device_type = "network";
-			model = "TSEC";
-			compatible = "gianfar";
-			reg = <26000 1000>;
-			address = [ 00 E0 0C 00 02 FD ];
-			interrupts = <1F 2 20 2 21 2>;
-			interrupt-parent = <40000>;
-			phy-handle = <2452002>;
-		};
-
-		ethernet@27000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			device_type = "network";
-			model = "TSEC";
-			compatible = "gianfar";
-			reg = <27000 1000>;
-			address = [ 00 E0 0C 00 03 FD ];
-			interrupts = <25 2 26 2 27 2>;
-			interrupt-parent = <40000>;
-			phy-handle = <2452003>;
-		};
-		serial@4500 {
-			device_type = "serial";
-			compatible = "ns16550";
-			reg = <4500 100>;
-			clock-frequency = <0>;
-			interrupts = <2a 2>;
-			interrupt-parent = <40000>;
-		};
-
-		serial@4600 {
-			device_type = "serial";
-			compatible = "ns16550";
-			reg = <4600 100>;
-			clock-frequency = <0>;
-			interrupts = <1c 2>;
-			interrupt-parent = <40000>;
-		};
-
-		pci@8000 {
-			compatible = "86xx";
-			device_type = "pci";
-			linux,phandle = <8000>;
-			#interrupt-cells = <1>;
-			#size-cells = <2>;
-			#address-cells = <3>;
-			reg = <8000 1000>;
-			bus-range = <0 fe>;
-			ranges = <02000000 0 80000000 80000000 0 20000000
-				  01000000 0 00000000 e2000000 0 00100000>;
-			clock-frequency = <1fca055>;
-			interrupt-parent = <40000>;
-			interrupts = <18 2>;
-			interrupt-map-mask = <f800 0 0 7>;
-			interrupt-map = <
-				/* IDSEL 0x11 */
-				8800 0 0 1 4d0 3 2
-				8800 0 0 2 4d0 4 2
-				8800 0 0 3 4d0 5 2
-				8800 0 0 4 4d0 6 2
-
-				/* IDSEL 0x12 */
-				9000 0 0 1 4d0 4 2
-				9000 0 0 2 4d0 5 2
-				9000 0 0 3 4d0 6 2
-				9000 0 0 4 4d0 3 2
-
-				/* IDSEL 0x13 */
-				9800 0 0 1 4d0 0 0
-				9800 0 0 2 4d0 0 0
-				9800 0 0 3 4d0 0 0
-				9800 0 0 4 4d0 0 0
-
-				/* IDSEL 0x14 */
-				a000 0 0 1 4d0 0 0
-				a000 0 0 2 4d0 0 0
-				a000 0 0 3 4d0 0 0
-				a000 0 0 4 4d0 0 0
-
-				/* IDSEL 0x15 */
-				a800 0 0 1 4d0 0 0
-				a800 0 0 2 4d0 0 0
-				a800 0 0 3 4d0 0 0
-				a800 0 0 4 4d0 0 0
-
-				/* IDSEL 0x16 */
-				b000 0 0 1 4d0 0 0
-				b000 0 0 2 4d0 0 0
-				b000 0 0 3 4d0 0 0
-				b000 0 0 4 4d0 0 0
-
-				/* IDSEL 0x17 */
-				b800 0 0 1 4d0 0 0
-				b800 0 0 2 4d0 0 0
-				b800 0 0 3 4d0 0 0
-				b800 0 0 4 4d0 0 0
-
-				/* IDSEL 0x18 */
-				c000 0 0 1 4d0 0 0
-				c000 0 0 2 4d0 0 0
-				c000 0 0 3 4d0 0 0
-				c000 0 0 4 4d0 0 0
-
-				/* IDSEL 0x19 */
-				c800 0 0 1 4d0 0 0
-				c800 0 0 2 4d0 0 0
-				c800 0 0 3 4d0 0 0
-				c800 0 0 4 4d0 0 0
-
-				/* IDSEL 0x1a */
-				d000 0 0 1 4d0 6 2
-				d000 0 0 2 4d0 3 2
-				d000 0 0 3 4d0 4 2
-				d000 0 0 4 4d0 5 2
-
-
-				/* IDSEL 0x1b */
-				d800 0 0 1 4d0 5 2
-				d800 0 0 2 4d0 0 0
-				d800 0 0 3 4d0 0 0
-				d800 0 0 4 4d0 0 0
-
-				/* IDSEL 0x1c */
-				e000 0 0 1 4d0 9 2
-				e000 0 0 2 4d0 a 2
-				e000 0 0 3 4d0 c 2
-				e000 0 0 4 4d0 7 2
-
-				/* IDSEL 0x1d */
-				e800 0 0 1 4d0 9 2
-				e800 0 0 2 4d0 a 2
-				e800 0 0 3 4d0 b 2
-				e800 0 0 4 4d0 0 0
-
-				/* IDSEL 0x1e */
-				f000 0 0 1 4d0 c 2
-				f000 0 0 2 4d0 0 0
-				f000 0 0 3 4d0 0 0
-				f000 0 0 4 4d0 0 0
-
-				/* IDSEL 0x1f */
-				f800 0 0 1 4d0 6 2
-				f800 0 0 2 4d0 0 0
-				f800 0 0 3 4d0 0 0
-				f800 0 0 4 4d0 0 0
-				>;
-			i8259@4d0 {
-				linux,phandle = <4d0>;
-				clock-frequency = <0>;
-				interrupt-controller;
-				device_type = "interrupt-controller";
-				#address-cells = <0>;
-				#interrupt-cells = <2>;
-				built-in;
-				compatible = "chrp,iic";
-                	        big-endian;
-				interrupts = <49 2>;
-				interrupt-parent = <40000>;
-			};
-
-		};
-		pic@40000 {
-			linux,phandle = <40000>;
-			clock-frequency = <0>;
-			interrupt-controller;
-			#address-cells = <0>;
-			#interrupt-cells = <2>;
-			reg = <40000 40000>;
-			built-in;
-			compatible = "chrp,open-pic";
-			device_type = "open-pic";
-                        big-endian;
-			interrupts = <
-				10 2 11 2 12 2 13 2
-				14 2 15 2 16 2 17 2
-				18 2 19 2 1a 2 1b 2
-				1c 2 1d 2 1e 2 1f 2
-				20 2 21 2 22 2 23 2
-				24 2 25 2 26 2 27 2
-				28 2 29 2 2a 2 2b 2
-				2c 2 2d 2 2e 2 2f 2
-				30 2 31 2 32 2 33 2
-				34 2 35 2 36 2 37 2
-				38 2 39 2 2a 2 3b 2
-				3c 2 3d 2 3e 2 3f 2
-				48 1 49 2 4a 1
-				>;
-			interrupt-parent = <40000>;
-		};
-		rio@c0000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			device_type = "rio";
-			model = "pq38";
-			compatible = "85xx";
-			ranges = <0 c0000000 20000000>;
-			reg = <c0000 13000>;
-			linux,phandle = <c0000>;
-		};
-		rio_message@d3000 {
-			device_type = "network";
-			compatible = "85xx";
-			linux,phandle = <d3000>;
-			reg = <d3000 d3100>;
-			interrupts = <35 2 36 2>;
-			interrupt-parent = <40000>;
-		};
-		rio_message@d3100 {
-			device_type = "network";
-			compatible = "85xx";
-			linux,phandle = <d3100>;
-			reg = <d3100 d3200>;
-			interrupts = <37 2 38 2>;
-			interrupt-parent = <40000>;
-		};
-		rio_doorbell@d3400 {
-			device_type = "doorbell";
-			compatible = "85xx";
-			linux,phandle = <d3400>;
-			reg = <d3400 d34e0>;
-			interrupts = <31 2 32 2>;
-			interrupt-parent = <40000>;
-		};
-		rio_portwrite@d34e0 {
-			device_type = "portwrite";
-			compatible = "85xx";
-			linux,phandle = <d34e0>;
-			reg = <d34e0 d3500>;
-			interrupts = <30 2>;
-			interrupt-parent = <40000>;
-		};
-	};
-};
-