From 8741c490f9028db16634031fdf86ef3866fc3fc5 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 9 Nov 2015 10:39:44 +0100 Subject: ARM: zynq: Choose boot image based on OF_SEPARATE macro OF_CONTROL is enabled by default for all Zynq boards. The difference between two boot images is done by OF_SEPARATE or OF_EMBED macros. Signed-off-by: Michal Simek Reviewed-by: Tom Rini --- include/configs/zynq-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 99a3d021ad..f33a3bcc68 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -331,7 +331,7 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_FAT_SUPPORT -#ifdef CONFIG_OF_CONTROL +#ifdef CONFIG_OF_SEPARATE # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" #else # define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -- cgit From 721aed79126ba954028137eabe71678523a8b157 Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Fri, 25 Sep 2015 23:46:08 -0700 Subject: net: phy: Add support for Texas Instruments DP83867 Code is taken from Linux kernel driver (v4.2). Signed-off-by: Edgar E. Iglesias Signed-off-by: Michal Simek Reviewed-by: Tom Rini Acked-by: Joe Hershberger --- include/phy.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/phy.h b/include/phy.h index 3f826b66f7..66cf61bdfb 100644 --- a/include/phy.h +++ b/include/phy.h @@ -251,6 +251,7 @@ int phy_natsemi_init(void); int phy_realtek_init(void); int phy_smsc_init(void); int phy_teranetics_init(void); +int phy_ti_init(void); int phy_vitesse_init(void); int board_phy_config(struct phy_device *phydev); -- cgit From bf146325a3a802f5f2e6e17123080164109c6406 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 10 Nov 2015 10:48:05 +0100 Subject: ARM64: zynqmp: Enable TI phy by default Enable TI phy for Xilinx ZynqMP platform. Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 36c11009fc..574f788500 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -182,6 +182,7 @@ # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN # define CONFIG_PHYLIB # define CONFIG_PHY_MARVELL +# define CONFIG_PHY_TI #endif /* I2C */ -- cgit From 66eef1e780caf0bb3ecadf78582a29031c6279ce Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Tue, 17 Nov 2015 22:56:56 +1000 Subject: tools: zynqimage: Add Xilinx Zynq boot header generation to mkimage As with other platforms vendors love to create their own boot header formats. Xilinx is no different and for the Zynq platform/SoC there exists the "boot.bin" which is read by the platforms bootrom. This format is described to a useful extent within the Xilinx Zynq TRM. This implementation adds support for the 'zynqimage' to mkimage. The implementation only considers the most common boot header which is un-encrypted and packed directly after the boot header itself (no XIP, etc.). However this implementation does take into consideration the other fields of the header for image dumping use cases (vector table and register initialization). Signed-off-by: Nathan Rossi Cc: Michal Simek Cc: Tom Rini Reviewed-by: Tom Rini Signed-off-by: Michal Simek --- include/image.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/image.h b/include/image.h index 08ae24a86b..299d6d2a13 100644 --- a/include/image.h +++ b/include/image.h @@ -248,8 +248,9 @@ struct lmb; #define IH_TYPE_RKIMAGE 23 /* Rockchip Boot Image */ #define IH_TYPE_RKSD 24 /* Rockchip SD card */ #define IH_TYPE_RKSPI 25 /* Rockchip SPI image */ +#define IH_TYPE_ZYNQIMAGE 26 /* Xilinx Zynq Boot Image */ -#define IH_TYPE_COUNT 26 /* Number of image types */ +#define IH_TYPE_COUNT 27 /* Number of image types */ /* * Compression Types -- cgit From f3bd72801aade1eb74e153bfa57c26f327571475 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 29 Sep 2015 01:27:13 +0200 Subject: zynq: sdhci: Define max clock by macro zc1571 with silicon can operate on 200MHz maximum frequency. Setup this frequency by default and fix setting for ep108. Signed-off-by: Michal Simek --- include/configs/xilinx_zynqmp.h | 3 +++ include/configs/xilinx_zynqmp_ep.h | 1 + include/configs/zynq-common.h | 1 + 3 files changed, 5 insertions(+) (limited to 'include') diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 574f788500..e990512083 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -94,6 +94,9 @@ # define CONFIG_SDHCI # define CONFIG_ZYNQ_SDHCI # define CONFIG_CMD_MMC +# ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ +# define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000 +# endif #endif #if defined(CONFIG_ZYNQ_SDHCI) diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h index ed6023a7bf..8bdb5c9c6d 100644 --- a/include/configs/xilinx_zynqmp_ep.h +++ b/include/configs/xilinx_zynqmp_ep.h @@ -19,6 +19,7 @@ #define CONFIG_ZYNQ_GEM_PHY_ADDR0 7 #define CONFIG_ZYNQ_SDHCI0 +#define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #define CONFIG_ZYNQ_I2C0 #define CONFIG_SYS_I2C_ZYNQ #define CONFIG_ZYNQ_EEPROM diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index f33a3bcc68..d10f1ddaca 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -105,6 +105,7 @@ # define CONFIG_SDHCI # define CONFIG_ZYNQ_SDHCI # define CONFIG_CMD_MMC +# define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #endif #ifdef CONFIG_ZYNQ_USB -- cgit