Merge tag 'xilinx-for-v2019.04' of git://git.denx.de/u-boot-microblaze

Xilinx changes for v2019.04

tools:
- Fix zynqmpimage generation

zynq:
- Some configs/Kconfig/DT updates
- Enable REMAKE_ELF and OF_SEPARATE
- Topic boards update
- i2c cleanups and conversion to DM_I2C

zynqmp:
- Some configs/Kconfig/DT updates
- Board config cleanup
- Move arch folder to mach-zynqmp

versal:
- Enable DM_I2C, CMD_DM

zynq-gem:
- Fix driver cache handling

i2c:
- Live tree simple update

phy:
- Fixed phy cleanup

travis:
- Wire Versal SoC

3 files changed, 27 insertions, 23 deletions

diff --git a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
index c1cc1df23d..d90a350d3f 100644
--- a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
+++ b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
@@ -8,8 +8,8 @@
 
 static unsigned long ps7_pll_init_data_3_0[] = {
 	EMIT_MASKWRITE(0XF8000008, 0x0000FFFFU, 0x0000DF0DU),
-	EMIT_MASKWRITE(0XF8000110, 0x003FFFF0U, 0x000FA220U),
-	EMIT_MASKWRITE(0XF8000100, 0x0007F000U, 0x00028000U),
+	EMIT_MASKWRITE(0XF8000110, 0x003FFFF0U, 0x000FA240U),
+	EMIT_MASKWRITE(0XF8000100, 0x0007F000U, 0x00030000U),
 	EMIT_MASKWRITE(0XF8000100, 0x00000010U, 0x00000010U),
 	EMIT_MASKWRITE(0XF8000100, 0x00000001U, 0x00000001U),
 	EMIT_MASKWRITE(0XF8000100, 0x00000001U, 0x00000000U),
@@ -24,8 +24,8 @@ static unsigned long ps7_pll_init_data_3_0[] = {
 	EMIT_MASKPOLL(0XF800010C, 0x00000002U),
 	EMIT_MASKWRITE(0XF8000104, 0x00000010U, 0x00000000U),
 	EMIT_MASKWRITE(0XF8000124, 0xFFF00003U, 0x0C200003U),
-	EMIT_MASKWRITE(0XF8000118, 0x003FFFF0U, 0x00113220U),
-	EMIT_MASKWRITE(0XF8000108, 0x0007F000U, 0x00024000U),
+	EMIT_MASKWRITE(0XF8000118, 0x003FFFF0U, 0x001452C0U),
+	EMIT_MASKWRITE(0XF8000108, 0x0007F000U, 0x0001E000U),
 	EMIT_MASKWRITE(0XF8000108, 0x00000010U, 0x00000010U),
 	EMIT_MASKWRITE(0XF8000108, 0x00000001U, 0x00000001U),
 	EMIT_MASKWRITE(0XF8000108, 0x00000001U, 0x00000000U),
@@ -37,20 +37,18 @@ static unsigned long ps7_pll_init_data_3_0[] = {
 
 static unsigned long ps7_clock_init_data_3_0[] = {
 	EMIT_MASKWRITE(0XF8000008, 0x0000FFFFU, 0x0000DF0DU),
-	EMIT_MASKWRITE(0XF8000128, 0x03F03F01U, 0x00302301U),
-	EMIT_MASKWRITE(0XF8000138, 0x00000011U, 0x00000011U),
+	EMIT_MASKWRITE(0XF8000128, 0x03F03F01U, 0x00700F01U),
+	EMIT_MASKWRITE(0XF8000138, 0x00000011U, 0x00000001U),
 	EMIT_MASKWRITE(0XF800013C, 0x00000011U, 0x00000011U),
-	EMIT_MASKWRITE(0XF8000140, 0x03F03F71U, 0x00100141U),
-	EMIT_MASKWRITE(0XF8000144, 0x03F03F71U, 0x00100141U),
-	EMIT_MASKWRITE(0XF8000148, 0x00003F31U, 0x00000C01U),
-	EMIT_MASKWRITE(0XF800014C, 0x00003F31U, 0x00000601U),
-	EMIT_MASKWRITE(0XF8000150, 0x00003F33U, 0x00001803U),
-	EMIT_MASKWRITE(0XF8000154, 0x00003F33U, 0x00000C03U),
-	EMIT_MASKWRITE(0XF8000158, 0x00003F33U, 0x00000601U),
-	EMIT_MASKWRITE(0XF8000168, 0x00003F31U, 0x00000601U),
-	EMIT_MASKWRITE(0XF8000170, 0x03F03F30U, 0x00100C00U),
-	EMIT_MASKWRITE(0XF8000180, 0x03F03F30U, 0x00100C00U),
-	EMIT_MASKWRITE(0XF8000190, 0x03F03F30U, 0x00100600U),
+	EMIT_MASKWRITE(0XF8000140, 0x03F03F71U, 0x00100801U),
+	EMIT_MASKWRITE(0XF800014C, 0x00003F31U, 0x00000501U),
+	EMIT_MASKWRITE(0XF8000150, 0x00003F33U, 0x00000A01U),
+	EMIT_MASKWRITE(0XF8000154, 0x00003F33U, 0x00000A03U),
+	EMIT_MASKWRITE(0XF8000158, 0x00003F33U, 0x00000501U),
+	EMIT_MASKWRITE(0XF8000168, 0x00003F31U, 0x00000501U),
+	EMIT_MASKWRITE(0XF8000170, 0x03F03F30U, 0x00200500U),
+	EMIT_MASKWRITE(0XF8000180, 0x03F03F30U, 0x00100700U),
+	EMIT_MASKWRITE(0XF8000190, 0x03F03F30U, 0x00100500U),
 	EMIT_MASKWRITE(0XF80001A0, 0x03F03F30U, 0x00101800U),
 	EMIT_MASKWRITE(0XF80001C4, 0x00000001U, 0x00000001U),
 	EMIT_MASKWRITE(0XF800012C, 0x01FFCCCDU, 0x01FC4C4DU),
@@ -88,7 +86,7 @@ static unsigned long ps7_ddr_init_data_3_0[] = {
 	EMIT_MASKWRITE(0XF8006078, 0x03FFFFFFU, 0x00466111U),
 	EMIT_MASKWRITE(0XF800607C, 0x000FFFFFU, 0x00032222U),
 	EMIT_MASKWRITE(0XF80060A4, 0xFFFFFFFFU, 0x10200802U),
-	EMIT_MASKWRITE(0XF80060A8, 0x0FFFFFFFU, 0x0690CB73U),
+	EMIT_MASKWRITE(0XF80060A8, 0x0FFFFFFFU, 0x0690CB52U),
 	EMIT_MASKWRITE(0XF80060AC, 0x000001FFU, 0x000001FEU),
 	EMIT_MASKWRITE(0XF80060B0, 0x1FFFFFFFU, 0x1CFFFFFFU),
 	EMIT_MASKWRITE(0XF80060B4, 0x00000200U, 0x00000200U),
diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c
index 3e039ccb13..321670d4e3 100644
--- a/board/xilinx/zynqmp/cmds.c
+++ b/board/xilinx/zynqmp/cmds.c
@@ -174,11 +174,11 @@ static char zynqmp_help_text[] =
 	"zynqmp mmio_write address mask value - write value after masking to\n"
 	"					address\n"
 #ifdef CONFIG_DEFINE_TCM_OCM_MMAP
-	"zynqmp tcminit  mode - Initialize the TCM with zeros. TCM needs to be\n"
-	"		        initialized before accessing to avoid ECC\n"
-	"			errors. mode specifies in which mode TCM has\n"
-	"			to be initialized. Supported modes will be\n"
-	"			lock(0)/split(1)\n"
+	"zynqmp tcminit mode - Initialize the TCM with zeros. TCM needs to be\n"
+	"		       initialized before accessing to avoid ECC\n"
+	"		       errors. mode specifies in which mode TCM has\n"
+	"		       to be initialized. Supported modes will be\n"
+	"		       lock(0)/split(1)\n"
 #endif
 	;
 #endif
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 13c404b6ef..41e88b03f9 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -489,6 +489,7 @@ void reset_cpu(ulong addr)
 {
 }
 
+#if defined(CONFIG_BOARD_LATE_INIT)
 static const struct {
 	u32 bit;
 	const char *name;
@@ -587,6 +588,8 @@ int board_late_init(void)
 	case SD_MODE:
 		puts("SD_MODE\n");
 		if (uclass_get_device_by_name(UCLASS_MMC,
+					      "mmc@ff160000", &dev) &&
+		    uclass_get_device_by_name(UCLASS_MMC,
 					      "sdhci@ff160000", &dev)) {
 			puts("Boot from SD0 but without SD0 enabled!\n");
 			return -1;
@@ -603,6 +606,8 @@ int board_late_init(void)
 	case SD_MODE1:
 		puts("SD_MODE1\n");
 		if (uclass_get_device_by_name(UCLASS_MMC,
+					      "mmc@ff170000", &dev) &&
+		    uclass_get_device_by_name(UCLASS_MMC,
 					      "sdhci@ff170000", &dev)) {
 			puts("Boot from SD1 but without SD1 enabled!\n");
 			return -1;
@@ -655,6 +660,7 @@ int board_late_init(void)
 
 	return 0;
 }
+#endif
 
 int checkboard(void)
 {