From 62d1fde75f96445025522c8739971d40d9c1c6b9 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 12 Mar 2014 17:48:33 +1000 Subject: zedboard-zynq7: Cleaned up device trees and configuration * Cleaned up device trees, refactored the dts per boot args setup Signed-off-by: Nathan Rossi --- .../boards/zedboard/zedboard-zynq7-board.dtsi | 73 ++++++++++++++++++++++ .../boards/zedboard/zedboard-zynq7-mmcblk0p2.dts | 11 ---- .../machine/boards/zedboard/zedboard-zynq7-ram.dts | 11 ---- conf/machine/boards/zedboard/zedboard-zynq7.dts | 4 ++ conf/machine/boards/zedboard/zedboard-zynq7.dtsi | 69 -------------------- conf/machine/zedboard-zynq7.conf | 9 +-- 6 files changed, 79 insertions(+), 98 deletions(-) create mode 100644 conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi delete mode 100644 conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts delete mode 100644 conf/machine/boards/zedboard/zedboard-zynq7-ram.dts create mode 100644 conf/machine/boards/zedboard/zedboard-zynq7.dts delete mode 100644 conf/machine/boards/zedboard/zedboard-zynq7.dtsi diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi new file mode 100644 index 00000000..fb4a0594 --- /dev/null +++ b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi @@ -0,0 +1,73 @@ +/* + * ZedBoard DTS file header for generic boot. + */ + +/include/ "zynq-7-base.dtsi" +/ { + model = "ZedBoard"; + chosen { + bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/ram rw"; + linux,stdout-path = "/axi@0/serial@e0001000"; + } ; + ps7_ddr_0: memory@0 { + device_type = "memory"; + reg = <0x0 0x20000000>; + } ; + ps7_axi_interconnect_0: amba@0 { + ps7_ethernet_0: ps7-ethernet@e000b000 { + phy-handle = <&phy0>; + phy-mode = "rgmii-id"; + mdio { + phy0: phy@0 { + compatible = "marvell,88e1518"; + device_type = "ethernet-phy"; + reg = <0>; + } ; + } ; + } ; + ps7_qspi_0: ps7-qspi@e000d000 { + flash@0 { + compatible = "n25q128"; + reg = <0x0>; + spi-max-frequency = <50000000>; + #address-cells = <1>; + #size-cells = <1>; + partition@qspi-fsbl-uboot { + label = "qspi-fsbl-uboot"; + reg = <0x0 0x100000>; + }; + partition@qspi-linux { + label = "qspi-linux"; + reg = <0x100000 0x500000>; + }; + partition@qspi-device-tree { + label = "qspi-device-tree"; + reg = <0x600000 0x20000>; + }; + partition@qspi-rootfs { + label = "qspi-rootfs"; + reg = <0x620000 0x5E0000>; + }; + partition@qspi-bitstream { + label = "qspi-bitstream"; + reg = <0xC00000 0x400000>; + }; + }; + } ; + ps7_gpio_0: ps7-gpio@e000a000 { + gpio-mask-high = <0xc0000>; + gpio-mask-low = <0xfe81>; + } ; + + /* Disabled Devices */ + ps7_sd_1: ps7-sdio@e0101000 { 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"; }; + ps7_usb_1: ps7-usb@e0003000 { compatible = "invalid"; }; + } ; +} ; diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts b/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts deleted file mode 100644 index 305acf7d..00000000 --- a/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Zedboard DTS file header for sdcard/mmc partition 2 boot. - */ - -/dts-v1/; -/include/ "zedboard-zynq7.dtsi" -/ { - chosen { - bootargs = "console=ttyPS0,115200 root=/dev/mmcblk0p2 ro earlyprintk"; - } ; -} ; diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts b/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts deleted file mode 100644 index 8c91db45..00000000 --- a/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Zedboard DTS file header for ramdisk boot. - */ - -/dts-v1/; -/include/ "zedboard-zynq7.dtsi" -/ { - chosen { - bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk"; - } ; -} ; diff --git a/conf/machine/boards/zedboard/zedboard-zynq7.dts b/conf/machine/boards/zedboard/zedboard-zynq7.dts new file mode 100644 index 00000000..2874837d --- /dev/null +++ b/conf/machine/boards/zedboard/zedboard-zynq7.dts @@ -0,0 +1,4 @@ +/dts-v1/; +/include/ "zedboard-zynq7-board.dtsi" +/ { +} ; \ No newline at end of file diff --git a/conf/machine/boards/zedboard/zedboard-zynq7.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7.dtsi deleted file mode 100644 index af5c8b0e..00000000 --- a/conf/machine/boards/zedboard/zedboard-zynq7.dtsi +++ /dev/null @@ -1,69 +0,0 @@ -/include/ "zynq-7-base.dtsi" -/ { - model = "ZedBoard"; - chosen { - bootargs = "console=ttyPS0,115200 earlyprintk"; - linux,stdout-path = "/axi@0/serial@e0001000"; - } ; - ps7_ddr_0: memory@0 { - device_type = "memory"; - reg = <0x0 0x20000000>; - } ; - ps7_axi_interconnect_0: amba@0 { - ps7_ethernet_0: ps7-ethernet@e000b000 { - phy-handle = <&phy0>; - phy-mode = "rgmii-id"; - mdio { - phy0: phy@0 { - compatible = "marvell,88e1518"; - device_type = "ethernet-phy"; - reg = <0>; - } ; - } ; - } ; - ps7_qspi_0: ps7-qspi@e000d000 { - flash@0 { - compatible = "n25q128"; - reg = <0x0>; - spi-max-frequency = <50000000>; - #address-cells = <1>; - #size-cells = <1>; - partition@qspi-fsbl-uboot { - label = "qspi-fsbl-uboot"; - reg = <0x0 0x100000>; - }; - partition@qspi-linux { - label = "qspi-linux"; - reg = <0x100000 0x500000>; - }; - partition@qspi-device-tree { - label = "qspi-device-tree"; - reg = <0x600000 0x20000>; - }; - partition@qspi-rootfs { - label = "qspi-rootfs"; - reg = <0x620000 0x5E0000>; - }; - partition@qspi-bitstream { - label = "qspi-bitstream"; - reg = <0xC00000 0x400000>; - }; - }; - } ; - ps7_gpio_0: ps7-gpio@e000a000 { - gpio-mask-high = <0xc0000>; - gpio-mask-low = <0xfe81>; - } ; - - /* Disabled Devices */ - ps7_sd_1: ps7-sdio@e0101000 { 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"; }; - ps7_usb_1: ps7-usb@e0003000 { compatible = "invalid"; }; - } ; -} ; diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf index c668c3e4..6b313cfb 100644 --- a/conf/machine/zedboard-zynq7.conf +++ b/conf/machine/zedboard-zynq7.conf @@ -8,10 +8,6 @@ # http://www.zedboard.org/reference-designs-categories/zynq-concepts-tools-and-techniques-zedboard # -# Versions corresponding to zedboard documentation -PREFERRED_VERSION_linux-xlnx ?= "3.8%" -PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%" - require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-default.inc @@ -21,7 +17,6 @@ UBOOT_MACHINE = "zynq_zed_config" SERIAL_CONSOLE = "115200 ttyPS0" MACHINE_DEVICETREE := " \ - zedboard/zedboard-zynq7.dtsi \ - zedboard/zedboard-zynq7-mmcblk0p2.dts \ - zedboard/zedboard-zynq7-ram.dts \ + zedboard/zedboard-zynq7-board.dtsi \ + zedboard/zedboard-zynq7.dts \ " -- cgit v1.2.3-54-g00ecf