qemuzynq: Added qemuzynq-yocto.dts for linux-yocto

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
author: Nathan Rossi <nathan.rossi@xilinx.com> 2014-04-07 10:47:54 +1000
committer: Nathan Rossi <nathan.rossi@xilinx.com> 2014-04-07 17:20:22 +1000
commit: e78ab38f39ca8583d24f88a3d4008bb5f2468b70 (patch)
tree: 1d79514e2f23c25ca074435bef5d20bb482d0865
parent: 746f2fa5aad30b5e2079c399934e73a76523ae33 (diff)
download: meta-xilinx-e78ab38f39ca8583d24f88a3d4008bb5f2468b70.tar.gz
4 files changed, 77 insertions, 64 deletions
diff --git a/conf/machine/boards/qemu/qemuzynq-base.dtsi b/conf/machine/boards/qemu/qemuzynq-base.dtsi
new file mode 100644
index 00000000..3914510d
--- /dev/null
+++ b/conf/machine/boards/qemu/qemuzynq-base.dtsi
@@ -0,0 +1,65 @@
+/ {
+        model = "xilinx-zynq-a9";
+        chosen {
+                bootargs = "console=ttyPS0,115200";
+                linux,stdout-path = "/amba@0/serial@e0001000";
+        } ;
+        ps7_ddr_0: memory@0 {
+                device_type = "memory";
+                reg = <0x0 0x40000000>;
+        } ;
+        ps7_axi_interconnect_0: amba@0 {
+                ps7_ethernet_0: ps7-ethernet@e000b000 {
+                        phy-handle = <&phy0>;
+                        phy-mode = "gmii";
+                        mdio {
+                                phy0: phy@23 {
+                                        device_type = "ethernet-phy";
+                                        reg = <23>;
+                                } ;
+                        } ;
+                } ;
+                ps7_qspi_0: ps7-qspi@e000d000 {
+                        is-dual = <1>;
+                        primary_flash: ps7-qspi@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "st,m25p80";
+                                reg = <0x0>;
+                                spi-max-frequency = <50000000>;
+                                partition@0x00000000 {
+                                        label = "boot";
+                                        reg = <0x00000000 0x00500000>;
+                                };
+                                partition@0x00500000 {
+                                        label = "bootenv";
+                                        reg = <0x00500000 0x00020000>;
+                                };
+                                partition@0x00520000 {
+                                        label = "config";
+                                        reg = <0x00520000 0x00020000>;
+                                };
+                                partition@0x00540000 {
+                                        label = "image";
+                                        reg = <0x00540000 0x00a80000>;
+                                };
+                                partition@0x00fc0000 {
+                                        label = "spare";
+                                        reg = <0x00fc0000 0x00000000>;
+                                };
+                        } ;
+                } ;
+                
+                /* Disabled Devices */
+                ps7_gpio_0: ps7-gpio@e000a000 { compatible = "invalid"; };
+                ps7_uart_0: serial@e0000000 { compatible = "invalid"; };
+                ps7_ethernet_1: ps7-ethernet@e000c000 { compatible = "invalid"; };
+                ps7_i2c_0: ps7-i2c@e0004000 { compatible = "invalid"; };
+                ps7_i2c_1: ps7-i2c@e0005000 { compatible = "invalid"; };
+                ps7_wdt_0: ps7-wdt@f8005000 { compatible = "invalid"; };
+                ps7_can_0: ps7-can@e0008000 { compatible = "invalid"; };
+                ps7_can_1: ps7-can@e0009000 { compatible = "invalid"; };
+                /* Not Implemented in QEMU */
+                ps7_xadc: ps7-xadc@f8007100 { compatible = "invalid"; } ;
+        } ;
+} ;
diff --git a/conf/machine/boards/qemu/qemuzynq-yocto.dts b/conf/machine/boards/qemu/qemuzynq-yocto.dts
new file mode 100644
index 00000000..6beedf0f
--- /dev/null
+++ b/conf/machine/boards/qemu/qemuzynq-yocto.dts
@@ -0,0 +1,6 @@
+/dts-v1/;
+/include/ "zynq-7-base.dtsi"
+/include/ "zynq-7-mainline-gem.dtsi"
+/include/ "qemuzynq-base.dtsi"
+/ {
+} ;
diff --git a/conf/machine/boards/qemu/qemuzynq.dts b/conf/machine/boards/qemu/qemuzynq.dts
index 5d8b5ab9..d5f75b41 100644
--- a/conf/machine/boards/qemu/qemuzynq.dts
+++ b/conf/machine/boards/qemu/qemuzynq.dts
@@ -1,67 +1,5 @@
 /dts-v1/;
 /include/ "zynq-7-base.dtsi"
+/include/ "qemuzynq-base.dtsi"
 / {
-        model = "xilinx-zynq-a9";
-        chosen {
-                bootargs = "console=ttyPS0,115200";
-                linux,stdout-path = "/amba@0/serial@e0001000";
-        } ;
-        ps7_ddr_0: memory@0 {
-                device_type = "memory";
-                reg = <0x0 0x40000000>;
-        } ;
-        ps7_axi_interconnect_0: amba@0 {
-                ps7_ethernet_0: ps7-ethernet@e000b000 {
-                        phy-handle = <&phy0>;
-                        phy-mode = "gmii";
-                        mdio {
-                                phy0: phy@23 {
-                                        device_type = "ethernet-phy";
-                                        reg = <23>;
-                                } ;
-                        } ;
-                } ;
-                ps7_qspi_0: ps7-qspi@e000d000 {
-                        is-dual = <1>;
-                        primary_flash: ps7-qspi@0 {
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                compatible = "st,m25p80";
-                                reg = <0x0>;
-                                spi-max-frequency = <50000000>;
-                                partition@0x00000000 {
-                                        label = "boot";
-                                        reg = <0x00000000 0x00500000>;
-                                };
-                                partition@0x00500000 {
-                                        label = "bootenv";
-                                        reg = <0x00500000 0x00020000>;
-                                };
-                                partition@0x00520000 {
-                                        label = "config";
-                                        reg = <0x00520000 0x00020000>;
-                                };
-                                partition@0x00540000 {
-                                        label = "image";
-                                        reg = <0x00540000 0x00a80000>;
-                                };
-                                partition@0x00fc0000 {
-                                        label = "spare";
-                                        reg = <0x00fc0000 0x00000000>;
-                                };
-                        } ;
-                } ;
-                
-                /* Disabled Devices */
-                ps7_gpio_0: ps7-gpio@e000a000 { compatible = "invalid"; };
-                ps7_uart_0: serial@e0000000 { compatible = "invalid"; };
-                ps7_ethernet_1: ps7-ethernet@e000c000 { compatible = "invalid"; };
-                ps7_i2c_0: ps7-i2c@e0004000 { compatible = "invalid"; };
-                ps7_i2c_1: ps7-i2c@e0005000 { compatible = "invalid"; };
-                ps7_wdt_0: ps7-wdt@f8005000 { compatible = "invalid"; };
-                ps7_can_0: ps7-can@e0008000 { compatible = "invalid"; };
-                ps7_can_1: ps7-can@e0009000 { compatible = "invalid"; };
-                /* Not Implemented in QEMU */
-                ps7_xadc: ps7-xadc@f8007100 { compatible = "invalid"; } ;
-        } ;
 } ;
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
index 0e57ece3..55d44f39 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemuzynq.conf
@@ -11,4 +11,8 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
 SERIAL_CONSOLE = "115200 ttyPS0"
-MACHINE_DEVICETREE := "qemu/qemuzynq.dts"
+MACHINE_DEVICETREE := " \
+                qemu/qemuzynq.dts \
+                qemu/qemuzynq-yocto.dts \
+                qemu/qemuzynq-base.dtsi \
+                "
author	Nathan Rossi <nathan.rossi@xilinx.com>	2014-04-07 10:47:54 +1000
committer	Nathan Rossi <nathan.rossi@xilinx.com>	2014-04-07 17:20:22 +1000
commit	e78ab38f39ca8583d24f88a3d4008bb5f2468b70 (patch)
tree	1d79514e2f23c25ca074435bef5d20bb482d0865
parent	746f2fa5aad30b5e2079c399934e73a76523ae33 (diff)
download	meta-xilinx-e78ab38f39ca8583d24f88a3d4008bb5f2468b70.tar.gz

diff --git a/conf/machine/boards/qemu/qemuzynq-base.dtsi b/conf/machine/boards/qemu/qemuzynq-base.dtsi new file mode 100644 index 00000000..3914510d --- /dev/null +++ b/conf/machine/boards/qemu/qemuzynq-base.dtsi
@@ -0,0 +1,65 @@
		1	/ {
		2	model = "xilinx-zynq-a9";
		3	chosen {
		4	bootargs = "console=ttyPS0,115200";
		5	linux,stdout-path = "/amba@0/serial@e0001000";
		6	} ;
		7	ps7_ddr_0: memory@0 {
		8	device_type = "memory";
		9	reg = <0x0 0x40000000>;
		10	} ;
		11	ps7_axi_interconnect_0: amba@0 {
		12	ps7_ethernet_0: ps7-ethernet@e000b000 {
		13	phy-handle = <&phy0>;
		14	phy-mode = "gmii";
		15	mdio {
		16	phy0: phy@23 {
		17	device_type = "ethernet-phy";
		18	reg = <23>;
		19	} ;
		20	} ;
		21	} ;
		22	ps7_qspi_0: ps7-qspi@e000d000 {
		23	is-dual = <1>;
		24	primary_flash: ps7-qspi@0 {
		25	#address-cells = <1>;
		26	#size-cells = <1>;
		27	compatible = "st,m25p80";
		28	reg = <0x0>;
		29	spi-max-frequency = <50000000>;
		30	partition@0x00000000 {
		31	label = "boot";
		32	reg = <0x00000000 0x00500000>;
		33	};
		34	partition@0x00500000 {
		35	label = "bootenv";
		36	reg = <0x00500000 0x00020000>;
		37	};
		38	partition@0x00520000 {
		39	label = "config";
		40	reg = <0x00520000 0x00020000>;
		41	};
		42	partition@0x00540000 {
		43	label = "image";
		44	reg = <0x00540000 0x00a80000>;
		45	};
		46	partition@0x00fc0000 {
		47	label = "spare";
		48	reg = <0x00fc0000 0x00000000>;
		49	};
		50	} ;
		51	} ;
		52
		53	/* Disabled Devices */
		54	ps7_gpio_0: ps7-gpio@e000a000 { compatible = "invalid"; };
		55	ps7_uart_0: serial@e0000000 { compatible = "invalid"; };
		56	ps7_ethernet_1: ps7-ethernet@e000c000 { compatible = "invalid"; };
		57	ps7_i2c_0: ps7-i2c@e0004000 { compatible = "invalid"; };
		58	ps7_i2c_1: ps7-i2c@e0005000 { compatible = "invalid"; };
		59	ps7_wdt_0: ps7-wdt@f8005000 { compatible = "invalid"; };
		60	ps7_can_0: ps7-can@e0008000 { compatible = "invalid"; };
		61	ps7_can_1: ps7-can@e0009000 { compatible = "invalid"; };
		62	/* Not Implemented in QEMU */
		63	ps7_xadc: ps7-xadc@f8007100 { compatible = "invalid"; } ;
		64	} ;
		65	} ;


diff --git a/conf/machine/boards/qemu/qemuzynq-yocto.dts b/conf/machine/boards/qemu/qemuzynq-yocto.dts new file mode 100644 index 00000000..6beedf0f --- /dev/null +++ b/conf/machine/boards/qemu/qemuzynq-yocto.dts
@@ -0,0 +1,6 @@
		1	/dts-v1/;
		2	/include/ "zynq-7-base.dtsi"
		3	/include/ "zynq-7-mainline-gem.dtsi"
		4	/include/ "qemuzynq-base.dtsi"
		5	/ {
		6	} ;


diff --git a/conf/machine/boards/qemu/qemuzynq.dts b/conf/machine/boards/qemu/qemuzynq.dts index 5d8b5ab9..d5f75b41 100644 --- a/conf/machine/boards/qemu/qemuzynq.dts +++ b/conf/machine/boards/qemu/qemuzynq.dts
@@ -1,67 +1,5 @@
1	/dts-v1/;	1	/dts-v1/;
2	/include/ "zynq-7-base.dtsi"	2	/include/ "zynq-7-base.dtsi"
		3	/include/ "qemuzynq-base.dtsi"
3	/ {	4	/ {
4	model = "xilinx-zynq-a9";
5	chosen {
6	bootargs = "console=ttyPS0,115200";
7	linux,stdout-path = "/amba@0/serial@e0001000";
8	} ;
9	ps7_ddr_0: memory@0 {
10	device_type = "memory";
11	reg = <0x0 0x40000000>;
12	} ;
13	ps7_axi_interconnect_0: amba@0 {
14	ps7_ethernet_0: ps7-ethernet@e000b000 {
15	phy-handle = <&phy0>;
16	phy-mode = "gmii";
17	mdio {
18	phy0: phy@23 {
19	device_type = "ethernet-phy";
20	reg = <23>;
21	} ;
22	} ;
23	} ;
24	ps7_qspi_0: ps7-qspi@e000d000 {
25	is-dual = <1>;
26	primary_flash: ps7-qspi@0 {
27	#address-cells = <1>;
28	#size-cells = <1>;
29	compatible = "st,m25p80";
30	reg = <0x0>;
31	spi-max-frequency = <50000000>;
32	partition@0x00000000 {
33	label = "boot";
34	reg = <0x00000000 0x00500000>;
35	};
36	partition@0x00500000 {
37	label = "bootenv";
38	reg = <0x00500000 0x00020000>;
39	};
40	partition@0x00520000 {
41	label = "config";
42	reg = <0x00520000 0x00020000>;
43	};
44	partition@0x00540000 {
45	label = "image";
46	reg = <0x00540000 0x00a80000>;
47	};
48	partition@0x00fc0000 {
49	label = "spare";
50	reg = <0x00fc0000 0x00000000>;
51	};
52	} ;
53	} ;
54
55	/* Disabled Devices */
56	ps7_gpio_0: ps7-gpio@e000a000 { compatible = "invalid"; };
57	ps7_uart_0: serial@e0000000 { compatible = "invalid"; };
58	ps7_ethernet_1: ps7-ethernet@e000c000 { compatible = "invalid"; };
59	ps7_i2c_0: ps7-i2c@e0004000 { compatible = "invalid"; };
60	ps7_i2c_1: ps7-i2c@e0005000 { compatible = "invalid"; };
61	ps7_wdt_0: ps7-wdt@f8005000 { compatible = "invalid"; };
62	ps7_can_0: ps7-can@e0008000 { compatible = "invalid"; };
63	ps7_can_1: ps7-can@e0009000 { compatible = "invalid"; };
64	/* Not Implemented in QEMU */
65	ps7_xadc: ps7-xadc@f8007100 { compatible = "invalid"; } ;
66	} ;
67	} ;	5	} ;


diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf index 0e57ece3..55d44f39 100644 --- a/conf/machine/qemuzynq.conf +++ b/conf/machine/qemuzynq.conf
@@ -11,4 +11,8 @@ EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
11		11
12	SERIAL_CONSOLE = "115200 ttyPS0"	12	SERIAL_CONSOLE = "115200 ttyPS0"
13		13
14	MACHINE_DEVICETREE := "qemu/qemuzynq.dts"	14	MACHINE_DEVICETREE := " \
		15	qemu/qemuzynq.dts \
		16	qemu/qemuzynq-yocto.dts \
		17	qemu/qemuzynq-base.dtsi \
		18	"