-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Michael Walle Sent: Friday, November 26, 2021 10:04 PM To: u-boot@lists.denx.de Cc: Mingkai Hu mingkai.hu@nxp.com; Rajesh Bhagat rajesh.bhagat@nxp.com; Michael Walle michael@walle.cc Subject: [PATCH 1/5] armv8: include psci_update_dt() unconditionally
psci_update_dt() is also required if CONFIG_ARMV8_PSCI is set, that is, if u-boot is the PSCI provider. Guard the check which is intended to call into the PSCI implementation in the secure firmware, by the proper macro SEC_FIRMWARE_ARMV8_PSCI.
Signed-off-by: Michael Walle michael@walle.cc
arch/arm/cpu/armv8/cpu-dt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c index 61c38b17cb..1bf8fbaae3 100644 --- a/arch/arm/cpu/armv8/cpu-dt.c +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -8,8 +8,8 @@ #include <asm/psci.h> #include <asm/system.h> #include <asm/armv8/sec_firmware.h> +#include <linux/libfdt.h>
-#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) int psci_update_dt(void *fdt) { /* @@ -18,8 +18,10 @@ int psci_update_dt(void *fdt) * number to support detecting PSCI dynamically and then switching * the SMP boot method between PSCI and spin-table. */
- if (sec_firmware_support_psci_version() == PSCI_INVALID_VER)
- if (CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) &&
sec_firmware_support_psci_version() == PSCI_INVALID_VER)- fdt_psci(fdt);
#if defined(CONFIG_ARMV8_PSCI) && !defined(CONFIG_ARMV8_SECURE_BASE) @@ -30,4 +32,3 @@ int psci_update_dt(void *fdt)
return 0; }
-#endif
2.30.2
Kindly fix build for renesas platforms
2022-02-25T15:26:42.0514001Z Summary of current source for 17 boards (2 threads, 1 job per thread) 2022-02-25T15:26:42.0515545Z aarch64: w+ r8a77980_condor r8a77995_draak r8a77970_eagle r8a77990_ebisu rcar3_salvator-x rcar3_ulcb + r8a779a0_falcon 2022-02-25T15:26:42.0516492Z arm: w+ alt blanche gose koelsch lager porter silk stout 2022-02-25T15:26:42.0516894Z sh: w+ r2dplus 2022-02-25T15:26:42.0517553Z +srec_cat: warning: option "-Little_Endian_CONSTant" is deprecated, please use 2022-02-25T15:26:42.0518178Z + "-CONSTant_Little_Endian" instead 2022-02-25T15:26:42.0518870Z +aarch64-linux-ld.bfd: arch/arm/mach-rmobile/psci-r8a779a0.o: in function `psci_update_dt': 2022-02-25T15:26:42.0520304Z +arch/arm/mach-rmobile/psci-r8a779a0.c:49: multiple definition of `psci_update_dt'; arch/arm/cpu/armv8/cpu-dt.o:arch/arm/cpu/armv8/cpu-dt.c:14: first defined here 2022-02-25T15:26:42.0521147Z +make[1]: *** [Makefile:1801: u-boot] Error 1 2022-02-25T15:26:42.0521728Z +make: *** [Makefile:177: sub-make] Error 2
Regards Priyanka