From d82cef3dca9749f385a16f506ca285f963584e3c Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 24 Feb 2016 16:42:21 +1000 Subject: zedboard-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 --- .../boards/zedboard/zedboard-zynq7-board.dtsi | 79 ---------------------- conf/machine/boards/zedboard/zedboard-zynq7.dts | 5 -- conf/machine/zedboard-zynq7.conf | 9 +-- .../u-boot/u-boot-xlnx/zedboard-zynq7/uEnv.txt | 2 +- 4 files changed, 4 insertions(+), 91 deletions(-) delete mode 100644 conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi delete mode 100644 conf/machine/boards/zedboard/zedboard-zynq7.dts diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi b/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi deleted file mode 100644 index 2ccfe1cc..00000000 --- a/conf/machine/boards/zedboard/zedboard-zynq7-board.dtsi +++ /dev/null @@ -1,79 +0,0 @@ -/* - * ZedBoard DTS file header for generic boot. - */ - -/ { - 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"; - phy0: phy@0 { - compatible = "marvell,88e1518", "marvell,88e1510"; - device_type = "ethernet-phy"; - reg = <0>; - marvell,reg-init = <3 16 0xff00 0x1e 3 17 0xfff0 0x0a>; - } ; - } ; - ps7_usb_0: ps7-usb@e0002000 { - xlnx,phy-reset-gpio = <&ps7_gpio_0 85 0>; - usb-phy = <&usb0_phy>; - } ; - ps7_qspi_0: ps7-qspi@e000d000 { - flash@0 { - compatible = "spansion,s25fl256s0", "jedec,spi-nor"; - reg = <0x0>; - spi-tx-bus-width = <1>; - spi-rx-bus-width = <4>; - 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"; }; - } ; - - usb0_phy: usb-phy { - #phy-cells = <0>; - compatible = "usb-nop-xceiv"; - reset-gpios = <&ps7_gpio_0 85 1>; /* MIO 85, GPIO_ACTIVE_LOW */ - } ; -} ; diff --git a/conf/machine/boards/zedboard/zedboard-zynq7.dts b/conf/machine/boards/zedboard/zedboard-zynq7.dts deleted file mode 100644 index e16e15ba..00000000 --- a/conf/machine/boards/zedboard/zedboard-zynq7.dts +++ /dev/null @@ -1,5 +0,0 @@ -/dts-v1/; -/include/ "zynq7-base.dtsi" -/include/ "zedboard-zynq7-board.dtsi" -/ { -} ; \ No newline at end of file diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf index cbf0f012..0eb85e5b 100644 --- a/conf/machine/zedboard-zynq7.conf +++ b/conf/machine/zedboard-zynq7.conf @@ -12,16 +12,13 @@ require conf/machine/include/tune-zynq.inc require conf/machine/include/machine-xilinx-default.inc require conf/machine/include/machine-xilinx-board.inc -# Zedboard machine definition known by Xilinx UBOOT +# u-boot configuration UBOOT_MACHINE = "zynq_zed_config" SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" -MACHINE_DEVICETREE := " \ - zedboard/zedboard-zynq7-board.dtsi \ - zedboard/zedboard-zynq7.dts \ - " +KERNEL_DEVICETREE = "zynq-zed.dtb" -IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${MACHINE}.dtb" +IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${KERNEL_IMAGETYPE}-zynq-zed.dtb" diff --git a/recipes-bsp/u-boot/u-boot-xlnx/zedboard-zynq7/uEnv.txt b/recipes-bsp/u-boot/u-boot-xlnx/zedboard-zynq7/uEnv.txt index 076b5f9d..22b922a5 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx/zedboard-zynq7/uEnv.txt +++ b/recipes-bsp/u-boot/u-boot-xlnx/zedboard-zynq7/uEnv.txt @@ -1,4 +1,4 @@ kernel_image=uImage -devicetree_image=zedboard-zynq7.dtb +devicetree_image=uImage-zynq-zed.dtb bootargs=console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait earlyprintk uenvcmd=echo Copying Linux from SD to RAM... && fatload mmc 0 0x3000000 ${kernel_image} && fatload mmc 0 0x2A00000 ${devicetree_image} && bootm 0x3000000 - 0x2A00000 -- cgit v1.2.3-54-g00ecf