From fa8d43cb187c2f3ecd933c296589e3dbc5b76b92 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 10 May 2016 13:27:18 +0200 Subject: [PATCH] ARM: zynq: Fix cc108 support There is incorrect reference to cc108 SPL and also fix dts file to be aligned with the latest bitstream for this board. Signed-off-by: Michal Simek --- arch/arm/dts/zynq-cc108.dts | 4 +-- .../ps7_init_gpl.c | 0 .../ps7_init_gpl.h | 0 configs/zynq_cc108_defconfig | 31 +++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) rename board/xilinx/zynq/{cc108_hw_platform => zynq-cc108}/ps7_init_gpl.c (100%) rename board/xilinx/zynq/{cc108_hw_platform => zynq-cc108}/ps7_init_gpl.h (100%) diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts index 962a8ae8370..2467c19e1c1 100644 --- a/arch/arm/dts/zynq-cc108.dts +++ b/arch/arm/dts/zynq-cc108.dts @@ -18,7 +18,7 @@ aliases { ethernet0 = &gem0; - serial0 = &uart1; + serial0 = &uart0; spi0 = &qspi; }; @@ -98,7 +98,7 @@ wp-inverted ; }; -&uart1 { +&uart0 { status = "okay"; }; diff --git a/board/xilinx/zynq/cc108_hw_platform/ps7_init_gpl.c b/board/xilinx/zynq/zynq-cc108/ps7_init_gpl.c similarity index 100% rename from board/xilinx/zynq/cc108_hw_platform/ps7_init_gpl.c rename to board/xilinx/zynq/zynq-cc108/ps7_init_gpl.c diff --git a/board/xilinx/zynq/cc108_hw_platform/ps7_init_gpl.h b/board/xilinx/zynq/zynq-cc108/ps7_init_gpl.h similarity index 100% rename from board/xilinx/zynq/cc108_hw_platform/ps7_init_gpl.h rename to board/xilinx/zynq/zynq-cc108/ps7_init_gpl.h diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig index a64f0a3befe..78d6ccc698e 100644 --- a/configs/zynq_cc108_defconfig +++ b/configs/zynq_cc108_defconfig @@ -6,10 +6,30 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y CONFIG_SYS_NO_FLASH=y +CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Zynq> " # CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y CONFIG_OF_EMBED=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y +CONFIG_ZYNQ_SDHCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_ISSI=y @@ -24,3 +44,14 @@ CONFIG_DEBUG_UART_BASE=0xe0001000 CONFIG_DEBUG_UART_CLOCK=50000000 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ZYNQ_QSPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_ULPI=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Xilinx" +CONFIG_G_DNL_VENDOR_NUM=0x03fd +CONFIG_G_DNL_PRODUCT_NUM=0x0300 -- 2.47.3