arm: zynqmp: Wire SPL/ATF handoff structure properly

handoff_setup() was used to generate fixed handoff structure for ATF on
ZynqMP platform.
Switching to bl2_plat_get_bl31_params() platform brings more flexibility
because information can be taken from fit image where /fit-images node is
created at run time.

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

diff --git a/arch/arm/mach-zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c
index f71ff7b3d257435aed455352561740ad6846eb0b..64e5320acc684cef3f11991292b18132463f1119 100644 (file)
--- a/arch/arm/mach-zynqmp/handoff.c
+++ b/arch/arm/mach-zynqmp/handoff.c
@@ -66,7 +66,9 @@ struct xfsbl_atf_handoff_params {
 };
 
 #ifdef CONFIG_SPL_OS_BOOT
-void handoff_setup(void)
+struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry,
+                                            uintptr_t bl33_entry,
+                                            uintptr_t fdt_addr)
 {
        struct xfsbl_atf_handoff_params *atfhandoffparams;
 
@@ -76,11 +78,16 @@ void handoff_setup(void)
        atfhandoffparams->magic[2] = 'N';
        atfhandoffparams->magic[3] = 'X';
 
-       atfhandoffparams->num_entries = 1;
-       atfhandoffparams->partition[0].entry_point = CONFIG_SYS_TEXT_BASE;
-       atfhandoffparams->partition[0].flags = FSBL_FLAGS_EL2 <<
-                                              FSBL_FLAGS_EL_SHIFT;
+       atfhandoffparams->num_entries = 0;
+       if (bl33_entry) {
+               atfhandoffparams->partition[0].entry_point = bl33_entry;
+               atfhandoffparams->partition[0].flags = FSBL_FLAGS_EL2 <<
+                                                      FSBL_FLAGS_EL_SHIFT;
+               atfhandoffparams->num_entries++;
+       }
 
        writel(CONFIG_SPL_TEXT_BASE, &pmu_base->gen_storage6);
+
+       return NULL;
 }
 #endif

diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
index 10b70761de4a6d19597aec3004bf00f3fd385dfd..2974ffbc2f5632b3376cd1cb95df97d208fe09a8 100644 (file)
--- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
@@ -46,8 +46,6 @@ struct zynqmp_ipi_msg {
 int zynq_board_read_rom_ethaddr(unsigned char *ethaddr);
 unsigned int zynqmp_get_silicon_version(void);
 
-void handoff_setup(void);
-
 int zynqmp_mmio_write(const u32 address, const u32 mask, const u32 value);
 int zynqmp_mmio_read(const u32 address, u32 *value);
 

diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c
index 095b4e61a59065f17214d055c9567491412c3d8b..896657f51c3d4e65bd573c7a812e8db72ce7fd81 100644 (file)
--- a/arch/arm/mach-zynqmp/spl.c
+++ b/arch/arm/mach-zynqmp/spl.c
@@ -120,8 +120,6 @@ u32 spl_boot_device(void)
 #ifdef CONFIG_SPL_OS_BOOT
 int spl_start_uboot(void)
 {
-       handoff_setup();
-
        return 0;
 }
 #endif