From d26db6bb9598a91826bb3e8e393d79e6dda457ea Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 15 Jul 2013 13:46:26 +1000 Subject: machine/zedboard-zynq7: Fixed to use updated naming convention * Added machine documentation, reference material and links Signed-off-by: Nathan Rossi --- .../boards/zedboard/zedboard-zynq7-mmcblk0p2.dts | 11 ++++ .../machine/boards/zedboard/zedboard-zynq7-ram.dts | 11 ++++ conf/machine/boards/zedboard/zedboard-zynq7.dtsi | 63 ++++++++++++++++++++++ .../boards/zedboard/zynq7-zedboard-mmcblkc0p2.dts | 11 ---- .../machine/boards/zedboard/zynq7-zedboard-ram.dts | 11 ---- conf/machine/boards/zedboard/zynq7-zedboard.dtsi | 63 ---------------------- conf/machine/zedboard-zynq7.conf | 30 +++++++++++ conf/machine/zynq7-zedboard.conf | 24 --------- 8 files changed, 115 insertions(+), 109 deletions(-) create mode 100644 conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts create mode 100644 conf/machine/boards/zedboard/zedboard-zynq7-ram.dts create mode 100644 conf/machine/boards/zedboard/zedboard-zynq7.dtsi delete mode 100644 conf/machine/boards/zedboard/zynq7-zedboard-mmcblkc0p2.dts delete mode 100644 conf/machine/boards/zedboard/zynq7-zedboard-ram.dts delete mode 100644 conf/machine/boards/zedboard/zynq7-zedboard.dtsi create mode 100644 conf/machine/zedboard-zynq7.conf delete mode 100644 conf/machine/zynq7-zedboard.conf diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts b/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts new file mode 100644 index 00000000..305acf7d --- /dev/null +++ b/conf/machine/boards/zedboard/zedboard-zynq7-mmcblk0p2.dts @@ -0,0 +1,11 @@ +/* + * 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 new file mode 100644 index 00000000..8c91db45 --- /dev/null +++ b/conf/machine/boards/zedboard/zedboard-zynq7-ram.dts @@ -0,0 +1,11 @@ +/* + * 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.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7.dtsi new file mode 100644 index 00000000..3f3d67ac --- /dev/null +++ b/conf/machine/boards/zedboard/zedboard-zynq7.dtsi @@ -0,0 +1,63 @@ +/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 { + mdio { + phy0: phy@7 { + compatible = "marvell,88e1510"; + device_type = "ethernet-phy"; + reg = <7>; + } ; + } ; + } ; + 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>; + }; + }; + } ; + + /* 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/zynq7-zedboard-mmcblkc0p2.dts b/conf/machine/boards/zedboard/zynq7-zedboard-mmcblkc0p2.dts deleted file mode 100644 index ef0c1014..00000000 --- a/conf/machine/boards/zedboard/zynq7-zedboard-mmcblkc0p2.dts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Zedboard DTS file header for sdcard/mmc partition 2 boot. - */ - -/dts-v1/; -/include/ "zynq7-zedboard.dtsi" -/ { - chosen { - bootargs = "console=ttyPS0,115200 root=/dev/mmcblk0p2 ro earlyprintk"; - } ; -} ; diff --git a/conf/machine/boards/zedboard/zynq7-zedboard-ram.dts b/conf/machine/boards/zedboard/zynq7-zedboard-ram.dts deleted file mode 100644 index c2556a3d..00000000 --- a/conf/machine/boards/zedboard/zynq7-zedboard-ram.dts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Zedboard DTS file header for ramdisk boot. - */ - -/dts-v1/; -/include/ "zynq7-zedboard.dtsi" -/ { - chosen { - bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk"; - } ; -} ; diff --git a/conf/machine/boards/zedboard/zynq7-zedboard.dtsi b/conf/machine/boards/zedboard/zynq7-zedboard.dtsi deleted file mode 100644 index 3f3d67ac..00000000 --- a/conf/machine/boards/zedboard/zynq7-zedboard.dtsi +++ /dev/null @@ -1,63 +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 { - mdio { - phy0: phy@7 { - compatible = "marvell,88e1510"; - device_type = "ethernet-phy"; - reg = <7>; - } ; - } ; - } ; - 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>; - }; - }; - } ; - - /* 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 new file mode 100644 index 00000000..94c853c1 --- /dev/null +++ b/conf/machine/zedboard-zynq7.conf @@ -0,0 +1,30 @@ +#@TYPE: Machine +#@NAME: zedboard-zynq7 +#@DESCRIPTION: Machine support for ZedBoard. (http://www.zedboard.org/) +# +# For details on the Evaluation board: +# http://www.zedboard.org/content/overview +# For design files (including 'zynq_fsbl_0.elf') for the ZedBoard: +# 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 + +# Zedboard machine definition known by Xilinx UBOOT +UBOOT_MACHINE = "zynq_zed_config" + +SERIAL_CONSOLE = "115200 ttyPS0" + +MACHINE_DEVICETREE := " \ + ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7.dtsi \ + ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7-mmcblk0p2.dts \ + ${XILINX_BOARDDIR}/zedboard/zedboard-zynq7-ram.dts \ + " +MACHINE_KCONFIG := " \ + ${XILINX_BOARDDIR}/common/xilinx_zynq_defconfig_${LINUX_VERSION}.cfg \ + ${XILINX_BOARDDIR}/common/nortc.cfg \ + " diff --git a/conf/machine/zynq7-zedboard.conf b/conf/machine/zynq7-zedboard.conf deleted file mode 100644 index d919d758..00000000 --- a/conf/machine/zynq7-zedboard.conf +++ /dev/null @@ -1,24 +0,0 @@ -#@TYPE: Machine -#@NAME: zynq7-zedboard -#@DESCRIPTION: Machine support for zedboard. (http://www.zedboard.org/) - -# 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 - -# Zedboard machine definition known by Xilinx UBOOT -UBOOT_MACHINE = "zynq_zed_config" - -SERIAL_CONSOLE = "115200 ttyPS0" - -MACHINE_DEVICETREE := " \ - ${XILINX_BOARDDIR}/zedboard/zynq7-zedboard.dtsi \ - ${XILINX_BOARDDIR}/zedboard/zynq7-zedboard-mmcblkc0p2.dts \ - ${XILINX_BOARDDIR}/zedboard/zynq7-zedboard-ram.dts \ - " -MACHINE_KCONFIG := " \ - ${XILINX_BOARDDIR}/common/xilinx_zynq_defconfig_${LINUX_VERSION}.cfg \ - ${XILINX_BOARDDIR}/common/nortc.cfg \ - " -- cgit v1.2.3-54-g00ecf