From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 11 Feb 2020 11:43:14 +0000 (+0100)
Subject: arm64: zynqmp: Print multiboot register value in EL3
X-Git-Tag: v2020.07-rc1~41^2~4^2~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c51430133718d5ac9c0983c0f9dd4714f02c6184;p=oweals%2Fu-boot.git

arm64: zynqmp: Print multiboot register value in EL3

Multi boot register can be used for using different boot images and design
better boot strategy. Let EL3 SPL or U-Boot to read it and print it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h
index fd361c5ce8..a0acfa2ff1 100644
--- a/arch/arm/mach-zynqmp/include/mach/hardware.h
+++ b/arch/arm/mach-zynqmp/include/mach/hardware.h
@@ -128,7 +128,9 @@ struct apu_regs {
 #define ZYNQMP_SILICON_VER_SHIFT	12
 
 struct csu_regs {
-	u32 reserved0[17];
+	u32 reserved0[4];
+	u32 multi_boot;
+	u32 reserved1[12];
 	u32 version;
 };
 
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 8bdc67748e..ba1a126fbf 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -328,6 +328,17 @@ int board_early_init_f(void)
 	return ret;
 }
 
+static int multi_boot(void)
+{
+	u32 multiboot;
+
+	multiboot = readl(&csu_base->multi_boot);
+
+	printf("Multiboot:\t%x\n", multiboot);
+
+	return 0;
+}
+
 int board_init(void)
 {
 	struct udevice *dev;
@@ -356,6 +367,9 @@ int board_init(void)
 	}
 #endif
 
+	if (current_el() == 3)
+		multi_boot();
+
 	return 0;
 }