summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2016-02-24 16:35:41 +1000
committerNathan Rossi <nathan@nathanrossi.com>2016-03-06 20:04:03 +1000
commit2c8e7f07d367397dc1d4aaa635801b11c3c0f5ce (patch)
tree94f2c3f513e875521a52854c10239c78d79a35a8 /conf
parentc8772c1ae9e79950b110d4b258cfa5c03b046339 (diff)
downloadmeta-xilinx-2c8e7f07d367397dc1d4aaa635801b11c3c0f5ce.tar.gz
zc702-zynq7: Switch over to in kernel device tree
* Switch to the device tree that is available in the kernel source tree * Remove the in layer device tree and configuration for the in layer device tree * Setup IMAGE_BOOT_FILES with the correct target device tree from the kernel source/recipe * Setup U-Boot uEnv.txt to use the correct target device tree Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/boards/zc702/zc702-zynq7-board.dtsi149
-rw-r--r--conf/machine/boards/zc702/zc702-zynq7.dts5
-rw-r--r--conf/machine/zc702-zynq7.conf10
3 files changed, 3 insertions, 161 deletions
diff --git a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi b/conf/machine/boards/zc702/zc702-zynq7-board.dtsi
deleted file mode 100644
index 686aa9f3..00000000
--- a/conf/machine/boards/zc702/zc702-zynq7-board.dtsi
+++ /dev/null
@@ -1,149 +0,0 @@
1/*
2 * ZC702 DTS file header for generic boot.
3 */
4
5/ {
6 model = "Xilinx ZC702";
7 chosen {
8 bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw";
9 linux,stdout-path = "/amba@0/serial@e0001000";
10 } ;
11 ps7_ddr_0: memory@0 {
12 device_type = "memory";
13 reg = <0x0 0x40000000>;
14 } ;
15 ps7_axi_interconnect_0: amba@0 {
16 ps7_ethernet_0: ps7-ethernet@e000b000 {
17 phy-handle = <&phy0>;
18 phy-mode = "rgmii-id";
19 phy0: phy@7 {
20 compatible = "marvell,88e1116r";
21 device_type = "ethernet-phy";
22 reg = <7>;
23 } ;
24 } ;
25 ps7_qspi_0: ps7-qspi@e000d000 {
26 flash@0 {
27 compatible = "micron,n25q128a11", "jedec,spi-nor";
28 reg = <0x0>;
29 spi-tx-bus-width = <1>;
30 spi-rx-bus-width = <4>;
31 spi-max-frequency = <50000000>;
32 #address-cells = <1>;
33 #size-cells = <1>;
34 partition@qspi-fsbl-uboot {
35 label = "qspi-fsbl-uboot";
36 reg = <0x0 0x100000>;
37 };
38 partition@qspi-linux {
39 label = "qspi-linux";
40 reg = <0x100000 0x500000>;
41 };
42 partition@qspi-device-tree {
43 label = "qspi-device-tree";
44 reg = <0x600000 0x20000>;
45 };
46 partition@qspi-rootfs {
47 label = "qspi-rootfs";
48 reg = <0x620000 0x5E0000>;
49 };
50 partition@qspi-bitstream {
51 label = "qspi-bitstream";
52 reg = <0xC00000 0x400000>;
53 };
54 };
55 } ;
56 ps7_i2c_0: ps7-i2c@e0004000 {
57 /* I2C Switch */
58 i2cswitch@74 {
59 compatible = "nxp,pca9548";
60 #address-cells = <1>;
61 #size-cells = <0>;
62 reg = <0x74>;
63
64 i2c@0 {
65 #address-cells = <1>;
66 #size-cells = <0>;
67 reg = <0>;
68 osc@5d {
69 #clock-cells = <0>;
70 compatible = "silabs,si570";
71 temperature-stability = <50>;
72 reg = <0x5d>;
73 factory-fout = <156250000>;
74 initial-fout = <148500000>;
75 };
76 };
77
78 i2c@2 {
79 #address-cells = <1>;
80 #size-cells = <0>;
81 reg = <2>;
82 eeprom@54 {
83 compatible = "at,24c08";
84 reg = <0x54>;
85 };
86 };
87
88 i2c@3 {
89 #address-cells = <1>;
90 #size-cells = <0>;
91 reg = <3>;
92 gpio@21 {
93 compatible = "ti,tca6416";
94 reg = <0x21>;
95 gpio-controller;
96 #gpio-cells = <2>;
97 };
98 };
99
100 i2c@4 {
101 #address-cells = <1>;
102 #size-cells = <0>;
103 reg = <4>;
104 rtc@54 {
105 compatible = "nxp,pcf8563";
106 reg = <0x51>;
107 };
108 };
109
110 i2c@7 {
111 #address-cells = <1>;
112 #size-cells = <0>;
113 reg = <7>;
114 hwmon@52 {
115 compatible = "pmbus,ucd9248";
116 reg = <52>;
117 };
118 hwmon@53 {
119 compatible = "pmbus,ucd9248";
120 reg = <53>;
121 };
122 hwmon@54 {
123 compatible = "pmbus,ucd9248";
124 reg = <54>;
125 };
126 };
127 };
128 };
129 ps7_usb_0: ps7-usb@e0002000 {
130 xlnx,phy-reset-gpio = <&ps7_gpio_0 7 0>; /* MIO USB PHY Reset */
131 usb-phy = <&usb0_phy>;
132 } ;
133
134 /* Disabled Devices */
135 ps7_sd_1: ps7-sdio@e0101000 { compatible = "invalid"; };
136 ps7_uart_0: serial@e0000000 { compatible = "invalid"; };
137 ps7_ethernet_1: ps7-ethernet@e000c000 { compatible = "invalid"; };
138 ps7_i2c_1: ps7-i2c@e0005000 { compatible = "invalid"; };
139 ps7_can_0: ps7-can@e0008000 { compatible = "invalid"; };
140 ps7_can_1: ps7-can@e0009000 { compatible = "invalid"; };
141 ps7_usb_1: ps7-usb@e0003000 { compatible = "invalid"; };
142 } ;
143
144 usb0_phy: usb-phy {
145 #phy-cells = <0>;
146 compatible = "usb-nop-xceiv";
147 reset-gpios = <&ps7_gpio_0 7 1>; /* MIO 7, GPIO_ACTIVE_LOW */
148 } ;
149} ;
diff --git a/conf/machine/boards/zc702/zc702-zynq7.dts b/conf/machine/boards/zc702/zc702-zynq7.dts
deleted file mode 100644
index 8c5f197a..00000000
--- a/conf/machine/boards/zc702/zc702-zynq7.dts
+++ /dev/null
@@ -1,5 +0,0 @@
1/dts-v1/;
2/include/ "zynq7-base.dtsi"
3/include/ "zc702-zynq7-board.dtsi"
4/ {
5} ; \ No newline at end of file
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 1417c514..9a505b3a 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -15,18 +15,14 @@ require conf/machine/include/machine-xilinx-board.inc
15 15
16MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 16MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
17 17
18# ZC702 machine definition known by Xilinx UBOOT 18# u-boot configuration
19UBOOT_MACHINE = "zynq_zc702_config" 19UBOOT_MACHINE = "zynq_zc702_config"
20SPL_BINARY = "boot.bin" 20SPL_BINARY = "boot.bin"
21 21
22SERIAL_CONSOLE = "115200 ttyPS0" 22SERIAL_CONSOLE = "115200 ttyPS0"
23 23
24MACHINE_DEVICETREE := " \ 24KERNEL_DEVICETREE = "zynq-zc702.dtb"
25 zc702/zc702-zynq7-board.dtsi \
26 zc702/zc702-zynq7.dts \
27 "
28
29KERNEL_FEATURES += "features/rtc/rtc.scc" 25KERNEL_FEATURES += "features/rtc/rtc.scc"
30 26
31IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${MACHINE}.dtb" 27IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${KERNEL_IMAGETYPE}-zynq-zc702.dtb"
32 28
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-21 21:14:20 +0000