[U-Boot] [PATCH] arm: zynq: Update ZYBO config options

[Michal Simek]

On 8.12.2015 15:44, Nathan Rossi wrote:
> Update the ZYBO device tree and enable config options that relate to the
> added devices in the device tree.
> 
> Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
> Cc: Albert Aribaud <albert.u.boot at aribaud.net>
> Cc: Michal Simek <monstr at monstr.eu>
> Cc: Simon Glass <sjg at chromium.org>
> ---
>  arch/arm/dts/zynq-zybo.dts  | 18 ++++++++++++++++++
>  configs/zynq_zybo_defconfig |  3 +++
>  include/configs/zynq_zybo.h |  1 +
>  3 files changed, 22 insertions(+)
> 
> diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts
> index dcfc00e..fbbb891 100644
> --- a/arch/arm/dts/zynq-zybo.dts
> +++ b/arch/arm/dts/zynq-zybo.dts
> @@ -16,6 +16,8 @@
>  	aliases {
>  		ethernet0 = &gem0;
>  		serial0 = &uart1;
> +		spi0 = &qspi;
> +		mmc0 = &sdhci0;
>  	};
>  
>  	memory {
> @@ -28,6 +30,10 @@
>  		stdout-path = "serial0:115200n8";
>  	};
>  
> +	usb_phy0: phy0 {
> +		compatible = "usb-nop-xceiv";
> +		#phy-cells = <0>;
> +	};
>  };
>  
>  &clkc {
> @@ -45,6 +51,7 @@
>  };
>  
>  &sdhci0 {
> +	u-boot,dm-pre-reloc;
>  	status = "okay";
>  };
>  
> @@ -52,3 +59,14 @@
>  	u-boot,dm-pre-reloc;
>  	status = "okay";
>  };
> +
> +&qspi {
> +	u-boot,dm-pre-reloc;
> +	status = "okay";
> +};
> +
> +&usb0 {
> +	status = "okay";
> +	dr_mode = "host";
> +	usb-phy = <&usb_phy0>;
> +};
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> index 6f0bd0b..d443e92 100644
> --- a/configs/zynq_zybo_defconfig
> +++ b/configs/zynq_zybo_defconfig
> @@ -17,3 +17,6 @@ CONFIG_DEBUG_UART=y
>  CONFIG_DEBUG_UART_ZYNQ=y
>  CONFIG_DEBUG_UART_BASE=0xe0001000
>  CONFIG_DEBUG_UART_CLOCK=50000000
> +CONFIG_SPI_FLASH=y
> +CONFIG_SPI_FLASH_SPANSION=y
> +CONFIG_ZYNQ_QSPI=y
> diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
> index 5d1a9d5..c53ba79 100644
> --- a/include/configs/zynq_zybo.h
> +++ b/include/configs/zynq_zybo.h
> @@ -15,6 +15,7 @@
>  
>  #define CONFIG_SYS_NO_FLASH
>  
> +#define CONFIG_ZYNQ_USB
>  #define CONFIG_ZYNQ_SDHCI0
>  #define CONFIG_ZYNQ_BOOT_FREEBSD
>  
> 

Applied. There is a conflict with the patch I sent before this one but I
will resolve it.

Thanks,
Michal


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151209/10e0c324/attachment.sig>