* [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
@ 2022-02-02 16:55 Neal Frager
2022-02-02 22:28 ` Luca Ceresoli
2022-02-02 22:33 ` Giulio Benetti
0 siblings, 2 replies; 13+ messages in thread
From: Neal Frager @ 2022-02-02 16:55 UTC (permalink / raw)
To: buildroot; +Cc: luca, Neal Frager
Signed-off-by: Neal Frager <nealf@xilinx.com>
---
board/zynqmp/genimage.cfg | 1 +
...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
configs/zynqmp_zcu102_defconfig | 35 ++++
configs/zynqmp_zcu106_defconfig | 15 +-
8 files changed, 44 insertions(+), 484 deletions(-)
delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
create mode 100644 configs/zynqmp_zcu102_defconfig
diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
index ed202f4550..557364e124 100644
--- a/board/zynqmp/genimage.cfg
+++ b/board/zynqmp/genimage.cfg
@@ -3,6 +3,7 @@ image boot.vfat {
files = {
"boot.bin",
"u-boot.bin",
+ "u-boot.itb",
"atf-uboot.ub",
"system.dtb",
"Image"
diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
deleted file mode 100644
index 0c1a9ba2a4..0000000000
--- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001
-From: Deepika Bhavnani <deepika.bhavnani@arm.com>
-Date: Thu, 15 Aug 2019 00:56:46 +0300
-Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds
-
-GCC diagnostics were added to ignore array boundaries, instead
-of ignoring GCC warning current code will check for array boundaries
-and perform and array update only for valid elements.
-
-Resolves: `CID 246574` `CID 246710` `CID 246651`
-
-Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
-Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57
-
-Backported from: 41af05154abe136938bcfb5f26c969933784bbef
-[Adapted to apply on 1.5]
-
----
- lib/psci/psci_common.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c
-index 2220a745cd6e..6282d992a2f0 100644
---- a/lib/psci/psci_common.c
-+++ b/lib/psci/psci_common.c
-@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void)
- /******************************************************************************
- * Helper function to update the requested local power state array. This array
- * does not store the requested state for the CPU power level. Hence an
-- * assertion is added to prevent us from accessing the wrong index.
-+ * assertion is added to prevent us from accessing the CPU power level.
- *****************************************************************************/
- static void psci_set_req_local_pwr_state(unsigned int pwrlvl,
- unsigned int cpu_idx,
- plat_local_state_t req_pwr_state)
- {
-- /*
-- * This should never happen, we have this here to avoid
-- * "array subscript is above array bounds" errors in GCC.
-- */
- assert(pwrlvl > PSCI_CPU_PWR_LVL);
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Warray-bounds"
-- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
--#pragma GCC diagnostic pop
-+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
-+ (cpu_idx < PLATFORM_CORE_COUNT)) {
-+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state;
-+ }
- }
-
- /******************************************************************************
-@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl,
- {
- assert(pwrlvl > PSCI_CPU_PWR_LVL);
-
-- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx];
-+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
-+ (cpu_idx < PLATFORM_CORE_COUNT)) {
-+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx];
-+ } else
-+ return NULL;
- }
-
- /*
---
-2.34.0
-
diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
deleted file mode 100644
index 4d85e1bb12..0000000000
--- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001
-From: Luca Ceresoli <luca@lucaceresoli.net>
-Date: Mon, 26 Feb 2018 09:40:34 +0100
-Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting
-
-The U-Boot SPL generated with the current zcu106 defconfig cannot boot
-from MMC:
-
- [...]
- U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14)
- EL Level: EL3
- Trying to boot from MMC1
- sdhci_transfer_data: Error detected in status(0x408020)!
- spl_load_image_fat_os: error reading image u-boot.bin, err - -2
- spl_load_image_fat: error reading image u-boot.img, err - -6
- SPL: failed to boot from all boot devices
- ### ERROR ### Please RESET the board ###
-
-Fix by lowering the rpll value. The new value for the RPLL_CTRL
-register comes from the current psu_init_gpl.c from the HDF file at
-https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp
-(generated by Vivado v2017.4).
-
-RPLL and sdio1_ref clocks before and after this change:
-
- - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz
- - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz
-
-Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
-Cc: Michal Simek <michal.simek@xilinx.com>
-Upstream-status: accepted upstream in a different form
----
-
- board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
-index 4d18abe000ca..e6fa477e53e7 100644
---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
-+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
-@@ -10,7 +10,7 @@
- static unsigned long psu_pll_init_data(void)
- {
- psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U);
-- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U);
-+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U);
- psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U);
- psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U);
- psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U);
---
-2.7.4
-
diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
deleted file mode 100644
index 487fff6812..0000000000
--- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001
-From: Luca Ceresoli <luca@lucaceresoli.net>
-Date: Mon, 12 Mar 2018 17:18:38 +0100
-Subject: [PATCH] arm64: zynqmp: Enable booting to ATF
-
-U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot
-flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which
-pass control to full u-boot(EL2). This has been tested on zcu106, so
-enable it in this defconfig.
-
-To generate an image that triggers this booting flow, you need to pass
-'-O arm-trusted-firmware' to mkimage.
-
-Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
-Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71
----
-
- configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
- configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
- configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
- configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
- configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
- configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 +
- configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
- 7 files changed, 7 insertions(+)
-
-diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
-index c5bfa2b12638..488c72258b0e 100644
---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
-+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
-@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
- CONFIG_SPL_OS_BOOT=y
- CONFIG_SPL_RAM_SUPPORT=y
- CONFIG_SPL_RAM_DEVICE=y
-+CONFIG_SPL_ATF=y
- CONFIG_SYS_PROMPT="ZynqMP> "
- CONFIG_FASTBOOT=y
- CONFIG_FASTBOOT_FLASH=y
-diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
-index f86dce403a42..5d501eec0edd 100644
---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
-+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
-@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
- CONFIG_SPL_OS_BOOT=y
- CONFIG_SPL_RAM_SUPPORT=y
- CONFIG_SPL_RAM_DEVICE=y
-+CONFIG_SPL_ATF=y
- CONFIG_SYS_PROMPT="ZynqMP> "
- CONFIG_FASTBOOT=y
- CONFIG_FASTBOOT_FLASH=y
-diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
-index 6e947cf56827..6f7eaebd7676 100644
---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
-+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
-@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
- CONFIG_SPL_OS_BOOT=y
- CONFIG_SPL_RAM_SUPPORT=y
- CONFIG_SPL_RAM_DEVICE=y
-+CONFIG_SPL_ATF=y
- CONFIG_SYS_PROMPT="ZynqMP> "
- CONFIG_CMD_MEMTEST=y
- CONFIG_SYS_ALT_MEMTEST=y
-diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
-index 1c934858c61c..7a3806cba4b5 100644
---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
-+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
-@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
- CONFIG_SPL_OS_BOOT=y
- CONFIG_SPL_RAM_SUPPORT=y
- CONFIG_SPL_RAM_DEVICE=y
-+CONFIG_SPL_ATF=y
- CONFIG_SYS_PROMPT="ZynqMP> "
- CONFIG_CMD_MEMTEST=y
- CONFIG_SYS_ALT_MEMTEST=y
-diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
-index e13c7c56f310..e4408f182ca0 100644
---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
-+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
-@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
- CONFIG_SPL_OS_BOOT=y
- CONFIG_SPL_RAM_SUPPORT=y
- CONFIG_SPL_RAM_DEVICE=y
-+CONFIG_SPL_ATF=y
- CONFIG_SYS_PROMPT="ZynqMP> "
- CONFIG_FASTBOOT=y
- CONFIG_FASTBOOT_FLASH=y
-diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
-index 5b2cd495ee85..b52f6789fd4b 100644
---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
-+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
-@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
- CONFIG_SPL_OS_BOOT=y
- CONFIG_SPL_RAM_SUPPORT=y
- CONFIG_SPL_RAM_DEVICE=y
-+CONFIG_SPL_ATF=y
- CONFIG_SYS_PROMPT="ZynqMP> "
- CONFIG_FASTBOOT=y
- CONFIG_FASTBOOT_FLASH=y
-diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
-index e6530fbfe7ff..80592554f682 100644
---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
-+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
-@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
- CONFIG_SPL_OS_BOOT=y
- CONFIG_SPL_RAM_SUPPORT=y
- CONFIG_SPL_RAM_DEVICE=y
-+CONFIG_SPL_ATF=y
- CONFIG_SYS_PROMPT="ZynqMP> "
- CONFIG_FASTBOOT=y
- CONFIG_FASTBOOT_FLASH=y
---
-2.7.4
-
diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
deleted file mode 100644
index 95ab7b3b75..0000000000
--- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001
-From: Luca Ceresoli <luca@lucaceresoli.net>
-Date: Mon, 4 Jun 2018 12:21:01 +0200
-Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE
-
-The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus
-forcing it to be a relative path inside the U-Boot source tree. Since
-the PMUFW is a binary file generated outside of U-Boot, the PMUFW
-binary must be copied inside the U-Boot source tree before the
-build.
-
-This generates a few problems:
-
- * if the source tree is shared among different out-of-tree builds,
- they will pollute (and potentially corrupt) each other
- * the source tree cannot be read-only
- * any buildsystem must add a command to copy the PMUFW binary
- * putting an externally-generated binary in the source tree is ugly
- as hell
-
-Avoid these problems by accepting an absolute path for
-PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/"
-prefix, but in order to keep backward compatibility we rather use the
-shell and readlink to get the absolute path even when starting from a
-relative path.
-
-Since 'readlink -f' produces an empty string if the file does not
-exist, we also add a check to ensure the file configured in
-PMUFW_INIT_FILE exists. Otherwise the build would exit successfully,
-but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty.
-
-Tested in the 12 possible combinations of:
- - PMUFW_INIT_FILE empty, relative, absolute, non-existing
- - building in-tree, in subdir, in other directory
-
-Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
-Cc: Michal Simek <michal.simek@xilinx.com>
-Cc: Simon Glass <sjg@chromium.org>
-Cc: Emmanuel Vadot <manu@bidouilliste.com>
-Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626
----
- scripts/Makefile.spl | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
-index ef018b5b4056..252f13826d4c 100644
---- a/scripts/Makefile.spl
-+++ b/scripts/Makefile.spl
-@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ
- MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE)
- endif
- ifdef CONFIG_ARCH_ZYNQMP
-+ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
-+spl/boot.bin: zynqmp-check-pmufw
-+zynqmp-check-pmufw: FORCE
-+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
-+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false )
-+endif
- MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
-- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE)
-+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
- endif
-
- spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
---
-2.7.4
-
diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
deleted file mode 100644
index b32e162780..0000000000
--- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001
-From: Luca Ceresoli <luca@lucaceresoli.net>
-Date: Wed, 20 Jun 2018 12:11:50 +0200
-Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig
- variable
-
-U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on
-ZynqMP (PS init for short). The current logic to locate this file for
-both platforms is:
-
- 1. if a board-specific file exists in
- board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c
- then use it
- 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c
-
-In the latter case the file does not exist in the U-Boot sources and
-must be copied in the source tree from the outside before starting the
-build. This is typical when it is generated from Xilinx tools while
-developing a custom hardware. However making sure that a
-board-specific file is _not_ found (and used) requires some trickery
-such as removing or overwriting all PS init files (e.g.: the current
-meta-xilinx yocto layer [0]).
-
-This generates a few problems:
-
- * if the source tree is shared among different out-of-tree builds,
- they will pollute (and potentially corrupt) each other
- * the source tree cannot be read-only
- * any buildsystem must add a command to copy the PS init file binary
- * overwriting or deleting files in the source tree is ugly as hell
-
-Simplify usage by allowing to pass the path to the desired PS init
-file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute
-path or relative to $(srctree). If the variable is set, the
-user-specified file will always be used without being copied
-around. If the the variable is left empty, for backward compatibility
-fall back to the old behaviour.
-
-Since the issue is the same for Zynq and ZynqMP, add one kconfig
-variable in a common place and use it for both.
-
-Also use the new kconfig help text to document all the ways to give
-U-Boot the PS init file.
-
-Build-tested with all combinations of:
- - platform: zynq or zynqmp
- - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path,
- non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/
- - building in-tree, in subdir, in other directory
-
-[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9
-
-Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
-Cc: Albert Aribaud <albert.u.boot@aribaud.net>
-Cc: Michal Simek <michal.simek@xilinx.com>
-Cc: Nathan Rossi <nathan@nathanrossi.com>
-Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c
----
- arch/arm/Kconfig | 1 +
- board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++
- board/xilinx/zynq/Makefile | 10 +++++++++-
- board/xilinx/zynqmp/Makefile | 10 +++++++++-
- 4 files changed, 60 insertions(+), 2 deletions(-)
- create mode 100644 board/xilinx/Kconfig
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 22234cde2ab6..e04979d0ef7e 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig"
- source "board/vscom/baltos/Kconfig"
- source "board/woodburn/Kconfig"
- source "board/work-microwave/work_92105/Kconfig"
-+source "board/xilinx/Kconfig"
- source "board/zipitz2/Kconfig"
-
- source "arch/arm/Kconfig.debug"
-diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig
-new file mode 100644
-index 000000000000..aa3fa061edef
---- /dev/null
-+++ b/board/xilinx/Kconfig
-@@ -0,0 +1,41 @@
-+# Copyright (c) 2018, Luca Ceresoli <luca@lucaceresoli.net>
-+#
-+# SPDX-License-Identifier: GPL-2.0
-+
-+if ARCH_ZYNQ || ARCH_ZYNQMP
-+
-+config XILINX_PS_INIT_FILE
-+ string "Zynq/ZynqMP PS init file(s) location"
-+ help
-+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if
-+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some
-+ basic initializations, such as enabling peripherals and
-+ configuring pinmuxes. The PS init file (called
-+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000)
-+ contains the code for such initializations.
-+
-+ U-Boot contains PS init files for some boards, but each of
-+ them describes only one specific configuration. Users of a
-+ different board, or needing a different configuration, can
-+ generate custom files using the Xilinx development tools.
-+
-+ There are three ways to give a PS init file to U-Boot:
-+
-+ 1. Set this variable to the path, either relative to the
-+ source tree or absolute, where the psu_init_gpl.c or
-+ ps7_init_gpl.c file is located. U-Boot will build this
-+ file.
-+
-+ 2. If you leave an empty string here, U-Boot will use
-+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c
-+ for Zynq-7000, or
-+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c
-+ for ZynqMP.
-+
-+ 3. If the above file does not exist, U-Boot will use
-+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or
-+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file
-+ is not provided by U-Boot, you have to copy it there
-+ before the build.
-+
-+endif
-diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
-index 5a76a26720cd..03ad5f0532ee 100644
---- a/board/xilinx/zynq/Makefile
-+++ b/board/xilinx/zynq/Makefile
-@@ -5,10 +5,18 @@
-
- obj-y := board.o
-
--hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
-+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
-+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE))
-+init-objs := ps_init_gpl.o
-+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE)
-+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^
-+endif
-
-+ifeq ($(init-objs),)
-+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
- init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
- $(hw-platform-y)/ps7_init_gpl.o)
-+endif
-
- ifeq ($(init-objs),)
- ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),)
-diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile
-index 05ccd25dcef3..960b81fc5853 100644
---- a/board/xilinx/zynqmp/Makefile
-+++ b/board/xilinx/zynqmp/Makefile
-@@ -5,10 +5,18 @@
-
- obj-y := zynqmp.o
-
--hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
-+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
-+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE))
-+init-objs := ps_init_gpl.o
-+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE)
-+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^
-+endif
-
-+ifeq ($(init-objs),)
-+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
- init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\
- $(hw-platform-y)/psu_init_gpl.o)
-+endif
-
- ifeq ($(init-objs),)
- ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),)
---
-2.7.4
-
diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig
new file mode 100644
index 0000000000..336f5c2dbe
--- /dev/null
+++ b/configs/zynqmp_zcu102_defconfig
@@ -0,0 +1,35 @@
+BR2_aarch64=y
+BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
+BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
+BR2_TARGET_UBOOT_ZYNQMP=y
+BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
+BR2_TARGET_UBOOT_FORMAT_ITB=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig
index bee7c1daf7..3a6947e1e8 100644
--- a/configs/zynqmp_zcu106_defconfig
+++ b/configs/zynqmp_zcu106_defconfig
@@ -1,11 +1,11 @@
BR2_aarch64=y
BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
@@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
BR2_TARGET_UBOOT_ZYNQMP=y
-BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
+BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
+BR2_TARGET_UBOOT_FORMAT_ITB=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
--
2.17.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-02 16:55 [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Neal Frager
@ 2022-02-02 22:28 ` Luca Ceresoli
2022-02-03 6:20 ` Neal Frager
2022-02-02 22:33 ` Giulio Benetti
1 sibling, 1 reply; 13+ messages in thread
From: Luca Ceresoli @ 2022-02-02 22:28 UTC (permalink / raw)
To: Neal Frager, buildroot; +Cc: Neal Frager
Hi Neal,
thank you for your effort and for sending a patch in the format that is
the most convenient for other people to review your code.
Your work seems generally in a good shape. I have several remarks, see
below, but nothing really problematic.
On 02/02/22 17:55, Neal Frager wrote:
> Signed-off-by: Neal Frager <nealf@xilinx.com>
Maybe you can add more details before the Signed-off-by line, suah as
"Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not
upstream"...
First issue: this defconfig does not build on my PC:
$ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make
package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains
nonexistent directory board/zynqmp/patches/. Stop.
$
As you removed all patches (which is sooo gooood!) you now have to
remove the BR2_GLOBAL_PATCH_DIR.
> ---
> board/zynqmp/genimage.cfg | 1 +
> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
> configs/zynqmp_zcu102_defconfig | 35 ++++
> configs/zynqmp_zcu106_defconfig | 15 +-
> 8 files changed, 44 insertions(+), 484 deletions(-)
> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
> create mode 100644 configs/zynqmp_zcu102_defconfig
>
> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
> index ed202f4550..557364e124 100644
> --- a/board/zynqmp/genimage.cfg
> +++ b/board/zynqmp/genimage.cfg
> @@ -3,6 +3,7 @@ image boot.vfat {
> files = {
> "boot.bin",
> "u-boot.bin",
> + "u-boot.itb",
Is u-boot.bin still needed, when we have the .itb?
> diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig
> index bee7c1daf7..3a6947e1e8 100644
> --- a/configs/zynqmp_zcu106_defconfig
> +++ b/configs/zynqmp_zcu106_defconfig
> @@ -1,11 +1,11 @@
> BR2_aarch64=y
> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
> BR2_LINUX_KERNEL=y
> BR2_LINUX_KERNEL_CUSTOM_GIT=y
> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y
> # BR2_TARGET_ROOTFS_TAR is not set
> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
As far as I remember (but I ask the core developers to confirm or deny),
from the Buildroot perspective upstream versions are generally preferred
even when they lack some non-fundamental features (e.g.: some drivers
are missing) that are in vendor forks.
Is there a reason for switching ATF to the Xilinx fork? In this case
explain it in the commit message, otherwise stay on the upstream repo,
upgrading to the latest [working] release.
A similar question applies to kernel and U-Boot: is it possible to
switch to upstream releases?
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_GIT=y
> BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
The "_virt" suffix looks strange to the uninitiated. IIRC it is the
main, unified defconfig for all Xilinx kernels. Please add a line in the
commit message so it is clear for everybody's benefit.
> BR2_TARGET_UBOOT_NEEDS_DTC=y
> BR2_TARGET_UBOOT_SPL=y
> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
> BR2_TARGET_UBOOT_ZYNQMP=y
> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
Please point to a tag, not a branch, or the file could be modified in
the future, resulting in a non-reproducible build. Use:
https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin
Ouch, now the build I had started ended with a new error:
>>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building
...
AR .../build/zynqmp/release/lib/libc.a
LD .../build/zynqmp/release/bl31/bl31.elf
.../aarch64-buildroot-linux-uclibc-ld:
.../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not
fit in region `RAM'
.../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit.
.../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte
I have run my build on Ubuntu 18.04 with your patch applied on current
master.
I assume you have built and run it successfully. Any idea on why it
fails on a different host?
--
Luca
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-02 16:55 [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Neal Frager
2022-02-02 22:28 ` Luca Ceresoli
@ 2022-02-02 22:33 ` Giulio Benetti
2022-02-03 6:24 ` Neal Frager
1 sibling, 1 reply; 13+ messages in thread
From: Giulio Benetti @ 2022-02-02 22:33 UTC (permalink / raw)
To: Neal Frager, buildroot; +Cc: luca, Neal Frager
Hi Neal,
nice to see you've made it with git send-email :-),
Here I would improve commit log by stating that you're dropping all
local patches because they are now upstreamed
On 02/02/22 17:55, Neal Frager wrote:
> Signed-off-by: Neal Frager <nealf@xilinx.com>
> ---
> board/zynqmp/genimage.cfg | 1 +
> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
> configs/zynqmp_zcu102_defconfig | 35 ++++
This ^^^ file is added, so it deserves a second patch after this one,
basically this becomes a patchset of 2 patches
> configs/zynqmp_zcu106_defconfig | 15 +-
> 8 files changed, 44 insertions(+), 484 deletions(-)
> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
> create mode 100644 configs/zynqmp_zcu102_defconfig
>
> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
> index ed202f4550..557364e124 100644
> --- a/board/zynqmp/genimage.cfg
> +++ b/board/zynqmp/genimage.cfg
> @@ -3,6 +3,7 @@ image boot.vfat {
> files = {
> "boot.bin",
> "u-boot.bin",
> + "u-boot.itb",
Can you please justify this adding ^^^ in commit log?
> "atf-uboot.ub",
> "system.dtb",
> "Image"
> diff --git a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
> deleted file mode 100644
> index 0c1a9ba2a4..0000000000
> --- a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00 2001
> -From: Deepika Bhavnani <deepika.bhavnani@arm.com>
> -Date: Thu, 15 Aug 2019 00:56:46 +0300
> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds
> -
> -GCC diagnostics were added to ignore array boundaries, instead
> -of ignoring GCC warning current code will check for array boundaries
> -and perform and array update only for valid elements.
> -
> -Resolves: `CID 246574` `CID 246710` `CID 246651`
> -
> -Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57
> -
> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef
> -[Adapted to apply on 1.5]
> -
> ----
> - lib/psci/psci_common.c | 20 ++++++++++----------
> - 1 file changed, 10 insertions(+), 10 deletions(-)
> -
> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c
> -index 2220a745cd6e..6282d992a2f0 100644
> ---- a/lib/psci/psci_common.c
> -+++ b/lib/psci/psci_common.c
> -@@ -188,21 +188,17 @@ static unsigned int get_power_on_target_pwrlvl(void)
> - /******************************************************************************
> - * Helper function to update the requested local power state array. This array
> - * does not store the requested state for the CPU power level. Hence an
> -- * assertion is added to prevent us from accessing the wrong index.
> -+ * assertion is added to prevent us from accessing the CPU power level.
> - *****************************************************************************/
> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl,
> - unsigned int cpu_idx,
> - plat_local_state_t req_pwr_state)
> - {
> -- /*
> -- * This should never happen, we have this here to avoid
> -- * "array subscript is above array bounds" errors in GCC.
> -- */
> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
> --#pragma GCC diagnostic push
> --#pragma GCC diagnostic ignored "-Warray-bounds"
> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
> --#pragma GCC diagnostic pop
> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state;
> -+ }
> - }
> -
> - /******************************************************************************
> -@@ -228,7 +224,11 @@ static plat_local_state_t *psci_get_req_local_pwr_states(unsigned int pwrlvl,
> - {
> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
> -
> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx];
> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx];
> -+ } else
> -+ return NULL;
> - }
> -
> - /*
> ---
> -2.34.0
> -
> diff --git a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
> deleted file mode 100644
> index 4d85e1bb12..0000000000
> --- a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00 2001
> -From: Luca Ceresoli <luca@lucaceresoli.net>
> -Date: Mon, 26 Feb 2018 09:40:34 +0100
> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting
> -
> -The U-Boot SPL generated with the current zcu106 defconfig cannot boot
> -from MMC:
> -
> - [...]
> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14)
> - EL Level: EL3
> - Trying to boot from MMC1
> - sdhci_transfer_data: Error detected in status(0x408020)!
> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2
> - spl_load_image_fat: error reading image u-boot.img, err - -6
> - SPL: failed to boot from all boot devices
> - ### ERROR ### Please RESET the board ###
> -
> -Fix by lowering the rpll value. The new value for the RPLL_CTRL
> -register comes from the current psu_init_gpl.c from the HDF file at
> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072d019a16cb2bc546/zcu106-zynqmp
> -(generated by Vivado v2017.4).
> -
> -RPLL and sdio1_ref clocks before and after this change:
> -
> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz
> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz
> -
> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -Cc: Michal Simek <michal.simek@xilinx.com>
> -Upstream-status: accepted upstream in a different form
> ----
> -
> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
> -index 4d18abe000ca..e6fa477e53e7 100644
> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
> -@@ -10,7 +10,7 @@
> - static unsigned long psu_pll_init_data(void)
> - {
> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U);
> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U);
> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U);
> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U);
> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U);
> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U);
> ---
> -2.7.4
> -
> diff --git a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
> deleted file mode 100644
> index 487fff6812..0000000000
> --- a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
> +++ /dev/null
> @@ -1,114 +0,0 @@
> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001
> -From: Luca Ceresoli <luca@lucaceresoli.net>
> -Date: Mon, 12 Mar 2018 17:18:38 +0100
> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF
> -
> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot
> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which
> -pass control to full u-boot(EL2). This has been tested on zcu106, so
> -enable it in this defconfig.
> -
> -To generate an image that triggers this booting flow, you need to pass
> -'-O arm-trusted-firmware' to mkimage.
> -
> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> -Backported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71
> ----
> -
> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 +
> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
> - 7 files changed, 7 insertions(+)
> -
> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> -index c5bfa2b12638..488c72258b0e 100644
> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> -index f86dce403a42..5d501eec0edd 100644
> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> -index 6e947cf56827..6f7eaebd7676 100644
> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_CMD_MEMTEST=y
> - CONFIG_SYS_ALT_MEMTEST=y
> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> -index 1c934858c61c..7a3806cba4b5 100644
> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_CMD_MEMTEST=y
> - CONFIG_SYS_ALT_MEMTEST=y
> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> -index e13c7c56f310..e4408f182ca0 100644
> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> -index 5b2cd495ee85..b52f6789fd4b 100644
> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> -index e6530fbfe7ff..80592554f682 100644
> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> ---
> -2.7.4
> -
> diff --git a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
> deleted file mode 100644
> index 95ab7b3b75..0000000000
> --- a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00 2001
> -From: Luca Ceresoli <luca@lucaceresoli.net>
> -Date: Mon, 4 Jun 2018 12:21:01 +0200
> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for PMUFW_INIT_FILE
> -
> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus
> -forcing it to be a relative path inside the U-Boot source tree. Since
> -the PMUFW is a binary file generated outside of U-Boot, the PMUFW
> -binary must be copied inside the U-Boot source tree before the
> -build.
> -
> -This generates a few problems:
> -
> - * if the source tree is shared among different out-of-tree builds,
> - they will pollute (and potentially corrupt) each other
> - * the source tree cannot be read-only
> - * any buildsystem must add a command to copy the PMUFW binary
> - * putting an externally-generated binary in the source tree is ugly
> - as hell
> -
> -Avoid these problems by accepting an absolute path for
> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/"
> -prefix, but in order to keep backward compatibility we rather use the
> -shell and readlink to get the absolute path even when starting from a
> -relative path.
> -
> -Since 'readlink -f' produces an empty string if the file does not
> -exist, we also add a check to ensure the file configured in
> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully,
> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty.
> -
> -Tested in the 12 possible combinations of:
> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing
> - - building in-tree, in subdir, in other directory
> -
> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -Cc: Michal Simek <michal.simek@xilinx.com>
> -Cc: Simon Glass <sjg@chromium.org>
> -Cc: Emmanuel Vadot <manu@bidouilliste.com>
> -Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818747759e8060b59626
> ----
> - scripts/Makefile.spl | 8 +++++++-
> - 1 file changed, 7 insertions(+), 1 deletion(-)
> -
> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
> -index ef018b5b4056..252f13826d4c 100644
> ---- a/scripts/Makefile.spl
> -+++ b/scripts/Makefile.spl
> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ
> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE)
> - endif
> - ifdef CONFIG_ARCH_ZYNQMP
> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
> -+spl/boot.bin: zynqmp-check-pmufw
> -+zynqmp-check-pmufw: FORCE
> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false )
> -+endif
> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE)
> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
> - endif
> -
> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
> ---
> -2.7.4
> -
> diff --git a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
> deleted file mode 100644
> index b32e162780..0000000000
> --- a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
> +++ /dev/null
> @@ -1,175 +0,0 @@
> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00 2001
> -From: Luca Ceresoli <luca@lucaceresoli.net>
> -Date: Wed, 20 Jun 2018 12:11:50 +0200
> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a kconfig
> - variable
> -
> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on
> -ZynqMP (PS init for short). The current logic to locate this file for
> -both platforms is:
> -
> - 1. if a board-specific file exists in
> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c
> - then use it
> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c
> -
> -In the latter case the file does not exist in the U-Boot sources and
> -must be copied in the source tree from the outside before starting the
> -build. This is typical when it is generated from Xilinx tools while
> -developing a custom hardware. However making sure that a
> -board-specific file is _not_ found (and used) requires some trickery
> -such as removing or overwriting all PS init files (e.g.: the current
> -meta-xilinx yocto layer [0]).
> -
> -This generates a few problems:
> -
> - * if the source tree is shared among different out-of-tree builds,
> - they will pollute (and potentially corrupt) each other
> - * the source tree cannot be read-only
> - * any buildsystem must add a command to copy the PS init file binary
> - * overwriting or deleting files in the source tree is ugly as hell
> -
> -Simplify usage by allowing to pass the path to the desired PS init
> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute
> -path or relative to $(srctree). If the variable is set, the
> -user-specified file will always be used without being copied
> -around. If the the variable is left empty, for backward compatibility
> -fall back to the old behaviour.
> -
> -Since the issue is the same for Zynq and ZynqMP, add one kconfig
> -variable in a common place and use it for both.
> -
> -Also use the new kconfig help text to document all the ways to give
> -U-Boot the PS init file.
> -
> -Build-tested with all combinations of:
> - - platform: zynq or zynqmp
> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path,
> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/
> - - building in-tree, in subdir, in other directory
> -
> -[0] https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a17cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc#L9
> -
> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> -Cc: Michal Simek <michal.simek@xilinx.com>
> -Cc: Nathan Rossi <nathan@nathanrossi.com>
> -Backported from upstream: https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b04e557b7ef65b56c
> ----
> - arch/arm/Kconfig | 1 +
> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++
> - board/xilinx/zynq/Makefile | 10 +++++++++-
> - board/xilinx/zynqmp/Makefile | 10 +++++++++-
> - 4 files changed, 60 insertions(+), 2 deletions(-)
> - create mode 100644 board/xilinx/Kconfig
> -
> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> -index 22234cde2ab6..e04979d0ef7e 100644
> ---- a/arch/arm/Kconfig
> -+++ b/arch/arm/Kconfig
> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig"
> - source "board/vscom/baltos/Kconfig"
> - source "board/woodburn/Kconfig"
> - source "board/work-microwave/work_92105/Kconfig"
> -+source "board/xilinx/Kconfig"
> - source "board/zipitz2/Kconfig"
> -
> - source "arch/arm/Kconfig.debug"
> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig
> -new file mode 100644
> -index 000000000000..aa3fa061edef
> ---- /dev/null
> -+++ b/board/xilinx/Kconfig
> -@@ -0,0 +1,41 @@
> -+# Copyright (c) 2018, Luca Ceresoli <luca@lucaceresoli.net>
> -+#
> -+# SPDX-License-Identifier: GPL-2.0
> -+
> -+if ARCH_ZYNQ || ARCH_ZYNQMP
> -+
> -+config XILINX_PS_INIT_FILE
> -+ string "Zynq/ZynqMP PS init file(s) location"
> -+ help
> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if
> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some
> -+ basic initializations, such as enabling peripherals and
> -+ configuring pinmuxes. The PS init file (called
> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000)
> -+ contains the code for such initializations.
> -+
> -+ U-Boot contains PS init files for some boards, but each of
> -+ them describes only one specific configuration. Users of a
> -+ different board, or needing a different configuration, can
> -+ generate custom files using the Xilinx development tools.
> -+
> -+ There are three ways to give a PS init file to U-Boot:
> -+
> -+ 1. Set this variable to the path, either relative to the
> -+ source tree or absolute, where the psu_init_gpl.c or
> -+ ps7_init_gpl.c file is located. U-Boot will build this
> -+ file.
> -+
> -+ 2. If you leave an empty string here, U-Boot will use
> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c
> -+ for Zynq-7000, or
> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c
> -+ for ZynqMP.
> -+
> -+ 3. If the above file does not exist, U-Boot will use
> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or
> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file
> -+ is not provided by U-Boot, you have to copy it there
> -+ before the build.
> -+
> -+endif
> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
> -index 5a76a26720cd..03ad5f0532ee 100644
> ---- a/board/xilinx/zynq/Makefile
> -+++ b/board/xilinx/zynq/Makefile
> -@@ -5,10 +5,18 @@
> -
> - obj-y := board.o
> -
> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE))
> -+init-objs := ps_init_gpl.o
> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE)
> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^
> -+endif
> -
> -+ifeq ($(init-objs),)
> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
> - $(hw-platform-y)/ps7_init_gpl.o)
> -+endif
> -
> - ifeq ($(init-objs),)
> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),)
> -diff --git a/board/xilinx/zynqmp/Makefile b/board/xilinx/zynqmp/Makefile
> -index 05ccd25dcef3..960b81fc5853 100644
> ---- a/board/xilinx/zynqmp/Makefile
> -+++ b/board/xilinx/zynqmp/Makefile
> -@@ -5,10 +5,18 @@
> -
> - obj-y := zynqmp.o
> -
> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f $(CONFIG_XILINX_PS_INIT_FILE))
> -+init-objs := ps_init_gpl.o
> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE)
> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^
> -+endif
> -
> -+ifeq ($(init-objs),)
> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\
> - $(hw-platform-y)/psu_init_gpl.o)
> -+endif
> -
> - ifeq ($(init-objs),)
> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),)
> ---
> -2.7.4
> -
> diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig
> new file mode 100644
> index 0000000000..336f5c2dbe
> --- /dev/null
> +++ b/configs/zynqmp_zcu102_defconfig
> @@ -0,0 +1,35 @@
> +BR2_aarch64=y
> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
> +BR2_LINUX_KERNEL=y
> +BR2_LINUX_KERNEL_CUSTOM_GIT=y
> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0"
> +BR2_TARGET_ROOTFS_EXT2=y
> +BR2_TARGET_ROOTFS_EXT2_4=y
> +# BR2_TARGET_ROOTFS_TAR is not set
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
> +BR2_TARGET_UBOOT=y
> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> +BR2_TARGET_UBOOT_CUSTOM_GIT=y
> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
> +BR2_TARGET_UBOOT_NEEDS_DTC=y
> +BR2_TARGET_UBOOT_SPL=y
> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
> +BR2_TARGET_UBOOT_ZYNQMP=y
> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
> +BR2_TARGET_UBOOT_FORMAT_ITB=y
> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
> +BR2_PACKAGE_HOST_GENIMAGE=y
> +BR2_PACKAGE_HOST_MTOOLS=y
As pointed above this ^^^ file must be in a separate patch and it
deserves also a maintainer. So please you or maybe Luca could add an
entry to DEVELOPERS for this board
> diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig
> index bee7c1daf7..3a6947e1e8 100644
> --- a/configs/zynqmp_zcu106_defconfig
> +++ b/configs/zynqmp_zcu106_defconfig
> @@ -1,11 +1,11 @@
> BR2_aarch64=y
> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
Since all patches are gone, this ^^^ is not needed anymore
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
> BR2_LINUX_KERNEL=y
> BR2_LINUX_KERNEL_CUSTOM_GIT=y
> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y
> # BR2_TARGET_ROOTFS_TAR is not set
> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
It's worth mention in commit log that you're switching from ARM to
Xilinx ATF
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_GIT=y
> BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
> BR2_TARGET_UBOOT_NEEDS_DTC=y
> BR2_TARGET_UBOOT_SPL=y
> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
> BR2_TARGET_UBOOT_ZYNQMP=y
> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
> +BR2_TARGET_UBOOT_FORMAT_ITB=y
Here ^^^ I see that probably you're switching from .bin to .itb so
better mention it in commit log
> BR2_PACKAGE_HOST_DOSFSTOOLS=y
> BR2_PACKAGE_HOST_GENIMAGE=y
> BR2_PACKAGE_HOST_MTOOLS=y
Thank you!
Best regards
--
Giulio Benetti
Benetti Engineering sas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-02 22:28 ` Luca Ceresoli
@ 2022-02-03 6:20 ` Neal Frager
2022-02-03 8:14 ` Luca Ceresoli
0 siblings, 1 reply; 13+ messages in thread
From: Neal Frager @ 2022-02-03 6:20 UTC (permalink / raw)
To: Luca Ceresoli, buildroot
Hi Luca,
Thank you for your positive feedback. Below you can find my thoughts.
Neal Frager
Embedded Processor Specialist
Xilinx
neal.frager@xilinx.com
Mobile: +33.6.48.11.37.36
www.linkedin.com/in/neal-frager-0397463
-----Original Message-----
From: Luca Ceresoli <luca@lucaceresoli.net>
Sent: Wednesday 2 February 2022 23:29
To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
Cc: Neal Frager <nealf@xilinx.com>
Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
Hi Neal,
thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code.
Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic.
On 02/02/22 17:55, Neal Frager wrote:
> Signed-off-by: Neal Frager <nealf@xilinx.com>
Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"...
[Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use.
First issue: this defconfig does not build on my PC:
$ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make
package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop.
$
As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR.
[Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs.
> ---
> board/zynqmp/genimage.cfg | 1 +
> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
> configs/zynqmp_zcu102_defconfig | 35 ++++
> configs/zynqmp_zcu106_defconfig | 15 +-
> 8 files changed, 44 insertions(+), 484 deletions(-) delete mode
> 100644
> board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC
> -ignore-Warray-bounds.patch delete mode 100644
> board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bootin
> g.patch delete mode 100644
> board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pat
> ch delete mode 100644
> board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-f
> or-PMUFW_INIT_.patch delete mode 100644
> board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init
> -file-as-a-kco.patch create mode 100644
> configs/zynqmp_zcu102_defconfig
>
> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
> index ed202f4550..557364e124 100644
> --- a/board/zynqmp/genimage.cfg
> +++ b/board/zynqmp/genimage.cfg
> @@ -3,6 +3,7 @@ image boot.vfat {
> files = {
> "boot.bin",
> "u-boot.bin",
> + "u-boot.itb",
Is u-boot.bin still needed, when we have the .itb?
[Neal] u-boot.bin is no longer needed. I can remove it.
> diff --git a/configs/zynqmp_zcu106_defconfig
> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644
> --- a/configs/zynqmp_zcu106_defconfig
> +++ b/configs/zynqmp_zcu106_defconfig
> @@ -1,11 +1,11 @@
> BR2_aarch64=y
> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
> BR2_LINUX_KERNEL=y
> BR2_LINUX_KERNEL_CUSTOM_GIT=y
> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y #
> BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks.
Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release.
A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases?
[Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent.
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_GIT=y
> BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
The "_virt" suffix looks strange to the uninitiated. IIRC it is the main, unified defconfig for all Xilinx kernels. Please add a line in the commit message so it is clear for everybody's benefit.
[Neal] Yes, I will add a comment on this when I learn the proper git command for adding comments.
> BR2_TARGET_UBOOT_NEEDS_DTC=y
> BR2_TARGET_UBOOT_SPL=y
> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
> BR2_TARGET_UBOOT_ZYNQMP=y
> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
Please point to a tag, not a branch, or the file could be modified in the future, resulting in a non-reproducible build. Use:
https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin
[Neal] Good catch. I will update this in the defconfigs.
Ouch, now the build I had started ended with a new error:
>>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building
...
AR .../build/zynqmp/release/lib/libc.a
LD .../build/zynqmp/release/bl31/bl31.elf
.../aarch64-buildroot-linux-uclibc-ld:
.../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM'
.../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit.
.../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte
I have run my build on Ubuntu 18.04 with your patch applied on current master.
I assume you have built and run it successfully. Any idea on why it fails on a different host?
[Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this?
make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1
--
Luca
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-02 22:33 ` Giulio Benetti
@ 2022-02-03 6:24 ` Neal Frager
2022-02-03 12:01 ` Giulio Benetti
0 siblings, 1 reply; 13+ messages in thread
From: Neal Frager @ 2022-02-03 6:24 UTC (permalink / raw)
To: Giulio Benetti, buildroot; +Cc: luca
Hi Giulio,
Thank you very much for your feedback. I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem.
As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments.
Best regards,
Neal Frager
Xilinx
-----Original Message-----
From: Giulio Benetti <giulio.benetti@benettiengineering.com>
Sent: Wednesday 2 February 2022 23:33
To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
Cc: luca@lucaceresoli.net; Neal Frager <nealf@xilinx.com>
Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
Hi Neal,
nice to see you've made it with git send-email :-),
Here I would improve commit log by stating that you're dropping all local patches because they are now upstreamed
On 02/02/22 17:55, Neal Frager wrote:
> Signed-off-by: Neal Frager <nealf@xilinx.com>
> ---
> board/zynqmp/genimage.cfg | 1 +
> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
> configs/zynqmp_zcu102_defconfig | 35 ++++
This ^^^ file is added, so it deserves a second patch after this one, basically this becomes a patchset of 2 patches
> configs/zynqmp_zcu106_defconfig | 15 +-
> 8 files changed, 44 insertions(+), 484 deletions(-)
> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
> create mode 100644 configs/zynqmp_zcu102_defconfig
>
> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
> index ed202f4550..557364e124 100644
> --- a/board/zynqmp/genimage.cfg
> +++ b/board/zynqmp/genimage.cfg
> @@ -3,6 +3,7 @@ image boot.vfat {
> files = {
> "boot.bin",
> "u-boot.bin",
> + "u-boot.itb",
Can you please justify this adding ^^^ in commit log?
> "atf-uboot.ub",
> "system.dtb",
> "Image"
> diff --git
> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G
> GC-ignore-Warray-bounds.patch
> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G
> GC-ignore-Warray-bounds.patch
> deleted file mode 100644
> index 0c1a9ba2a4..0000000000
> ---
> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G
> GC-ignore-Warray-bounds.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00
> 2001
> -From: Deepika Bhavnani <deepika.bhavnani@arm.com>
> -Date: Thu, 15 Aug 2019 00:56:46 +0300
> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds
> -
> -GCC diagnostics were added to ignore array boundaries, instead -of
> ignoring GCC warning current code will check for array boundaries -and
> perform and array update only for valid elements.
> -
> -Resolves: `CID 246574` `CID 246710` `CID 246651`
> -
> -Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57
> -
> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef
> -[Adapted to apply on 1.5]
> -
> ----
> - lib/psci/psci_common.c | 20 ++++++++++----------
> - 1 file changed, 10 insertions(+), 10 deletions(-)
> -
> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index
> 2220a745cd6e..6282d992a2f0 100644
> ---- a/lib/psci/psci_common.c
> -+++ b/lib/psci/psci_common.c
> -@@ -188,21 +188,17 @@ static unsigned int
> get_power_on_target_pwrlvl(void)
> -
> /*********************************************************************
> *********
> - * Helper function to update the requested local power state array.
> This array
> - * does not store the requested state for the CPU power level. Hence
> an
> -- * assertion is added to prevent us from accessing the wrong index.
> -+ * assertion is added to prevent us from accessing the CPU power level.
> -
> **********************************************************************
> *******/
> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl,
> - unsigned int cpu_idx,
> - plat_local_state_t req_pwr_state)
> - {
> -- /*
> -- * This should never happen, we have this here to avoid
> -- * "array subscript is above array bounds" errors in GCC.
> -- */
> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
> --#pragma GCC diagnostic push
> --#pragma GCC diagnostic ignored "-Warray-bounds"
> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
> --#pragma GCC diagnostic pop
> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state;
> -+ }
> - }
> -
> -
> /*********************************************************************
> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t
> *psci_get_req_local_pwr_states(unsigned int pwrlvl,
> - {
> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
> -
> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx];
> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx];
> -+ } else
> -+ return NULL;
> - }
> -
> - /*
> ---
> -2.34.0
> -
> diff --git
> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot
> ing.patch
> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot
> ing.patch
> deleted file mode 100644
> index 4d85e1bb12..0000000000
> ---
> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot
> ing.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00
> 2001
> -From: Luca Ceresoli <luca@lucaceresoli.net>
> -Date: Mon, 26 Feb 2018 09:40:34 +0100
> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting
> -
> -The U-Boot SPL generated with the current zcu106 defconfig cannot
> boot -from MMC:
> -
> - [...]
> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14)
> - EL Level: EL3
> - Trying to boot from MMC1
> - sdhci_transfer_data: Error detected in status(0x408020)!
> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2
> - spl_load_image_fat: error reading image u-boot.img, err - -6
> - SPL: failed to boot from all boot devices
> - ### ERROR ### Please RESET the board ###
> -
> -Fix by lowering the rpll value. The new value for the RPLL_CTRL
> -register comes from the current psu_init_gpl.c from the HDF file at
> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072
> d019a16cb2bc546/zcu106-zynqmp
> -(generated by Vivado v2017.4).
> -
> -RPLL and sdio1_ref clocks before and after this change:
> -
> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz
> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz
> -
> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -Cc: Michal Simek <michal.simek@xilinx.com>
> -Upstream-status: accepted upstream in a different form
> ----
> -
> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
> -index 4d18abe000ca..e6fa477e53e7 100644
> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
> -@@ -10,7 +10,7 @@
> - static unsigned long psu_pll_init_data(void)
> - {
> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U);
> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U);
> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U);
> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U);
> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U);
> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U);
> ---
> -2.7.4
> -
> diff --git
> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p
> atch
> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p
> atch
> deleted file mode 100644
> index 487fff6812..0000000000
> ---
> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p
> atch
> +++ /dev/null
> @@ -1,114 +0,0 @@
> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00
> 2001
> -From: Luca Ceresoli <luca@lucaceresoli.net>
> -Date: Mon, 12 Mar 2018 17:18:38 +0100
> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF
> -
> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot
> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which
> -pass control to full u-boot(EL2). This has been tested on zcu106, so
> -enable it in this defconfig.
> -
> -To generate an image that triggers this booting flow, you need to
> pass -'-O arm-trusted-firmware' to mkimage.
> -
> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
> from upstream:
> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d907224103
> 5a8d4162560c71
> ----
> -
> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 +
> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
> - 7 files changed, 7 insertions(+)
> -
> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> -index c5bfa2b12638..488c72258b0e 100644
> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> -index f86dce403a42..5d501eec0edd 100644
> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> -index 6e947cf56827..6f7eaebd7676 100644
> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_CMD_MEMTEST=y
> - CONFIG_SYS_ALT_MEMTEST=y
> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> -index 1c934858c61c..7a3806cba4b5 100644
> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_CMD_MEMTEST=y
> - CONFIG_SYS_ALT_MEMTEST=y
> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> -index e13c7c56f310..e4408f182ca0 100644
> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig
> b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> -index 5b2cd495ee85..b52f6789fd4b 100644
> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig
> b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> -index e6530fbfe7ff..80592554f682 100644
> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
> - CONFIG_SPL_OS_BOOT=y
> - CONFIG_SPL_RAM_SUPPORT=y
> - CONFIG_SPL_RAM_DEVICE=y
> -+CONFIG_SPL_ATF=y
> - CONFIG_SYS_PROMPT="ZynqMP> "
> - CONFIG_FASTBOOT=y
> - CONFIG_FASTBOOT_FLASH=y
> ---
> -2.7.4
> -
> diff --git
> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path
> -for-PMUFW_INIT_.patch
> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path
> -for-PMUFW_INIT_.patch
> deleted file mode 100644
> index 95ab7b3b75..0000000000
> ---
> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path
> -for-PMUFW_INIT_.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00
> 2001
> -From: Luca Ceresoli <luca@lucaceresoli.net>
> -Date: Mon, 4 Jun 2018 12:21:01 +0200
> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for
> PMUFW_INIT_FILE
> -
> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus
> -forcing it to be a relative path inside the U-Boot source tree. Since
> -the PMUFW is a binary file generated outside of U-Boot, the PMUFW
> -binary must be copied inside the U-Boot source tree before the
> -build.
> -
> -This generates a few problems:
> -
> - * if the source tree is shared among different out-of-tree builds,
> - they will pollute (and potentially corrupt) each other
> - * the source tree cannot be read-only
> - * any buildsystem must add a command to copy the PMUFW binary
> - * putting an externally-generated binary in the source tree is ugly
> - as hell
> -
> -Avoid these problems by accepting an absolute path for
> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/"
> -prefix, but in order to keep backward compatibility we rather use the
> -shell and readlink to get the absolute path even when starting from a
> -relative path.
> -
> -Since 'readlink -f' produces an empty string if the file does not
> -exist, we also add a check to ensure the file configured in
> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully,
> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty.
> -
> -Tested in the 12 possible combinations of:
> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing
> - - building in-tree, in subdir, in other directory
> -
> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -Cc: Michal Simek <michal.simek@xilinx.com>
> -Cc: Simon Glass <sjg@chromium.org>
> -Cc: Emmanuel Vadot <manu@bidouilliste.com>
> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
> from upstream:
> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee81874
> 7759e8060b59626
> ----
> - scripts/Makefile.spl | 8 +++++++-
> - 1 file changed, 7 insertions(+), 1 deletion(-)
> -
> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index
> ef018b5b4056..252f13826d4c 100644
> ---- a/scripts/Makefile.spl
> -+++ b/scripts/Makefile.spl
> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ
> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R
> $(srctree)/$(CONFIG_BOOT_INIT_FILE)
> - endif
> - ifdef CONFIG_ARCH_ZYNQMP
> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
> -+spl/boot.bin: zynqmp-check-pmufw
> -+zynqmp-check-pmufw: FORCE
> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" &&
> -+false ) endif
> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE)
> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
> - endif
> -
> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
> ---
> -2.7.4
> -
> diff --git
> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in
> it-file-as-a-kco.patch
> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in
> it-file-as-a-kco.patch
> deleted file mode 100644
> index b32e162780..0000000000
> ---
> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in
> it-file-as-a-kco.patch
> +++ /dev/null
> @@ -1,175 +0,0 @@
> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00
> 2001
> -From: Luca Ceresoli <luca@lucaceresoli.net>
> -Date: Wed, 20 Jun 2018 12:11:50 +0200
> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a
> kconfig
> - variable
> -
> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on
> -ZynqMP (PS init for short). The current logic to locate this file for
> -both platforms is:
> -
> - 1. if a board-specific file exists in
> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c
> - then use it
> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c
> -
> -In the latter case the file does not exist in the U-Boot sources and
> -must be copied in the source tree from the outside before starting
> the -build. This is typical when it is generated from Xilinx tools
> while -developing a custom hardware. However making sure that a
> -board-specific file is _not_ found (and used) requires some trickery
> -such as removing or overwriting all PS init files (e.g.: the current
> -meta-xilinx yocto layer [0]).
> -
> -This generates a few problems:
> -
> - * if the source tree is shared among different out-of-tree builds,
> - they will pollute (and potentially corrupt) each other
> - * the source tree cannot be read-only
> - * any buildsystem must add a command to copy the PS init file binary
> - * overwriting or deleting files in the source tree is ugly as hell
> -
> -Simplify usage by allowing to pass the path to the desired PS init
> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute
> -path or relative to $(srctree). If the variable is set, the
> -user-specified file will always be used without being copied -around.
> If the the variable is left empty, for backward compatibility -fall
> back to the old behaviour.
> -
> -Since the issue is the same for Zynq and ZynqMP, add one kconfig
> -variable in a common place and use it for both.
> -
> -Also use the new kconfig help text to document all the ways to give
> -U-Boot the PS init file.
> -
> -Build-tested with all combinations of:
> - - platform: zynq or zynqmp
> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path,
> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/
> - - building in-tree, in subdir, in other directory
> -
> -[0]
> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a1
> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.
> inc#L9
> -
> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> -Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> -Cc: Michal Simek <michal.simek@xilinx.com>
> -Cc: Nathan Rossi <nathan@nathanrossi.com> -Backported from upstream:
> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b0
> 4e557b7ef65b56c
> ----
> - arch/arm/Kconfig | 1 +
> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++
> - board/xilinx/zynq/Makefile | 10 +++++++++-
> - board/xilinx/zynqmp/Makefile | 10 +++++++++-
> - 4 files changed, 60 insertions(+), 2 deletions(-)
> - create mode 100644 board/xilinx/Kconfig
> -
> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index
> 22234cde2ab6..e04979d0ef7e 100644
> ---- a/arch/arm/Kconfig
> -+++ b/arch/arm/Kconfig
> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig"
> - source "board/vscom/baltos/Kconfig"
> - source "board/woodburn/Kconfig"
> - source "board/work-microwave/work_92105/Kconfig"
> -+source "board/xilinx/Kconfig"
> - source "board/zipitz2/Kconfig"
> -
> - source "arch/arm/Kconfig.debug"
> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file
> mode 100644 -index 000000000000..aa3fa061edef
> ---- /dev/null
> -+++ b/board/xilinx/Kconfig
> -@@ -0,0 +1,41 @@
> -+# Copyright (c) 2018, Luca Ceresoli <luca@lucaceresoli.net> # #
> -+SPDX-License-Identifier: GPL-2.0
> -+
> -+if ARCH_ZYNQ || ARCH_ZYNQMP
> -+
> -+config XILINX_PS_INIT_FILE
> -+ string "Zynq/ZynqMP PS init file(s) location"
> -+ help
> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if
> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some
> -+ basic initializations, such as enabling peripherals and
> -+ configuring pinmuxes. The PS init file (called
> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000)
> -+ contains the code for such initializations.
> -+
> -+ U-Boot contains PS init files for some boards, but each of
> -+ them describes only one specific configuration. Users of a
> -+ different board, or needing a different configuration, can
> -+ generate custom files using the Xilinx development tools.
> -+
> -+ There are three ways to give a PS init file to U-Boot:
> -+
> -+ 1. Set this variable to the path, either relative to the
> -+ source tree or absolute, where the psu_init_gpl.c or
> -+ ps7_init_gpl.c file is located. U-Boot will build this
> -+ file.
> -+
> -+ 2. If you leave an empty string here, U-Boot will use
> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c
> -+ for Zynq-7000, or
> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c
> -+ for ZynqMP.
> -+
> -+ 3. If the above file does not exist, U-Boot will use
> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or
> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file
> -+ is not provided by U-Boot, you have to copy it there
> -+ before the build.
> -+
> -+endif
> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
> -index 5a76a26720cd..03ad5f0532ee 100644
> ---- a/board/xilinx/zynq/Makefile
> -+++ b/board/xilinx/zynq/Makefile
> -@@ -5,10 +5,18 @@
> -
> - obj-y := board.o
> -
> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE)
> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
> -
> -+ifeq ($(init-objs),)
> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
> - $(hw-platform-y)/ps7_init_gpl.o)
> -+endif
> -
> - ifeq ($(init-objs),)
> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),)
> -diff --git a/board/xilinx/zynqmp/Makefile
> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853
> 100644
> ---- a/board/xilinx/zynqmp/Makefile
> -+++ b/board/xilinx/zynqmp/Makefile
> -@@ -5,10 +5,18 @@
> -
> - obj-y := zynqmp.o
> -
> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE)
> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
> -
> -+ifeq ($(init-objs),)
> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\
> - $(hw-platform-y)/psu_init_gpl.o)
> -+endif
> -
> - ifeq ($(init-objs),)
> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),)
> ---
> -2.7.4
> -
> diff --git a/configs/zynqmp_zcu102_defconfig
> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index
> 0000000000..336f5c2dbe
> --- /dev/null
> +++ b/configs/zynqmp_zcu102_defconfig
> @@ -0,0 +1,35 @@
> +BR2_aarch64=y
> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
> +BR2_LINUX_KERNEL=y
> +BR2_LINUX_KERNEL_CUSTOM_GIT=y
> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0"
> +BR2_TARGET_ROOTFS_EXT2=y
> +BR2_TARGET_ROOTFS_EXT2_4=y
> +# BR2_TARGET_ROOTFS_TAR is not set
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
> +BR2_TARGET_UBOOT=y
> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> +BR2_TARGET_UBOOT_CUSTOM_GIT=y
> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
> +BR2_TARGET_UBOOT_NEEDS_DTC=y
> +BR2_TARGET_UBOOT_SPL=y
> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
> +BR2_TARGET_UBOOT_ZYNQMP=y
> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
> +BR2_TARGET_UBOOT_FORMAT_ITB=y
> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
> +BR2_PACKAGE_HOST_GENIMAGE=y
> +BR2_PACKAGE_HOST_MTOOLS=y
As pointed above this ^^^ file must be in a separate patch and it deserves also a maintainer. So please you or maybe Luca could add an entry to DEVELOPERS for this board
> diff --git a/configs/zynqmp_zcu106_defconfig
> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644
> --- a/configs/zynqmp_zcu106_defconfig
> +++ b/configs/zynqmp_zcu106_defconfig
> @@ -1,11 +1,11 @@
> BR2_aarch64=y
> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
Since all patches are gone, this ^^^ is not needed anymore
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
> BR2_LINUX_KERNEL=y
> BR2_LINUX_KERNEL_CUSTOM_GIT=y
> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y
> # BR2_TARGET_ROOTFS_TAR is not set
> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
It's worth mention in commit log that you're switching from ARM to Xilinx ATF
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
> BR2_TARGET_UBOOT=y
> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> BR2_TARGET_UBOOT_CUSTOM_GIT=y
> BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
> BR2_TARGET_UBOOT_NEEDS_DTC=y
> BR2_TARGET_UBOOT_SPL=y
> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
> BR2_TARGET_UBOOT_ZYNQMP=y
> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
> +BR2_TARGET_UBOOT_FORMAT_ITB=y
Here ^^^ I see that probably you're switching from .bin to .itb so better mention it in commit log
> BR2_PACKAGE_HOST_DOSFSTOOLS=y
> BR2_PACKAGE_HOST_GENIMAGE=y
> BR2_PACKAGE_HOST_MTOOLS=y
Thank you!
Best regards
--
Giulio Benetti
Benetti Engineering sas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-03 6:20 ` Neal Frager
@ 2022-02-03 8:14 ` Luca Ceresoli
2022-02-03 10:07 ` Neal Frager
0 siblings, 1 reply; 13+ messages in thread
From: Luca Ceresoli @ 2022-02-03 8:14 UTC (permalink / raw)
To: Neal Frager, buildroot
Hi Neal,
On 03/02/22 07:20, Neal Frager wrote:
> Hi Luca,
>
> Thank you for your positive feedback. Below you can find my thoughts.
>
> Neal Frager
> Embedded Processor Specialist
> Xilinx
>
> neal.frager@xilinx.com
> Mobile: +33.6.48.11.37.36
> www.linkedin.com/in/neal-frager-0397463
>
> -----Original Message-----
> From: Luca Ceresoli <luca@lucaceresoli.net>
> Sent: Wednesday 2 February 2022 23:29
> To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
> Cc: Neal Frager <nealf@xilinx.com>
> Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
>
> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
>
>
> Hi Neal,
>
> thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code.
>
> Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic.
>
> On 02/02/22 17:55, Neal Frager wrote:
>> Signed-off-by: Neal Frager <nealf@xilinx.com>
>
> Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"...
>
> [Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use.
The command 'git commit' opens an editor where you can write a commit
message with all the details you wish. And if you have already done your
commit and want to modify the comment, use 'git commit --amend'.
A suggested reading is ProGit, the official git book:
https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository
A few suggestions on how to write a good commit message:
https://cbea.ms/git-commit/
> First issue: this defconfig does not build on my PC:
>
> $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make
> package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop.
> $
>
> As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR.
>
> [Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs.
>
>> ---
>> board/zynqmp/genimage.cfg | 1 +
>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
>> configs/zynqmp_zcu102_defconfig | 35 ++++
>> configs/zynqmp_zcu106_defconfig | 15 +-
>> 8 files changed, 44 insertions(+), 484 deletions(-) delete mode
>> 100644
>> board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC
>> -ignore-Warray-bounds.patch delete mode 100644
>> board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bootin
>> g.patch delete mode 100644
>> board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pat
>> ch delete mode 100644
>> board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-f
>> or-PMUFW_INIT_.patch delete mode 100644
>> board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init
>> -file-as-a-kco.patch create mode 100644
>> configs/zynqmp_zcu102_defconfig
>>
>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
>> index ed202f4550..557364e124 100644
>> --- a/board/zynqmp/genimage.cfg
>> +++ b/board/zynqmp/genimage.cfg
>> @@ -3,6 +3,7 @@ image boot.vfat {
>> files = {
>> "boot.bin",
>> "u-boot.bin",
>> + "u-boot.itb",
>
> Is u-boot.bin still needed, when we have the .itb?
>
> [Neal] u-boot.bin is no longer needed. I can remove it.
>
>> diff --git a/configs/zynqmp_zcu106_defconfig
>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644
>> --- a/configs/zynqmp_zcu106_defconfig
>> +++ b/configs/zynqmp_zcu106_defconfig
>> @@ -1,11 +1,11 @@
>> BR2_aarch64=y
>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>> BR2_LINUX_KERNEL=y
>> BR2_LINUX_KERNEL_CUSTOM_GIT=y
>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>> BR2_LINUX_KERNEL_DTS_SUPPORT=y
>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y #
>> BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>
> As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks.
>
> Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release.
>
> A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases?
>
> [Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent.
I can understand that mainline Linux has significantly fewer drivers
than the Xilinx fork. However I have good hope that current mainline
U-Boot is enough to boot properly, at least it's worth giving it a try
and, should it fail, explain what's the problem that forces to stay on a
fork.
About ATF I would just stay on mainline. I would be surprised if an old
mainline version worked and not a recent one.
> Ouch, now the build I had started ended with a new error:
>
>>>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building
> ...
> AR .../build/zynqmp/release/lib/libc.a
> LD .../build/zynqmp/release/bl31/bl31.elf
> .../aarch64-buildroot-linux-uclibc-ld:
> .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM'
> .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit.
> .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1 byte
>
> I have run my build on Ubuntu 18.04 with your patch applied on current master.
>
> I assume you have built and run it successfully. Any idea on why it fails on a different host?
>
> [Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this?
>
> make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1
I'm afraid a defconfig that requires manual steps to build is a no-go,
so we really need a solution.
I don't know a proper solution, but first why don't you try mainline
ATF? Should it build (and run) it'd be a double win! :) Otherwise you
could try another toolchain, such as one prebuilt on
https://toolchains.bootlin.com/ .
--
Luca
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-03 8:14 ` Luca Ceresoli
@ 2022-02-03 10:07 ` Neal Frager
2022-02-03 11:04 ` Luca Ceresoli
0 siblings, 1 reply; 13+ messages in thread
From: Neal Frager @ 2022-02-03 10:07 UTC (permalink / raw)
To: Luca Ceresoli, buildroot
Hi Luca,
Thank you for your feedback.
As for the ATF, yes, the mainline version should work, and since it does not have the same build issue with the buildroot compiler, I will move the patch back to the mainline ATF version.
Unfortunately, U-Boot is another story. The mainline U-Boot will boot just fine with an SD card. However, I know that the Xilinx U-Boot QSPI driver is not yet in mainline. Since QSPI is a very popular boot flash medium, I cannot in good conscience recommend using the mainline U-Boot until QSPI is well supported for Xilinx devices.
Xilinx is working hard to get all of our U-Boot and Linux kernel drivers in mainline, but we are not yet there. I would be happy to update the zcu_10x_defconfigs to using the mainline U-Boot and Linux kernels when the level of necessary support is better.
Best regards,
Neal Frager
Embedded Processor Specialist
Xilinx
neal.frager@xilinx.com
-----Original Message-----
From: Luca Ceresoli <luca@lucaceresoli.net>
Sent: Thursday 3 February 2022 09:15
To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
Hi Neal,
On 03/02/22 07:20, Neal Frager wrote:
> Hi Luca,
>
> Thank you for your positive feedback. Below you can find my thoughts.
>
> Neal Frager
> Embedded Processor Specialist
> Xilinx
>
> neal.frager@xilinx.com
> Mobile: +33.6.48.11.37.36
> www.linkedin.com/in/neal-frager-0397463
>
> -----Original Message-----
> From: Luca Ceresoli <luca@lucaceresoli.net>
> Sent: Wednesday 2 February 2022 23:29
> To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
> Cc: Neal Frager <nealf@xilinx.com>
> Subject: Re: [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux
> to Xilinx 2021.2
>
> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
>
>
> Hi Neal,
>
> thank you for your effort and for sending a patch in the format that is the most convenient for other people to review your code.
>
> Your work seems generally in a good shape. I have several remarks, see below, but nothing really problematic.
>
> On 02/02/22 17:55, Neal Frager wrote:
>> Signed-off-by: Neal Frager <nealf@xilinx.com>
>
> Maybe you can add more details before the Signed-off-by line, suah as "Also add a defconfig for ZCU102", "remove U-Boot and ATF patches not upstream"...
>
> [Neal] Could you share the proper git commands for adding comments to a patch? I would be happy to add more comments, but I am a bit new to git, and I do not know what commands I need to use.
The command 'git commit' opens an editor where you can write a commit message with all the details you wish. And if you have already done your commit and want to modify the comment, use 'git commit --amend'.
A suggested reading is ProGit, the official git book:
https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository
A few suggestions on how to write a good commit message:
https://cbea.ms/git-commit/
> First issue: this defconfig does not build on my PC:
>
> $ git clean -xdf && make zynqmp_zcu106_defconfig && verynice make
> package/pkg-generic.mk:266: *** BR2_GLOBAL_PATCH_DIR contains nonexistent directory board/zynqmp/patches/. Stop.
> $
>
> As you removed all patches (which is sooo gooood!) you now have to remove the BR2_GLOBAL_PATCH_DIR.
>
> [Neal] I have not seen this error on my side, but to fix it, I will just remove the BR2_GLOBAL_PATCH_DIR from the defconfigs.
>
>> ---
>> board/zynqmp/genimage.cfg | 1 +
>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
>> configs/zynqmp_zcu102_defconfig | 35 ++++
>> configs/zynqmp_zcu106_defconfig | 15 +-
>> 8 files changed, 44 insertions(+), 484 deletions(-) delete mode
>> 100644
>> board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GG
>> C -ignore-Warray-bounds.patch delete mode 100644
>> board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booti
>> n
>> g.patch delete mode 100644
>> board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.pa
>> t
>> ch delete mode 100644
>> board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-
>> f or-PMUFW_INIT_.patch delete mode 100644
>> board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-ini
>> t -file-as-a-kco.patch create mode 100644
>> configs/zynqmp_zcu102_defconfig
>>
>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
>> index ed202f4550..557364e124 100644
>> --- a/board/zynqmp/genimage.cfg
>> +++ b/board/zynqmp/genimage.cfg
>> @@ -3,6 +3,7 @@ image boot.vfat {
>> files = {
>> "boot.bin",
>> "u-boot.bin",
>> + "u-boot.itb",
>
> Is u-boot.bin still needed, when we have the .itb?
>
> [Neal] u-boot.bin is no longer needed. I can remove it.
>
>> diff --git a/configs/zynqmp_zcu106_defconfig
>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644
>> --- a/configs/zynqmp_zcu106_defconfig
>> +++ b/configs/zynqmp_zcu106_defconfig
>> @@ -1,11 +1,11 @@
>> BR2_aarch64=y
>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>> BR2_LINUX_KERNEL=y
>> BR2_LINUX_KERNEL_CUSTOM_GIT=y
>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>> BR2_LINUX_KERNEL_DTS_SUPPORT=y
>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y #
>> BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>
> As far as I remember (but I ask the core developers to confirm or deny), from the Buildroot perspective upstream versions are generally preferred even when they lack some non-fundamental features (e.g.: some drivers are missing) that are in vendor forks.
>
> Is there a reason for switching ATF to the Xilinx fork? In this case explain it in the commit message, otherwise stay on the upstream repo, upgrading to the latest [working] release.
>
> A similar question applies to kernel and U-Boot: is it possible to switch to upstream releases?
>
> [Neal] I was trying to match the Xilinx tested software release 2021.2 with these patches. The mainline Linux kernel is still missing quite a bit of the Xilinx drivers, so if a developer uses all mainline locations, there will be things that do not work properly. The ATF should probably be ok, as it is almost identical to the Xilinx fork, but since I was already using the Xilinx fork for the Linux kernel and U-Boot, I thought it would be better to use the Xilinx tested fork for everything to remain consistent.
I can understand that mainline Linux has significantly fewer drivers than the Xilinx fork. However I have good hope that current mainline U-Boot is enough to boot properly, at least it's worth giving it a try and, should it fail, explain what's the problem that forces to stay on a fork.
About ATF I would just stay on mainline. I would be surprised if an old mainline version worked and not a recent one.
> Ouch, now the build I had started ended with a new error:
>
>>>> arm-trusted-firmware xlnx_rebase_v2.4_2021.2 Building
> ...
> AR .../build/zynqmp/release/lib/libc.a
> LD .../build/zynqmp/release/bl31/bl31.elf
> .../aarch64-buildroot-linux-uclibc-ld:
> .../build/zynqmp/release/bl31/bl31.elf section `coherent_ram' will not fit in region `RAM'
> .../aarch64-buildroot-linux-uclibc-ld: BL31 image has exceeded its limit.
> .../aarch64-buildroot-linux-uclibc-ld: region `RAM' overflowed by 1
> byte
>
> I have run my build on Ubuntu 18.04 with your patch applied on current master.
>
> I assume you have built and run it successfully. Any idea on why it fails on a different host?
>
> [Neal] I have seen the ATF build error as well. There seems to be an issue with the default buildroot aarch64-buildroot-linux-uclibc compiler when building the ATF. I fixed the issue on my side by going into the output/build/arm-trusted-firmware-xlnx_rebase_v2.4_2021.2 and running the build with the aarch-none-elf compiler using the build command below. Basically, changing nothing but the compiler. Do you have any thoughts about how to fix this?
>
> make CROSS_COMPILE=aarch64-none-elf- PLAT=zynqmp RESET_TO_BL31=1
I'm afraid a defconfig that requires manual steps to build is a no-go, so we really need a solution.
I don't know a proper solution, but first why don't you try mainline ATF? Should it build (and run) it'd be a double win! :) Otherwise you could try another toolchain, such as one prebuilt on https://toolchains.bootlin.com/ .
--
Luca
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-03 10:07 ` Neal Frager
@ 2022-02-03 11:04 ` Luca Ceresoli
0 siblings, 0 replies; 13+ messages in thread
From: Luca Ceresoli @ 2022-02-03 11:04 UTC (permalink / raw)
To: Neal Frager, buildroot
Hi Neal,
On 03/02/22 11:07, Neal Frager wrote:
> Hi Luca,
>
> Thank you for your feedback.
>
> As for the ATF, yes, the mainline version should work, and since it does not have the same build issue with the buildroot compiler, I will move the patch back to the mainline ATF version.
>
> Unfortunately, U-Boot is another story. The mainline U-Boot will boot just fine with an SD card. However, I know that the Xilinx U-Boot QSPI driver is not yet in mainline. Since QSPI is a very popular boot flash medium, I cannot in good conscience recommend using the mainline U-Boot until QSPI is well supported for Xilinx devices.
OK, so you have a good reason to stay on the Xilinx fork. Just mention
this in your commit message. Hint: the above paragraph is a good draft
to start from.
> Xilinx is working hard to get all of our U-Boot and Linux kernel drivers in mainline, but we are not yet there. I would be happy to update the zcu_10x_defconfigs to using the mainline U-Boot and Linux kernels when the level of necessary support is better.
Sounds like a good plan!
--
Luca
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-03 6:24 ` Neal Frager
@ 2022-02-03 12:01 ` Giulio Benetti
2022-02-03 13:57 ` Neal Frager
0 siblings, 1 reply; 13+ messages in thread
From: Giulio Benetti @ 2022-02-03 12:01 UTC (permalink / raw)
To: Neal Frager, buildroot; +Cc: luca
Hi Neal,
On 03/02/22 07:24, Neal Frager wrote:
> Hi Giulio,
>
> Thank you very much for your feedback.
You're welcome.
Please don't top-post, answer inline as you see all around the Mailing List.
Also, I don't know if you've read my entire answer. Usually until you
don't see "Best regards" and the name of the one who answer, the
answer-mail is not finished yet, so simply scroll down until you finish
the e-mail.
So please check also the rest of my previous e-mail.
> I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem.
Fine
> As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments.
Luca already pointed you a lot of very useful links.
Another tool I like to create patches for me is "git gui" and also
"gitk" to scroll the commits in a non-console way.
Most of all "git gui" is helpful to me to choose a single line to stage
or revert.
Best regards
---
Giulio Benetti
Benetti Engineering sas
> Best regards,
>
> Neal Frager
> Xilinx
>
> -----Original Message-----
> From: Giulio Benetti <giulio.benetti@benettiengineering.com>
> Sent: Wednesday 2 February 2022 23:33
> To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
> Cc: luca@lucaceresoli.net; Neal Frager <nealf@xilinx.com>
> Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
>
> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
>
>
> Hi Neal,
>
> nice to see you've made it with git send-email :-),
>
> Here I would improve commit log by stating that you're dropping all local patches because they are now upstreamed
>
> On 02/02/22 17:55, Neal Frager wrote:
>> Signed-off-by: Neal Frager <nealf@xilinx.com>
>> ---
>> board/zynqmp/genimage.cfg | 1 +
>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
>> configs/zynqmp_zcu102_defconfig | 35 ++++
>
> This ^^^ file is added, so it deserves a second patch after this one, basically this becomes a patchset of 2 patches
>
>> configs/zynqmp_zcu106_defconfig | 15 +-
>> 8 files changed, 44 insertions(+), 484 deletions(-)
>> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
>> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
>> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
>> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
>> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
>> create mode 100644 configs/zynqmp_zcu102_defconfig
>>
>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
>> index ed202f4550..557364e124 100644
>> --- a/board/zynqmp/genimage.cfg
>> +++ b/board/zynqmp/genimage.cfg
>> @@ -3,6 +3,7 @@ image boot.vfat {
>> files = {
>> "boot.bin",
>> "u-boot.bin",
>> + "u-boot.itb",
>
> Can you please justify this adding ^^^ in commit log?
>
>> "atf-uboot.ub",
>> "system.dtb",
>> "Image"
>> diff --git
>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G
>> GC-ignore-Warray-bounds.patch
>> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G
>> GC-ignore-Warray-bounds.patch
>> deleted file mode 100644
>> index 0c1a9ba2a4..0000000000
>> ---
>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-G
>> GC-ignore-Warray-bounds.patch
>> +++ /dev/null
>> @@ -1,68 +0,0 @@
>> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00
>> 2001
>> -From: Deepika Bhavnani <deepika.bhavnani@arm.com>
>> -Date: Thu, 15 Aug 2019 00:56:46 +0300
>> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds
>> -
>> -GCC diagnostics were added to ignore array boundaries, instead -of
>> ignoring GCC warning current code will check for array boundaries -and
>> perform and array update only for valid elements.
>> -
>> -Resolves: `CID 246574` `CID 246710` `CID 246651`
>> -
>> -Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
>> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57
>> -
>> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef
>> -[Adapted to apply on 1.5]
>> -
>> ----
>> - lib/psci/psci_common.c | 20 ++++++++++----------
>> - 1 file changed, 10 insertions(+), 10 deletions(-)
>> -
>> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index
>> 2220a745cd6e..6282d992a2f0 100644
>> ---- a/lib/psci/psci_common.c
>> -+++ b/lib/psci/psci_common.c
>> -@@ -188,21 +188,17 @@ static unsigned int
>> get_power_on_target_pwrlvl(void)
>> -
>> /*********************************************************************
>> *********
>> - * Helper function to update the requested local power state array.
>> This array
>> - * does not store the requested state for the CPU power level. Hence
>> an
>> -- * assertion is added to prevent us from accessing the wrong index.
>> -+ * assertion is added to prevent us from accessing the CPU power level.
>> -
>> **********************************************************************
>> *******/
>> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl,
>> - unsigned int cpu_idx,
>> - plat_local_state_t req_pwr_state)
>> - {
>> -- /*
>> -- * This should never happen, we have this here to avoid
>> -- * "array subscript is above array bounds" errors in GCC.
>> -- */
>> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
>> --#pragma GCC diagnostic push
>> --#pragma GCC diagnostic ignored "-Warray-bounds"
>> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
>> --#pragma GCC diagnostic pop
>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
>> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state;
>> -+ }
>> - }
>> -
>> -
>> /*********************************************************************
>> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t
>> *psci_get_req_local_pwr_states(unsigned int pwrlvl,
>> - {
>> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
>> -
>> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx];
>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
>> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx];
>> -+ } else
>> -+ return NULL;
>> - }
>> -
>> - /*
>> ---
>> -2.34.0
>> -
>> diff --git
>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot
>> ing.patch
>> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot
>> ing.patch
>> deleted file mode 100644
>> index 4d85e1bb12..0000000000
>> ---
>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boot
>> ing.patch
>> +++ /dev/null
>> @@ -1,52 +0,0 @@
>> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00
>> 2001
>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>> -Date: Mon, 26 Feb 2018 09:40:34 +0100
>> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting
>> -
>> -The U-Boot SPL generated with the current zcu106 defconfig cannot
>> boot -from MMC:
>> -
>> - [...]
>> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14)
>> - EL Level: EL3
>> - Trying to boot from MMC1
>> - sdhci_transfer_data: Error detected in status(0x408020)!
>> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2
>> - spl_load_image_fat: error reading image u-boot.img, err - -6
>> - SPL: failed to boot from all boot devices
>> - ### ERROR ### Please RESET the board ###
>> -
>> -Fix by lowering the rpll value. The new value for the RPLL_CTRL
>> -register comes from the current psu_init_gpl.c from the HDF file at
>> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a072
>> d019a16cb2bc546/zcu106-zynqmp
>> -(generated by Vivado v2017.4).
>> -
>> -RPLL and sdio1_ref clocks before and after this change:
>> -
>> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz
>> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz
>> -
>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> -Cc: Michal Simek <michal.simek@xilinx.com>
>> -Upstream-status: accepted upstream in a different form
>> ----
>> -
>> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>> -index 4d18abe000ca..e6fa477e53e7 100644
>> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>> -@@ -10,7 +10,7 @@
>> - static unsigned long psu_pll_init_data(void)
>> - {
>> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U);
>> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U);
>> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U);
>> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U);
>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U);
>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U);
>> ---
>> -2.7.4
>> -
>> diff --git
>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p
>> atch
>> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p
>> atch
>> deleted file mode 100644
>> index 487fff6812..0000000000
>> ---
>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.p
>> atch
>> +++ /dev/null
>> @@ -1,114 +0,0 @@
>> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00
>> 2001
>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>> -Date: Mon, 12 Mar 2018 17:18:38 +0100
>> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF
>> -
>> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot
>> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which
>> -pass control to full u-boot(EL2). This has been tested on zcu106, so
>> -enable it in this defconfig.
>> -
>> -To generate an image that triggers this booting flow, you need to
>> pass -'-O arm-trusted-firmware' to mkimage.
>> -
>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
>> from upstream:
>> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d907224103
>> 5a8d4162560c71
>> ----
>> -
>> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
>> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
>> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
>> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
>> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
>> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 +
>> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
>> - 7 files changed, 7 insertions(+)
>> -
>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>> -index c5bfa2b12638..488c72258b0e 100644
>> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>> -index f86dce403a42..5d501eec0edd 100644
>> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>> -index 6e947cf56827..6f7eaebd7676 100644
>> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_CMD_MEMTEST=y
>> - CONFIG_SYS_ALT_MEMTEST=y
>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>> -index 1c934858c61c..7a3806cba4b5 100644
>> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_CMD_MEMTEST=y
>> - CONFIG_SYS_ALT_MEMTEST=y
>> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>> -index e13c7c56f310..e4408f182ca0 100644
>> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig
>> b/configs/xilinx_zynqmp_zcu102_revA_defconfig
>> -index 5b2cd495ee85..b52f6789fd4b 100644
>> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
>> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig
>> b/configs/xilinx_zynqmp_zcu102_revB_defconfig
>> -index e6530fbfe7ff..80592554f682 100644
>> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
>> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> ---
>> -2.7.4
>> -
>> diff --git
>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path
>> -for-PMUFW_INIT_.patch
>> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path
>> -for-PMUFW_INIT_.patch
>> deleted file mode 100644
>> index 95ab7b3b75..0000000000
>> ---
>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path
>> -for-PMUFW_INIT_.patch
>> +++ /dev/null
>> @@ -1,68 +0,0 @@
>> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00
>> 2001
>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>> -Date: Mon, 4 Jun 2018 12:21:01 +0200
>> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for
>> PMUFW_INIT_FILE
>> -
>> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus
>> -forcing it to be a relative path inside the U-Boot source tree. Since
>> -the PMUFW is a binary file generated outside of U-Boot, the PMUFW
>> -binary must be copied inside the U-Boot source tree before the
>> -build.
>> -
>> -This generates a few problems:
>> -
>> - * if the source tree is shared among different out-of-tree builds,
>> - they will pollute (and potentially corrupt) each other
>> - * the source tree cannot be read-only
>> - * any buildsystem must add a command to copy the PMUFW binary
>> - * putting an externally-generated binary in the source tree is ugly
>> - as hell
>> -
>> -Avoid these problems by accepting an absolute path for
>> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/"
>> -prefix, but in order to keep backward compatibility we rather use the
>> -shell and readlink to get the absolute path even when starting from a
>> -relative path.
>> -
>> -Since 'readlink -f' produces an empty string if the file does not
>> -exist, we also add a check to ensure the file configured in
>> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully,
>> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty.
>> -
>> -Tested in the 12 possible combinations of:
>> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing
>> - - building in-tree, in subdir, in other directory
>> -
>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> -Cc: Michal Simek <michal.simek@xilinx.com>
>> -Cc: Simon Glass <sjg@chromium.org>
>> -Cc: Emmanuel Vadot <manu@bidouilliste.com>
>> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
>> from upstream:
>> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee81874
>> 7759e8060b59626
>> ----
>> - scripts/Makefile.spl | 8 +++++++-
>> - 1 file changed, 7 insertions(+), 1 deletion(-)
>> -
>> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index
>> ef018b5b4056..252f13826d4c 100644
>> ---- a/scripts/Makefile.spl
>> -+++ b/scripts/Makefile.spl
>> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ
>> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R
>> $(srctree)/$(CONFIG_BOOT_INIT_FILE)
>> - endif
>> - ifdef CONFIG_ARCH_ZYNQMP
>> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
>> -+spl/boot.bin: zynqmp-check-pmufw
>> -+zynqmp-check-pmufw: FORCE
>> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
>> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" &&
>> -+false ) endif
>> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
>> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE)
>> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
>> - endif
>> -
>> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
>> ---
>> -2.7.4
>> -
>> diff --git
>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in
>> it-file-as-a-kco.patch
>> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in
>> it-file-as-a-kco.patch
>> deleted file mode 100644
>> index b32e162780..0000000000
>> ---
>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-in
>> it-file-as-a-kco.patch
>> +++ /dev/null
>> @@ -1,175 +0,0 @@
>> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00
>> 2001
>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>> -Date: Wed, 20 Jun 2018 12:11:50 +0200
>> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a
>> kconfig
>> - variable
>> -
>> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on
>> -ZynqMP (PS init for short). The current logic to locate this file for
>> -both platforms is:
>> -
>> - 1. if a board-specific file exists in
>> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c
>> - then use it
>> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c
>> -
>> -In the latter case the file does not exist in the U-Boot sources and
>> -must be copied in the source tree from the outside before starting
>> the -build. This is typical when it is generated from Xilinx tools
>> while -developing a custom hardware. However making sure that a
>> -board-specific file is _not_ found (and used) requires some trickery
>> -such as removing or overwriting all PS init files (e.g.: the current
>> -meta-xilinx yocto layer [0]).
>> -
>> -This generates a few problems:
>> -
>> - * if the source tree is shared among different out-of-tree builds,
>> - they will pollute (and potentially corrupt) each other
>> - * the source tree cannot be read-only
>> - * any buildsystem must add a command to copy the PS init file binary
>> - * overwriting or deleting files in the source tree is ugly as hell
>> -
>> -Simplify usage by allowing to pass the path to the desired PS init
>> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute
>> -path or relative to $(srctree). If the variable is set, the
>> -user-specified file will always be used without being copied -around.
>> If the the variable is left empty, for backward compatibility -fall
>> back to the old behaviour.
>> -
>> -Since the issue is the same for Zynq and ZynqMP, add one kconfig
>> -variable in a common place and use it for both.
>> -
>> -Also use the new kconfig help text to document all the ways to give
>> -U-Boot the PS init file.
>> -
>> -Build-tested with all combinations of:
>> - - platform: zynq or zynqmp
>> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path,
>> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/
>> - - building in-tree, in subdir, in other directory
>> -
>> -[0]
>> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a1
>> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.
>> inc#L9
>> -
>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> -Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>> -Cc: Michal Simek <michal.simek@xilinx.com>
>> -Cc: Nathan Rossi <nathan@nathanrossi.com> -Backported from upstream:
>> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b0
>> 4e557b7ef65b56c
>> ----
>> - arch/arm/Kconfig | 1 +
>> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++
>> - board/xilinx/zynq/Makefile | 10 +++++++++-
>> - board/xilinx/zynqmp/Makefile | 10 +++++++++-
>> - 4 files changed, 60 insertions(+), 2 deletions(-)
>> - create mode 100644 board/xilinx/Kconfig
>> -
>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index
>> 22234cde2ab6..e04979d0ef7e 100644
>> ---- a/arch/arm/Kconfig
>> -+++ b/arch/arm/Kconfig
>> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig"
>> - source "board/vscom/baltos/Kconfig"
>> - source "board/woodburn/Kconfig"
>> - source "board/work-microwave/work_92105/Kconfig"
>> -+source "board/xilinx/Kconfig"
>> - source "board/zipitz2/Kconfig"
>> -
>> - source "arch/arm/Kconfig.debug"
>> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file
>> mode 100644 -index 000000000000..aa3fa061edef
>> ---- /dev/null
>> -+++ b/board/xilinx/Kconfig
>> -@@ -0,0 +1,41 @@
>> -+# Copyright (c) 2018, Luca Ceresoli <luca@lucaceresoli.net> # #
>> -+SPDX-License-Identifier: GPL-2.0
>> -+
>> -+if ARCH_ZYNQ || ARCH_ZYNQMP
>> -+
>> -+config XILINX_PS_INIT_FILE
>> -+ string "Zynq/ZynqMP PS init file(s) location"
>> -+ help
>> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if
>> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some
>> -+ basic initializations, such as enabling peripherals and
>> -+ configuring pinmuxes. The PS init file (called
>> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000)
>> -+ contains the code for such initializations.
>> -+
>> -+ U-Boot contains PS init files for some boards, but each of
>> -+ them describes only one specific configuration. Users of a
>> -+ different board, or needing a different configuration, can
>> -+ generate custom files using the Xilinx development tools.
>> -+
>> -+ There are three ways to give a PS init file to U-Boot:
>> -+
>> -+ 1. Set this variable to the path, either relative to the
>> -+ source tree or absolute, where the psu_init_gpl.c or
>> -+ ps7_init_gpl.c file is located. U-Boot will build this
>> -+ file.
>> -+
>> -+ 2. If you leave an empty string here, U-Boot will use
>> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c
>> -+ for Zynq-7000, or
>> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c
>> -+ for ZynqMP.
>> -+
>> -+ 3. If the above file does not exist, U-Boot will use
>> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or
>> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file
>> -+ is not provided by U-Boot, you have to copy it there
>> -+ before the build.
>> -+
>> -+endif
>> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
>> -index 5a76a26720cd..03ad5f0532ee 100644
>> ---- a/board/xilinx/zynq/Makefile
>> -+++ b/board/xilinx/zynq/Makefile
>> -@@ -5,10 +5,18 @@
>> -
>> - obj-y := board.o
>> -
>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
>> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE)
>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
>> -
>> -+ifeq ($(init-objs),)
>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
>> - $(hw-platform-y)/ps7_init_gpl.o)
>> -+endif
>> -
>> - ifeq ($(init-objs),)
>> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),)
>> -diff --git a/board/xilinx/zynqmp/Makefile
>> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853
>> 100644
>> ---- a/board/xilinx/zynqmp/Makefile
>> -+++ b/board/xilinx/zynqmp/Makefile
>> -@@ -5,10 +5,18 @@
>> -
>> - obj-y := zynqmp.o
>> -
>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
>> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE)
>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
>> -
>> -+ifeq ($(init-objs),)
>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\
>> - $(hw-platform-y)/psu_init_gpl.o)
>> -+endif
>> -
>> - ifeq ($(init-objs),)
>> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),)
>> ---
>> -2.7.4
>> -
>> diff --git a/configs/zynqmp_zcu102_defconfig
>> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index
>> 0000000000..336f5c2dbe
>> --- /dev/null
>> +++ b/configs/zynqmp_zcu102_defconfig
>> @@ -0,0 +1,35 @@
>> +BR2_aarch64=y
>> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>> +BR2_LINUX_KERNEL=y
>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y
>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0"
>> +BR2_TARGET_ROOTFS_EXT2=y
>> +BR2_TARGET_ROOTFS_EXT2_4=y
>> +# BR2_TARGET_ROOTFS_TAR is not set
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
>> +BR2_TARGET_UBOOT=y
>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y
>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
>> +BR2_TARGET_UBOOT_NEEDS_DTC=y
>> +BR2_TARGET_UBOOT_SPL=y
>> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
>> +BR2_TARGET_UBOOT_ZYNQMP=y
>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
>> +BR2_TARGET_UBOOT_FORMAT_ITB=y
>> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
>> +BR2_PACKAGE_HOST_GENIMAGE=y
>> +BR2_PACKAGE_HOST_MTOOLS=y
>
> As pointed above this ^^^ file must be in a separate patch and it deserves also a maintainer. So please you or maybe Luca could add an entry to DEVELOPERS for this board
>
>> diff --git a/configs/zynqmp_zcu106_defconfig
>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644
>> --- a/configs/zynqmp_zcu106_defconfig
>> +++ b/configs/zynqmp_zcu106_defconfig
>> @@ -1,11 +1,11 @@
>> BR2_aarch64=y
>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>
> Since all patches are gone, this ^^^ is not needed anymore
>
>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>> BR2_LINUX_KERNEL=y
>> BR2_LINUX_KERNEL_CUSTOM_GIT=y
>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>> BR2_LINUX_KERNEL_DTS_SUPPORT=y
>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y
>> # BR2_TARGET_ROOTFS_TAR is not set
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>
> It's worth mention in commit log that you're switching from ARM to Xilinx ATF
>
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
>> BR2_TARGET_UBOOT=y
>> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>> BR2_TARGET_UBOOT_CUSTOM_GIT=y
>> BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
>> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
>> BR2_TARGET_UBOOT_NEEDS_DTC=y
>> BR2_TARGET_UBOOT_SPL=y
>> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
>> BR2_TARGET_UBOOT_ZYNQMP=y
>> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
>> +BR2_TARGET_UBOOT_FORMAT_ITB=y
>
> Here ^^^ I see that probably you're switching from .bin to .itb so better mention it in commit log
>
>> BR2_PACKAGE_HOST_DOSFSTOOLS=y
>> BR2_PACKAGE_HOST_GENIMAGE=y
>> BR2_PACKAGE_HOST_MTOOLS=y
>
> Thank you!
>
> Best regards
> --
> Giulio Benetti
> Benetti Engineering sas
--
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-03 12:01 ` Giulio Benetti
@ 2022-02-03 13:57 ` Neal Frager
2022-02-03 14:05 ` Giulio Benetti
0 siblings, 1 reply; 13+ messages in thread
From: Neal Frager @ 2022-02-03 13:57 UTC (permalink / raw)
To: Giulio Benetti, buildroot; +Cc: luca
Hi Giulio,
> Hi Neal,
> On 03/02/22 07:24, Neal Frager wrote:
> Hi Giulio,
>
> Thank you very much for your feedback.
> You're welcome.
> Please don't top-post, answer inline as you see all around the Mailing List.
> Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail.
> So please check also the rest of my previous e-mail.
I hope this method of inline answer works. I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think?
> I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem.
> Fine
> As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments.
> Luca already pointed you a lot of very useful links.
> Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way.
> Most of all "git gui" is helpful to me to choose a single line to stage or revert.
> Best regards
---
> Giulio Benetti
> Benetti Engineering sas
> Best regards,
>
> Neal Frager
> Xilinx
>
Best regards,
Neal Frager
Xilinx
> -----Original Message-----
> From: Giulio Benetti <giulio.benetti@benettiengineering.com>
> Sent: Wednesday 2 February 2022 23:33
> To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
> Cc: luca@lucaceresoli.net; Neal Frager <nealf@xilinx.com>
> Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump
> ATF/U-Boot/Linux to Xilinx 2021.2
>
> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
>
>
> Hi Neal,
>
> nice to see you've made it with git send-email :-),
>
> Here I would improve commit log by stating that you're dropping all
> local patches because they are now upstreamed
>
> On 02/02/22 17:55, Neal Frager wrote:
>> Signed-off-by: Neal Frager <nealf@xilinx.com>
>> ---
>> board/zynqmp/genimage.cfg | 1 +
>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
>> configs/zynqmp_zcu102_defconfig | 35 ++++
>
> This ^^^ file is added, so it deserves a second patch after this one,
> basically this becomes a patchset of 2 patches
>
>> configs/zynqmp_zcu106_defconfig | 15 +-
>> 8 files changed, 44 insertions(+), 484 deletions(-)
>> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
>> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
>> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
>> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
>> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
>> create mode 100644 configs/zynqmp_zcu102_defconfig
>>
>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
>> index ed202f4550..557364e124 100644
>> --- a/board/zynqmp/genimage.cfg
>> +++ b/board/zynqmp/genimage.cfg
>> @@ -3,6 +3,7 @@ image boot.vfat {
>> files = {
>> "boot.bin",
>> "u-boot.bin",
>> + "u-boot.itb",
>
> Can you please justify this adding ^^^ in commit log?
>
>> "atf-uboot.ub",
>> "system.dtb",
>> "Image"
>> diff --git
>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-
>> G
>> GC-ignore-Warray-bounds.patch
>> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-
>> G
>> GC-ignore-Warray-bounds.patch
>> deleted file mode 100644
>> index 0c1a9ba2a4..0000000000
>> ---
>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-
>> G
>> GC-ignore-Warray-bounds.patch
>> +++ /dev/null
>> @@ -1,68 +0,0 @@
>> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00
>> 2001
>> -From: Deepika Bhavnani <deepika.bhavnani@arm.com>
>> -Date: Thu, 15 Aug 2019 00:56:46 +0300
>> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds
>> -
>> -GCC diagnostics were added to ignore array boundaries, instead -of
>> ignoring GCC warning current code will check for array boundaries
>> -and perform and array update only for valid elements.
>> -
>> -Resolves: `CID 246574` `CID 246710` `CID 246651`
>> -
>> -Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
>> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57
>> -
>> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef
>> -[Adapted to apply on 1.5]
>> -
>> ----
>> - lib/psci/psci_common.c | 20 ++++++++++----------
>> - 1 file changed, 10 insertions(+), 10 deletions(-)
>> -
>> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index
>> 2220a745cd6e..6282d992a2f0 100644
>> ---- a/lib/psci/psci_common.c
>> -+++ b/lib/psci/psci_common.c
>> -@@ -188,21 +188,17 @@ static unsigned int
>> get_power_on_target_pwrlvl(void)
>> -
>> /********************************************************************
>> *
>> *********
>> - * Helper function to update the requested local power state array.
>> This array
>> - * does not store the requested state for the CPU power level.
>> Hence an
>> -- * assertion is added to prevent us from accessing the wrong index.
>> -+ * assertion is added to prevent us from accessing the CPU power level.
>> -
>> *********************************************************************
>> *
>> *******/
>> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl,
>> - unsigned int cpu_idx,
>> - plat_local_state_t req_pwr_state)
>> - {
>> -- /*
>> -- * This should never happen, we have this here to avoid
>> -- * "array subscript is above array bounds" errors in GCC.
>> -- */
>> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
>> --#pragma GCC diagnostic push
>> --#pragma GCC diagnostic ignored "-Warray-bounds"
>> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
>> --#pragma GCC diagnostic pop
>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
>> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state;
>> -+ }
>> - }
>> -
>> -
>> /********************************************************************
>> *
>> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t
>> *psci_get_req_local_pwr_states(unsigned int pwrlvl,
>> - {
>> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
>> -
>> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx];
>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
>> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx];
>> -+ } else
>> -+ return NULL;
>> - }
>> -
>> - /*
>> ---
>> -2.34.0
>> -
>> diff --git
>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo
>> t
>> ing.patch
>> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo
>> t
>> ing.patch
>> deleted file mode 100644
>> index 4d85e1bb12..0000000000
>> ---
>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo
>> t
>> ing.patch
>> +++ /dev/null
>> @@ -1,52 +0,0 @@
>> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00
>> 2001
>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>> -Date: Mon, 26 Feb 2018 09:40:34 +0100
>> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting
>> -
>> -The U-Boot SPL generated with the current zcu106 defconfig cannot
>> boot -from MMC:
>> -
>> - [...]
>> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14)
>> - EL Level: EL3
>> - Trying to boot from MMC1
>> - sdhci_transfer_data: Error detected in status(0x408020)!
>> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2
>> - spl_load_image_fat: error reading image u-boot.img, err - -6
>> - SPL: failed to boot from all boot devices
>> - ### ERROR ### Please RESET the board ###
>> -
>> -Fix by lowering the rpll value. The new value for the RPLL_CTRL
>> -register comes from the current psu_init_gpl.c from the HDF file at
>> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a07
>> 2
>> d019a16cb2bc546/zcu106-zynqmp
>> -(generated by Vivado v2017.4).
>> -
>> -RPLL and sdio1_ref clocks before and after this change:
>> -
>> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz
>> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz
>> -
>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> -Cc: Michal Simek <michal.simek@xilinx.com>
>> -Upstream-status: accepted upstream in a different form
>> ----
>> -
>> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>> -index 4d18abe000ca..e6fa477e53e7 100644
>> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>> -@@ -10,7 +10,7 @@
>> - static unsigned long psu_pll_init_data(void)
>> - {
>> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U);
>> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U);
>> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U);
>> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U);
>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U);
>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U);
>> ---
>> -2.7.4
>> -
>> diff --git
>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>> p
>> atch
>> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>> p
>> atch
>> deleted file mode 100644
>> index 487fff6812..0000000000
>> ---
>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>> p
>> atch
>> +++ /dev/null
>> @@ -1,114 +0,0 @@
>> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00
>> 2001
>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>> -Date: Mon, 12 Mar 2018 17:18:38 +0100
>> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF
>> -
>> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot
>> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3)
>> which -pass control to full u-boot(EL2). This has been tested on
>> zcu106, so -enable it in this defconfig.
>> -
>> -To generate an image that triggers this booting flow, you need to
>> pass -'-O arm-trusted-firmware' to mkimage.
>> -
>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
>> from upstream:
>> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d90722410
>> 3
>> 5a8d4162560c71
>> ----
>> -
>> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
>> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
>> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
>> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
>> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
>> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 +
>> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
>> - 7 files changed, 7 insertions(+)
>> -
>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>> -index c5bfa2b12638..488c72258b0e 100644
>> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>> -index f86dce403a42..5d501eec0edd 100644
>> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>> -index 6e947cf56827..6f7eaebd7676 100644
>> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_CMD_MEMTEST=y
>> - CONFIG_SYS_ALT_MEMTEST=y
>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>> -index 1c934858c61c..7a3806cba4b5 100644
>> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_CMD_MEMTEST=y
>> - CONFIG_SYS_ALT_MEMTEST=y
>> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>> -index e13c7c56f310..e4408f182ca0 100644
>> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig
>> b/configs/xilinx_zynqmp_zcu102_revA_defconfig
>> -index 5b2cd495ee85..b52f6789fd4b 100644
>> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
>> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig
>> b/configs/xilinx_zynqmp_zcu102_revB_defconfig
>> -index e6530fbfe7ff..80592554f682 100644
>> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
>> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>> - CONFIG_SPL_OS_BOOT=y
>> - CONFIG_SPL_RAM_SUPPORT=y
>> - CONFIG_SPL_RAM_DEVICE=y
>> -+CONFIG_SPL_ATF=y
>> - CONFIG_SYS_PROMPT="ZynqMP> "
>> - CONFIG_FASTBOOT=y
>> - CONFIG_FASTBOOT_FLASH=y
>> ---
>> -2.7.4
>> -
>> diff --git
>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat
>> h
>> -for-PMUFW_INIT_.patch
>> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat
>> h
>> -for-PMUFW_INIT_.patch
>> deleted file mode 100644
>> index 95ab7b3b75..0000000000
>> ---
>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat
>> h
>> -for-PMUFW_INIT_.patch
>> +++ /dev/null
>> @@ -1,68 +0,0 @@
>> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00
>> 2001
>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>> -Date: Mon, 4 Jun 2018 12:21:01 +0200
>> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for
>> PMUFW_INIT_FILE
>> -
>> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus
>> -forcing it to be a relative path inside the U-Boot source tree.
>> Since -the PMUFW is a binary file generated outside of U-Boot, the
>> PMUFW -binary must be copied inside the U-Boot source tree before the
>> -build.
>> -
>> -This generates a few problems:
>> -
>> - * if the source tree is shared among different out-of-tree builds,
>> - they will pollute (and potentially corrupt) each other
>> - * the source tree cannot be read-only
>> - * any buildsystem must add a command to copy the PMUFW binary
>> - * putting an externally-generated binary in the source tree is ugly
>> - as hell
>> -
>> -Avoid these problems by accepting an absolute path for
>> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/"
>> -prefix, but in order to keep backward compatibility we rather use
>> the -shell and readlink to get the absolute path even when starting
>> from a -relative path.
>> -
>> -Since 'readlink -f' produces an empty string if the file does not
>> -exist, we also add a check to ensure the file configured in
>> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully,
>> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty.
>> -
>> -Tested in the 12 possible combinations of:
>> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing
>> - - building in-tree, in subdir, in other directory
>> -
>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> -Cc: Michal Simek <michal.simek@xilinx.com>
>> -Cc: Simon Glass <sjg@chromium.org>
>> -Cc: Emmanuel Vadot <manu@bidouilliste.com>
>> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
>> from upstream:
>> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee8187
>> 4
>> 7759e8060b59626
>> ----
>> - scripts/Makefile.spl | 8 +++++++-
>> - 1 file changed, 7 insertions(+), 1 deletion(-)
>> -
>> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index
>> ef018b5b4056..252f13826d4c 100644
>> ---- a/scripts/Makefile.spl
>> -+++ b/scripts/Makefile.spl
>> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ
>> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R
>> $(srctree)/$(CONFIG_BOOT_INIT_FILE)
>> - endif
>> - ifdef CONFIG_ARCH_ZYNQMP
>> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
>> -+spl/boot.bin: zynqmp-check-pmufw
>> -+zynqmp-check-pmufw: FORCE
>> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
>> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" &&
>> -+false ) endif
>> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
>> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE)
>> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
>> - endif
>> -
>> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
>> ---
>> -2.7.4
>> -
>> diff --git
>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i
>> n
>> it-file-as-a-kco.patch
>> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i
>> n
>> it-file-as-a-kco.patch
>> deleted file mode 100644
>> index b32e162780..0000000000
>> ---
>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i
>> n
>> it-file-as-a-kco.patch
>> +++ /dev/null
>> @@ -1,175 +0,0 @@
>> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00
>> 2001
>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>> -Date: Wed, 20 Jun 2018 12:11:50 +0200
>> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a
>> kconfig
>> - variable
>> -
>> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on
>> -ZynqMP (PS init for short). The current logic to locate this file
>> for -both platforms is:
>> -
>> - 1. if a board-specific file exists in
>> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c
>> - then use it
>> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c
>> -
>> -In the latter case the file does not exist in the U-Boot sources and
>> -must be copied in the source tree from the outside before starting
>> the -build. This is typical when it is generated from Xilinx tools
>> while -developing a custom hardware. However making sure that a
>> -board-specific file is _not_ found (and used) requires some trickery
>> -such as removing or overwriting all PS init files (e.g.: the current
>> -meta-xilinx yocto layer [0]).
>> -
>> -This generates a few problems:
>> -
>> - * if the source tree is shared among different out-of-tree builds,
>> - they will pollute (and potentially corrupt) each other
>> - * the source tree cannot be read-only
>> - * any buildsystem must add a command to copy the PS init file
>> binary
>> - * overwriting or deleting files in the source tree is ugly as hell
>> -
>> -Simplify usage by allowing to pass the path to the desired PS init
>> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute
>> -path or relative to $(srctree). If the variable is set, the
>> -user-specified file will always be used without being copied -around.
>> If the the variable is left empty, for backward compatibility -fall
>> back to the old behaviour.
>> -
>> -Since the issue is the same for Zynq and ZynqMP, add one kconfig
>> -variable in a common place and use it for both.
>> -
>> -Also use the new kconfig help text to document all the ways to give
>> -U-Boot the PS init file.
>> -
>> -Build-tested with all combinations of:
>> - - platform: zynq or zynqmp
>> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path,
>> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/
>> - - building in-tree, in subdir, in other directory
>> -
>> -[0]
>> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a
>> 1
>> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.
>> inc#L9
>> -
>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> -Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>> -Cc: Michal Simek <michal.simek@xilinx.com>
>> -Cc: Nathan Rossi <nathan@nathanrossi.com> -Backported from upstream:
>> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b
>> 0
>> 4e557b7ef65b56c
>> ----
>> - arch/arm/Kconfig | 1 +
>> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++
>> - board/xilinx/zynq/Makefile | 10 +++++++++-
>> - board/xilinx/zynqmp/Makefile | 10 +++++++++-
>> - 4 files changed, 60 insertions(+), 2 deletions(-)
>> - create mode 100644 board/xilinx/Kconfig
>> -
>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index
>> 22234cde2ab6..e04979d0ef7e 100644
>> ---- a/arch/arm/Kconfig
>> -+++ b/arch/arm/Kconfig
>> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig"
>> - source "board/vscom/baltos/Kconfig"
>> - source "board/woodburn/Kconfig"
>> - source "board/work-microwave/work_92105/Kconfig"
>> -+source "board/xilinx/Kconfig"
>> - source "board/zipitz2/Kconfig"
>> -
>> - source "arch/arm/Kconfig.debug"
>> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file
>> mode 100644 -index 000000000000..aa3fa061edef
>> ---- /dev/null
>> -+++ b/board/xilinx/Kconfig
>> -@@ -0,0 +1,41 @@
>> -+# Copyright (c) 2018, Luca Ceresoli <luca@lucaceresoli.net> # #
>> -+SPDX-License-Identifier: GPL-2.0
>> -+
>> -+if ARCH_ZYNQ || ARCH_ZYNQMP
>> -+
>> -+config XILINX_PS_INIT_FILE
>> -+ string "Zynq/ZynqMP PS init file(s) location"
>> -+ help
>> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if
>> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some
>> -+ basic initializations, such as enabling peripherals and
>> -+ configuring pinmuxes. The PS init file (called
>> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000)
>> -+ contains the code for such initializations.
>> -+
>> -+ U-Boot contains PS init files for some boards, but each of
>> -+ them describes only one specific configuration. Users of a
>> -+ different board, or needing a different configuration, can
>> -+ generate custom files using the Xilinx development tools.
>> -+
>> -+ There are three ways to give a PS init file to U-Boot:
>> -+
>> -+ 1. Set this variable to the path, either relative to the
>> -+ source tree or absolute, where the psu_init_gpl.c or
>> -+ ps7_init_gpl.c file is located. U-Boot will build this
>> -+ file.
>> -+
>> -+ 2. If you leave an empty string here, U-Boot will use
>> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c
>> -+ for Zynq-7000, or
>> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c
>> -+ for ZynqMP.
>> -+
>> -+ 3. If the above file does not exist, U-Boot will use
>> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or
>> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file
>> -+ is not provided by U-Boot, you have to copy it there
>> -+ before the build.
>> -+
>> -+endif
>> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
>> -index 5a76a26720cd..03ad5f0532ee 100644
>> ---- a/board/xilinx/zynq/Makefile
>> -+++ b/board/xilinx/zynq/Makefile
>> -@@ -5,10 +5,18 @@
>> -
>> - obj-y := board.o
>> -
>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
>> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE)
>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
>> -
>> -+ifeq ($(init-objs),)
>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
>> - $(hw-platform-y)/ps7_init_gpl.o)
>> -+endif
>> -
>> - ifeq ($(init-objs),)
>> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),)
>> -diff --git a/board/xilinx/zynqmp/Makefile
>> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853
>> 100644
>> ---- a/board/xilinx/zynqmp/Makefile
>> -+++ b/board/xilinx/zynqmp/Makefile
>> -@@ -5,10 +5,18 @@
>> -
>> - obj-y := zynqmp.o
>> -
>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
>> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE)
>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
>> -
>> -+ifeq ($(init-objs),)
>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\
>> - $(hw-platform-y)/psu_init_gpl.o)
>> -+endif
>> -
>> - ifeq ($(init-objs),)
>> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),)
>> ---
>> -2.7.4
>> -
>> diff --git a/configs/zynqmp_zcu102_defconfig
>> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index
>> 0000000000..336f5c2dbe
>> --- /dev/null
>> +++ b/configs/zynqmp_zcu102_defconfig
>> @@ -0,0 +1,35 @@
>> +BR2_aarch64=y
>> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>> +BR2_LINUX_KERNEL=y
>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y
>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0"
>> +BR2_TARGET_ROOTFS_EXT2=y
>> +BR2_TARGET_ROOTFS_EXT2_4=y
>> +# BR2_TARGET_ROOTFS_TAR is not set
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
>> +BR2_TARGET_UBOOT=y
>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y
>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
>> +BR2_TARGET_UBOOT_NEEDS_DTC=y
>> +BR2_TARGET_UBOOT_SPL=y
>> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
>> +BR2_TARGET_UBOOT_ZYNQMP=y
>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
>> +BR2_TARGET_UBOOT_FORMAT_ITB=y
>> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
>> +BR2_PACKAGE_HOST_GENIMAGE=y
>> +BR2_PACKAGE_HOST_MTOOLS=y
>
> As pointed above this ^^^ file must be in a separate patch and it
> deserves also a maintainer. So please you or maybe Luca could add an
> entry to DEVELOPERS for this board
>
>> diff --git a/configs/zynqmp_zcu106_defconfig
>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644
>> --- a/configs/zynqmp_zcu106_defconfig
>> +++ b/configs/zynqmp_zcu106_defconfig
>> @@ -1,11 +1,11 @@
>> BR2_aarch64=y
>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>
> Since all patches are gone, this ^^^ is not needed anymore
>
>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>> BR2_LINUX_KERNEL=y
>> BR2_LINUX_KERNEL_CUSTOM_GIT=y
>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>> BR2_LINUX_KERNEL_DTS_SUPPORT=y
>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y
>> # BR2_TARGET_ROOTFS_TAR is not set
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>
> It's worth mention in commit log that you're switching from ARM to
> Xilinx ATF
>
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
>> BR2_TARGET_UBOOT=y
>> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>> BR2_TARGET_UBOOT_CUSTOM_GIT=y
>> BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
>> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
>> BR2_TARGET_UBOOT_NEEDS_DTC=y
>> BR2_TARGET_UBOOT_SPL=y
>> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
>> BR2_TARGET_UBOOT_ZYNQMP=y
>> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
>> +BR2_TARGET_UBOOT_FORMAT_ITB=y
>
> Here ^^^ I see that probably you're switching from .bin to .itb so
> better mention it in commit log
>
>> BR2_PACKAGE_HOST_DOSFSTOOLS=y
>> BR2_PACKAGE_HOST_GENIMAGE=y
>> BR2_PACKAGE_HOST_MTOOLS=y
>
> Thank you!
>
> Best regards
> --
> Giulio Benetti
> Benetti Engineering sas
--
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-03 13:57 ` Neal Frager
@ 2022-02-03 14:05 ` Giulio Benetti
2022-02-03 14:09 ` Neal Frager
0 siblings, 1 reply; 13+ messages in thread
From: Giulio Benetti @ 2022-02-03 14:05 UTC (permalink / raw)
To: Neal Frager; +Cc: luca, buildroot
Hi Neal,
> Il giorno 3 feb 2022, alle ore 14:57, Neal Frager <nealf@xilinx.com> ha scritto:
>
> Hi Giulio,
>
>> Hi Neal,
>
>> On 03/02/22 07:24, Neal Frager wrote:
>> Hi Giulio,
>>
>> Thank you very much for your feedback.
>
>> You're welcome.
>
>> Please don't top-post, answer inline as you see all around the Mailing List.
>
>> Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail.
>
>> So please check also the rest of my previous e-mail.
>
> I hope this method of inline answer works.
Yes it does work. Only remember to set your client using plain-text only. I’m on mobile now so probably my answer and yours will be in html.
But we need plain-text, please check your email client and set plain-text by default.
> I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think?
Sure, I’m going to tonight :-)
Also Luca I think will since he’s the maintainer of zynq stuff.
Also we’ve sent you the review almost at the same time yesterday :-)
Best regards
—-
Giulio Benetti
Benetti Engineering sas
>
>> I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem.
>
>> Fine
>
>> As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments.
>
>> Luca already pointed you a lot of very useful links.
>
>> Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way.
>
>> Most of all "git gui" is helpful to me to choose a single line to stage or revert.
>
>> Best regards
> ---
>> Giulio Benetti
>> Benetti Engineering sas
>
>> Best regards,
>>
>> Neal Frager
>> Xilinx
>>
>
> Best regards,
> Neal Frager
> Xilinx
>
>> -----Original Message-----
>> From: Giulio Benetti <giulio.benetti@benettiengineering.com>
>> Sent: Wednesday 2 February 2022 23:33
>> To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
>> Cc: luca@lucaceresoli.net; Neal Frager <nealf@xilinx.com>
>> Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump
>> ATF/U-Boot/Linux to Xilinx 2021.2
>>
>> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
>>
>>
>> Hi Neal,
>>
>> nice to see you've made it with git send-email :-),
>>
>> Here I would improve commit log by stating that you're dropping all
>> local patches because they are now upstreamed
>>
>>> On 02/02/22 17:55, Neal Frager wrote:
>>> Signed-off-by: Neal Frager <nealf@xilinx.com>
>>> ---
>>> board/zynqmp/genimage.cfg | 1 +
>>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
>>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
>>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
>>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
>>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
>>> configs/zynqmp_zcu102_defconfig | 35 ++++
>>
>> This ^^^ file is added, so it deserves a second patch after this one,
>> basically this becomes a patchset of 2 patches
>>
>>> configs/zynqmp_zcu106_defconfig | 15 +-
>>> 8 files changed, 44 insertions(+), 484 deletions(-)
>>> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
>>> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
>>> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
>>> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
>>> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
>>> create mode 100644 configs/zynqmp_zcu102_defconfig
>>>
>>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
>>> index ed202f4550..557364e124 100644
>>> --- a/board/zynqmp/genimage.cfg
>>> +++ b/board/zynqmp/genimage.cfg
>>> @@ -3,6 +3,7 @@ image boot.vfat {
>>> files = {
>>> "boot.bin",
>>> "u-boot.bin",
>>> + "u-boot.itb",
>>
>> Can you please justify this adding ^^^ in commit log?
>>
>>> "atf-uboot.ub",
>>> "system.dtb",
>>> "Image"
>>> diff --git
>>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-
>>> G
>>> GC-ignore-Warray-bounds.patch
>>> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-
>>> G
>>> GC-ignore-Warray-bounds.patch
>>> deleted file mode 100644
>>> index 0c1a9ba2a4..0000000000
>>> ---
>>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-
>>> G
>>> GC-ignore-Warray-bounds.patch
>>> +++ /dev/null
>>> @@ -1,68 +0,0 @@
>>> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Deepika Bhavnani <deepika.bhavnani@arm.com>
>>> -Date: Thu, 15 Aug 2019 00:56:46 +0300
>>> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds
>>> -
>>> -GCC diagnostics were added to ignore array boundaries, instead -of
>>> ignoring GCC warning current code will check for array boundaries
>>> -and perform and array update only for valid elements.
>>> -
>>> -Resolves: `CID 246574` `CID 246710` `CID 246651`
>>> -
>>> -Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
>>> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57
>>> -
>>> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef
>>> -[Adapted to apply on 1.5]
>>> -
>>> ----
>>> - lib/psci/psci_common.c | 20 ++++++++++----------
>>> - 1 file changed, 10 insertions(+), 10 deletions(-)
>>> -
>>> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index
>>> 2220a745cd6e..6282d992a2f0 100644
>>> ---- a/lib/psci/psci_common.c
>>> -+++ b/lib/psci/psci_common.c
>>> -@@ -188,21 +188,17 @@ static unsigned int
>>> get_power_on_target_pwrlvl(void)
>>> -
>>> /********************************************************************
>>> *
>>> *********
>>> - * Helper function to update the requested local power state array.
>>> This array
>>> - * does not store the requested state for the CPU power level.
>>> Hence an
>>> -- * assertion is added to prevent us from accessing the wrong index.
>>> -+ * assertion is added to prevent us from accessing the CPU power level.
>>> -
>>> *********************************************************************
>>> *
>>> *******/
>>> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl,
>>> - unsigned int cpu_idx,
>>> - plat_local_state_t req_pwr_state)
>>> - {
>>> -- /*
>>> -- * This should never happen, we have this here to avoid
>>> -- * "array subscript is above array bounds" errors in GCC.
>>> -- */
>>> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
>>> --#pragma GCC diagnostic push
>>> --#pragma GCC diagnostic ignored "-Warray-bounds"
>>> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
>>> --#pragma GCC diagnostic pop
>>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
>>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
>>> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state;
>>> -+ }
>>> - }
>>> -
>>> -
>>> /********************************************************************
>>> *
>>> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t
>>> *psci_get_req_local_pwr_states(unsigned int pwrlvl,
>>> - {
>>> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
>>> -
>>> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx];
>>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
>>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
>>> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx];
>>> -+ } else
>>> -+ return NULL;
>>> - }
>>> -
>>> - /*
>>> ---
>>> -2.34.0
>>> -
>>> diff --git
>>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo
>>> t
>>> ing.patch
>>> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo
>>> t
>>> ing.patch
>>> deleted file mode 100644
>>> index 4d85e1bb12..0000000000
>>> ---
>>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-boo
>>> t
>>> ing.patch
>>> +++ /dev/null
>>> @@ -1,52 +0,0 @@
>>> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Date: Mon, 26 Feb 2018 09:40:34 +0100
>>> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting
>>> -
>>> -The U-Boot SPL generated with the current zcu106 defconfig cannot
>>> boot -from MMC:
>>> -
>>> - [...]
>>> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14)
>>> - EL Level: EL3
>>> - Trying to boot from MMC1
>>> - sdhci_transfer_data: Error detected in status(0x408020)!
>>> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2
>>> - spl_load_image_fat: error reading image u-boot.img, err - -6
>>> - SPL: failed to boot from all boot devices
>>> - ### ERROR ### Please RESET the board ###
>>> -
>>> -Fix by lowering the rpll value. The new value for the RPLL_CTRL
>>> -register comes from the current psu_init_gpl.c from the HDF file at
>>> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a07
>>> 2
>>> d019a16cb2bc546/zcu106-zynqmp
>>> -(generated by Vivado v2017.4).
>>> -
>>> -RPLL and sdio1_ref clocks before and after this change:
>>> -
>>> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz
>>> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz
>>> -
>>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Cc: Michal Simek <michal.simek@xilinx.com>
>>> -Upstream-status: accepted upstream in a different form
>>> ----
>>> -
>>> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +-
>>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>>> -
>>> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>>> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>>> -index 4d18abe000ca..e6fa477e53e7 100644
>>> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>>> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>>> -@@ -10,7 +10,7 @@
>>> - static unsigned long psu_pll_init_data(void)
>>> - {
>>> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U);
>>> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U);
>>> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U);
>>> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U);
>>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U);
>>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U);
>>> ---
>>> -2.7.4
>>> -
>>> diff --git
>>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>>> p
>>> atch
>>> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>>> p
>>> atch
>>> deleted file mode 100644
>>> index 487fff6812..0000000000
>>> ---
>>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>>> p
>>> atch
>>> +++ /dev/null
>>> @@ -1,114 +0,0 @@
>>> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Date: Mon, 12 Mar 2018 17:18:38 +0100
>>> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF
>>> -
>>> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot
>>> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3)
>>> which -pass control to full u-boot(EL2). This has been tested on
>>> zcu106, so -enable it in this defconfig.
>>> -
>>> -To generate an image that triggers this booting flow, you need to
>>> pass -'-O arm-trusted-firmware' to mkimage.
>>> -
>>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
>>> from upstream:
>>> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d90722410
>>> 3
>>> 5a8d4162560c71
>>> ----
>>> -
>>> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
>>> - 7 files changed, 7 insertions(+)
>>> -
>>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>>> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>>> -index c5bfa2b12638..488c72258b0e 100644
>>> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>>> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>>> -index f86dce403a42..5d501eec0edd 100644
>>> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>>> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>>> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>>> -index 6e947cf56827..6f7eaebd7676 100644
>>> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>>> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_CMD_MEMTEST=y
>>> - CONFIG_SYS_ALT_MEMTEST=y
>>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>>> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>>> -index 1c934858c61c..7a3806cba4b5 100644
>>> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>>> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_CMD_MEMTEST=y
>>> - CONFIG_SYS_ALT_MEMTEST=y
>>> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>>> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>>> -index e13c7c56f310..e4408f182ca0 100644
>>> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig
>>> b/configs/xilinx_zynqmp_zcu102_revA_defconfig
>>> -index 5b2cd495ee85..b52f6789fd4b 100644
>>> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
>>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig
>>> b/configs/xilinx_zynqmp_zcu102_revB_defconfig
>>> -index e6530fbfe7ff..80592554f682 100644
>>> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
>>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> ---
>>> -2.7.4
>>> -
>>> diff --git
>>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat
>>> h
>>> -for-PMUFW_INIT_.patch
>>> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat
>>> h
>>> -for-PMUFW_INIT_.patch
>>> deleted file mode 100644
>>> index 95ab7b3b75..0000000000
>>> ---
>>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pat
>>> h
>>> -for-PMUFW_INIT_.patch
>>> +++ /dev/null
>>> @@ -1,68 +0,0 @@
>>> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Date: Mon, 4 Jun 2018 12:21:01 +0200
>>> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for
>>> PMUFW_INIT_FILE
>>> -
>>> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus
>>> -forcing it to be a relative path inside the U-Boot source tree.
>>> Since -the PMUFW is a binary file generated outside of U-Boot, the
>>> PMUFW -binary must be copied inside the U-Boot source tree before the
>>> -build.
>>> -
>>> -This generates a few problems:
>>> -
>>> - * if the source tree is shared among different out-of-tree builds,
>>> - they will pollute (and potentially corrupt) each other
>>> - * the source tree cannot be read-only
>>> - * any buildsystem must add a command to copy the PMUFW binary
>>> - * putting an externally-generated binary in the source tree is ugly
>>> - as hell
>>> -
>>> -Avoid these problems by accepting an absolute path for
>>> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/"
>>> -prefix, but in order to keep backward compatibility we rather use
>>> the -shell and readlink to get the absolute path even when starting
>>> from a -relative path.
>>> -
>>> -Since 'readlink -f' produces an empty string if the file does not
>>> -exist, we also add a check to ensure the file configured in
>>> -PMUFW_INIT_FILE exists. Otherwise the build would exit successfully,
>>> -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty.
>>> -
>>> -Tested in the 12 possible combinations of:
>>> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing
>>> - - building in-tree, in subdir, in other directory
>>> -
>>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Cc: Michal Simek <michal.simek@xilinx.com>
>>> -Cc: Simon Glass <sjg@chromium.org>
>>> -Cc: Emmanuel Vadot <manu@bidouilliste.com>
>>> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
>>> from upstream:
>>> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee8187
>>> 4
>>> 7759e8060b59626
>>> ----
>>> - scripts/Makefile.spl | 8 +++++++-
>>> - 1 file changed, 7 insertions(+), 1 deletion(-)
>>> -
>>> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index
>>> ef018b5b4056..252f13826d4c 100644
>>> ---- a/scripts/Makefile.spl
>>> -+++ b/scripts/Makefile.spl
>>> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ
>>> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R
>>> $(srctree)/$(CONFIG_BOOT_INIT_FILE)
>>> - endif
>>> - ifdef CONFIG_ARCH_ZYNQMP
>>> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
>>> -+spl/boot.bin: zynqmp-check-pmufw
>>> -+zynqmp-check-pmufw: FORCE
>>> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
>>> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" &&
>>> -+false ) endif
>>> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
>>> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE)
>>> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
>>> - endif
>>> -
>>> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
>>> ---
>>> -2.7.4
>>> -
>>> diff --git
>>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i
>>> n
>>> it-file-as-a-kco.patch
>>> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i
>>> n
>>> it-file-as-a-kco.patch
>>> deleted file mode 100644
>>> index b32e162780..0000000000
>>> ---
>>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-i
>>> n
>>> it-file-as-a-kco.patch
>>> +++ /dev/null
>>> @@ -1,175 +0,0 @@
>>> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Date: Wed, 20 Jun 2018 12:11:50 +0200
>>> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a
>>> kconfig
>>> - variable
>>> -
>>> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on
>>> -ZynqMP (PS init for short). The current logic to locate this file
>>> for -both platforms is:
>>> -
>>> - 1. if a board-specific file exists in
>>> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c
>>> - then use it
>>> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c
>>> -
>>> -In the latter case the file does not exist in the U-Boot sources and
>>> -must be copied in the source tree from the outside before starting
>>> the -build. This is typical when it is generated from Xilinx tools
>>> while -developing a custom hardware. However making sure that a
>>> -board-specific file is _not_ found (and used) requires some trickery
>>> -such as removing or overwriting all PS init files (e.g.: the current
>>> -meta-xilinx yocto layer [0]).
>>> -
>>> -This generates a few problems:
>>> -
>>> - * if the source tree is shared among different out-of-tree builds,
>>> - they will pollute (and potentially corrupt) each other
>>> - * the source tree cannot be read-only
>>> - * any buildsystem must add a command to copy the PS init file
>>> binary
>>> - * overwriting or deleting files in the source tree is ugly as hell
>>> -
>>> -Simplify usage by allowing to pass the path to the desired PS init
>>> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute
>>> -path or relative to $(srctree). If the variable is set, the
>>> -user-specified file will always be used without being copied -around.
>>> If the the variable is left empty, for backward compatibility -fall
>>> back to the old behaviour.
>>> -
>>> -Since the issue is the same for Zynq and ZynqMP, add one kconfig
>>> -variable in a common place and use it for both.
>>> -
>>> -Also use the new kconfig help text to document all the ways to give
>>> -U-Boot the PS init file.
>>> -
>>> -Build-tested with all combinations of:
>>> - - platform: zynq or zynqmp
>>> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path,
>>> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/
>>> - - building in-tree, in subdir, in other directory
>>> -
>>> -[0]
>>> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440a
>>> 1
>>> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.
>>> inc#L9
>>> -
>>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>>> -Cc: Michal Simek <michal.simek@xilinx.com>
>>> -Cc: Nathan Rossi <nathan@nathanrossi.com> -Backported from upstream:
>>> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2b
>>> 0
>>> 4e557b7ef65b56c
>>> ----
>>> - arch/arm/Kconfig | 1 +
>>> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++
>>> - board/xilinx/zynq/Makefile | 10 +++++++++-
>>> - board/xilinx/zynqmp/Makefile | 10 +++++++++-
>>> - 4 files changed, 60 insertions(+), 2 deletions(-)
>>> - create mode 100644 board/xilinx/Kconfig
>>> -
>>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index
>>> 22234cde2ab6..e04979d0ef7e 100644
>>> ---- a/arch/arm/Kconfig
>>> -+++ b/arch/arm/Kconfig
>>> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig"
>>> - source "board/vscom/baltos/Kconfig"
>>> - source "board/woodburn/Kconfig"
>>> - source "board/work-microwave/work_92105/Kconfig"
>>> -+source "board/xilinx/Kconfig"
>>> - source "board/zipitz2/Kconfig"
>>> -
>>> - source "arch/arm/Kconfig.debug"
>>> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file
>>> mode 100644 -index 000000000000..aa3fa061edef
>>> ---- /dev/null
>>> -+++ b/board/xilinx/Kconfig
>>> -@@ -0,0 +1,41 @@
>>> -+# Copyright (c) 2018, Luca Ceresoli <luca@lucaceresoli.net> # #
>>> -+SPDX-License-Identifier: GPL-2.0
>>> -+
>>> -+if ARCH_ZYNQ || ARCH_ZYNQMP
>>> -+
>>> -+config XILINX_PS_INIT_FILE
>>> -+ string "Zynq/ZynqMP PS init file(s) location"
>>> -+ help
>>> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if
>>> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some
>>> -+ basic initializations, such as enabling peripherals and
>>> -+ configuring pinmuxes. The PS init file (called
>>> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000)
>>> -+ contains the code for such initializations.
>>> -+
>>> -+ U-Boot contains PS init files for some boards, but each of
>>> -+ them describes only one specific configuration. Users of a
>>> -+ different board, or needing a different configuration, can
>>> -+ generate custom files using the Xilinx development tools.
>>> -+
>>> -+ There are three ways to give a PS init file to U-Boot:
>>> -+
>>> -+ 1. Set this variable to the path, either relative to the
>>> -+ source tree or absolute, where the psu_init_gpl.c or
>>> -+ ps7_init_gpl.c file is located. U-Boot will build this
>>> -+ file.
>>> -+
>>> -+ 2. If you leave an empty string here, U-Boot will use
>>> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c
>>> -+ for Zynq-7000, or
>>> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c
>>> -+ for ZynqMP.
>>> -+
>>> -+ 3. If the above file does not exist, U-Boot will use
>>> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or
>>> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file
>>> -+ is not provided by U-Boot, you have to copy it there
>>> -+ before the build.
>>> -+
>>> -+endif
>>> -diff --git a/board/xilinx/zynq/Makefile b/board/xilinx/zynq/Makefile
>>> -index 5a76a26720cd..03ad5f0532ee 100644
>>> ---- a/board/xilinx/zynq/Makefile
>>> -+++ b/board/xilinx/zynq/Makefile
>>> -@@ -5,10 +5,18 @@
>>> -
>>> - obj-y := board.o
>>> -
>>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
>>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
>>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
>>> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE)
>>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
>>> -
>>> -+ifeq ($(init-objs),)
>>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
>>> - $(hw-platform-y)/ps7_init_gpl.o)
>>> -+endif
>>> -
>>> - ifeq ($(init-objs),)
>>> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),)
>>> -diff --git a/board/xilinx/zynqmp/Makefile
>>> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853
>>> 100644
>>> ---- a/board/xilinx/zynqmp/Makefile
>>> -+++ b/board/xilinx/zynqmp/Makefile
>>> -@@ -5,10 +5,18 @@
>>> -
>>> - obj-y := zynqmp.o
>>> -
>>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
>>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
>>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
>>> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE)
>>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
>>> -
>>> -+ifeq ($(init-objs),)
>>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\
>>> - $(hw-platform-y)/psu_init_gpl.o)
>>> -+endif
>>> -
>>> - ifeq ($(init-objs),)
>>> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),)
>>> ---
>>> -2.7.4
>>> -
>>> diff --git a/configs/zynqmp_zcu102_defconfig
>>> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index
>>> 0000000000..336f5c2dbe
>>> --- /dev/null
>>> +++ b/configs/zynqmp_zcu102_defconfig
>>> @@ -0,0 +1,35 @@
>>> +BR2_aarch64=y
>>> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>>> +BR2_LINUX_KERNEL=y
>>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y
>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>>> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0"
>>> +BR2_TARGET_ROOTFS_EXT2=y
>>> +BR2_TARGET_ROOTFS_EXT2_4=y
>>> +# BR2_TARGET_ROOTFS_TAR is not set
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
>>> +BR2_TARGET_UBOOT=y
>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y
>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y
>>> +BR2_TARGET_UBOOT_SPL=y
>>> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
>>> +BR2_TARGET_UBOOT_ZYNQMP=y
>>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
>>> +BR2_TARGET_UBOOT_FORMAT_ITB=y
>>> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
>>> +BR2_PACKAGE_HOST_GENIMAGE=y
>>> +BR2_PACKAGE_HOST_MTOOLS=y
>>
>> As pointed above this ^^^ file must be in a separate patch and it
>> deserves also a maintainer. So please you or maybe Luca could add an
>> entry to DEVELOPERS for this board
>>
>>> diff --git a/configs/zynqmp_zcu106_defconfig
>>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8 100644
>>> --- a/configs/zynqmp_zcu106_defconfig
>>> +++ b/configs/zynqmp_zcu106_defconfig
>>> @@ -1,11 +1,11 @@
>>> BR2_aarch64=y
>>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>>
>> Since all patches are gone, this ^^^ is not needed anymore
>>
>>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>>> BR2_LINUX_KERNEL=y
>>> BR2_LINUX_KERNEL_CUSTOM_GIT=y
>>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>>> BR2_LINUX_KERNEL_DTS_SUPPORT=y
>>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
>>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y
>>> # BR2_TARGET_ROOTFS_TAR is not set
>>> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
>>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>>
>> It's worth mention in commit log that you're switching from ARM to
>> Xilinx ATF
>>
>>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
>>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
>>> BR2_TARGET_UBOOT=y
>>> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>>> BR2_TARGET_UBOOT_CUSTOM_GIT=y
>>> BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
>>> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
>>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
>>> BR2_TARGET_UBOOT_NEEDS_DTC=y
>>> BR2_TARGET_UBOOT_SPL=y
>>> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
>>> BR2_TARGET_UBOOT_ZYNQMP=y
>>> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
>>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
>>> +BR2_TARGET_UBOOT_FORMAT_ITB=y
>>
>> Here ^^^ I see that probably you're switching from .bin to .itb so
>> better mention it in commit log
>>
>>> BR2_PACKAGE_HOST_DOSFSTOOLS=y
>>> BR2_PACKAGE_HOST_GENIMAGE=y
>>> BR2_PACKAGE_HOST_MTOOLS=y
>>
>> Thank you!
>>
>> Best regards
>> --
>> Giulio Benetti
>> Benetti Engineering sas
>
> --
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-03 14:05 ` Giulio Benetti
@ 2022-02-03 14:09 ` Neal Frager
2022-02-03 14:25 ` Giulio Benetti
0 siblings, 1 reply; 13+ messages in thread
From: Neal Frager @ 2022-02-03 14:09 UTC (permalink / raw)
To: Giulio Benetti; +Cc: luca, buildroot
Hi Giulio,
> Hi Neal,
> Il giorno 3 feb 2022, alle ore 14:57, Neal Frager <nealf@xilinx.com> ha scritto:
>
> Hi Giulio,
>
>> Hi Neal,
>
>> On 03/02/22 07:24, Neal Frager wrote:
>> Hi Giulio,
>>
>> Thank you very much for your feedback.
>
>> You're welcome.
>
>> Please don't top-post, answer inline as you see all around the Mailing List.
>
>> Also, I don't know if you've read my entire answer. Usually until you don't see "Best regards" and the name of the one who answer, the answer-mail is not finished yet, so simply scroll down until you finish the e-mail.
>
>> So please check also the rest of my previous e-mail.
>
> I hope this method of inline answer works.
> Yes it does work. Only remember to set your client using plain-text only. I’m on mobile now so probably my answer and yours will be in html.
> But we need plain-text, please check your email client and set plain-text by default.
As far as I can tell, my replies are already in plain-text by default. Let me know if you catch a message where that is not the case.
> I have submitted a new set of patches based on the feedback from you and Luca. Could you please have a look and let me know what you think?
> Sure, I’m going to tonight :-)
> Also Luca I think will since he’s the maintainer of zynq stuff.
> Also we’ve sent you the review almost at the same time yesterday :-)
> Best regards
> — -
> Giulio Benetti
> Benetti Engineering sas
I look forward to your feedback.
Best regards,
Neal Frager
>
>> I would be happy to split the zynqmp_zcu102_defconfig off into a second patch. No problem.
>
>> Fine
>
>> As for adding comments to the log, could you share the proper git commands for doing this? I would be happy to do it, but I am a bit new to git and I did not know the proper command to use for adding log comments.
>
>> Luca already pointed you a lot of very useful links.
>
>> Another tool I like to create patches for me is "git gui" and also "gitk" to scroll the commits in a non-console way.
>
>> Most of all "git gui" is helpful to me to choose a single line to stage or revert.
>
>> Best regards
> ---
>> Giulio Benetti
>> Benetti Engineering sas
>
>> Best regards,
>>
>> Neal Frager
>> Xilinx
>>
>
> Best regards,
> Neal Frager
> Xilinx
>
>> -----Original Message-----
>> From: Giulio Benetti <giulio.benetti@benettiengineering.com>
>> Sent: Wednesday 2 February 2022 23:33
>> To: Neal Frager <nealf@xilinx.com>; buildroot@buildroot.org
>> Cc: luca@lucaceresoli.net; Neal Frager <nealf@xilinx.com>
>> Subject: Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump
>> ATF/U-Boot/Linux to Xilinx 2021.2
>>
>> CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email.
>>
>>
>> Hi Neal,
>>
>> nice to see you've made it with git send-email :-),
>>
>> Here I would improve commit log by stating that you're dropping all
>> local patches because they are now upstreamed
>>
>>> On 02/02/22 17:55, Neal Frager wrote:
>>> Signed-off-by: Neal Frager <nealf@xilinx.com>
>>> ---
>>> board/zynqmp/genimage.cfg | 1 +
>>> ...-fix-Remove-GGC-ignore-Warray-bounds.patch | 68 -------
>>> ...64-zynqmp-zcu106-fix-SPL-MMC-booting.patch | 52 ------
>>> ...2-arm64-zynqmp-Enable-booting-to-ATF.patch | 114 ------------
>>> ...ept-an-absolute-path-for-PMUFW_INIT_.patch | 68 -------
>>> ...ynqmp-pass-the-PS-init-file-as-a-kco.patch | 175 ------------------
>>> configs/zynqmp_zcu102_defconfig | 35 ++++
>>
>> This ^^^ file is added, so it deserves a second patch after this one,
>> basically this becomes a patchset of 2 patches
>>
>>> configs/zynqmp_zcu106_defconfig | 15 +-
>>> 8 files changed, 44 insertions(+), 484 deletions(-)
>>> delete mode 100644 board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove-GGC-ignore-Warray-bounds.patch
>>> delete mode 100644 board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-booting.patch
>>> delete mode 100644 board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.patch
>>> delete mode 100644 board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-path-for-PMUFW_INIT_.patch
>>> delete mode 100644 board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-init-file-as-a-kco.patch
>>> create mode 100644 configs/zynqmp_zcu102_defconfig
>>>
>>> diff --git a/board/zynqmp/genimage.cfg b/board/zynqmp/genimage.cfg
>>> index ed202f4550..557364e124 100644
>>> --- a/board/zynqmp/genimage.cfg
>>> +++ b/board/zynqmp/genimage.cfg
>>> @@ -3,6 +3,7 @@ image boot.vfat {
>>> files = {
>>> "boot.bin",
>>> "u-boot.bin",
>>> + "u-boot.itb",
>>
>> Can you please justify this adding ^^^ in commit log?
>>
>>> "atf-uboot.ub",
>>> "system.dtb",
>>> "Image"
>>> diff --git
>>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove
>>> -
>>> G
>>> GC-ignore-Warray-bounds.patch
>>> b/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove
>>> -
>>> G
>>> GC-ignore-Warray-bounds.patch
>>> deleted file mode 100644
>>> index 0c1a9ba2a4..0000000000
>>> ---
>>> a/board/zynqmp/patches/arm-trusted-firmware/0001-Coverity-fix-Remove
>>> -
>>> G
>>> GC-ignore-Warray-bounds.patch
>>> +++ /dev/null
>>> @@ -1,68 +0,0 @@
>>> -From da003e6ada7d0217fe99dc7c649a731f8ebd3c34 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Deepika Bhavnani <deepika.bhavnani@arm.com>
>>> -Date: Thu, 15 Aug 2019 00:56:46 +0300
>>> -Subject: [PATCH] Coverity fix: Remove GGC ignore -Warray-bounds
>>> -
>>> -GCC diagnostics were added to ignore array boundaries, instead -of
>>> ignoring GCC warning current code will check for array boundaries
>>> -and perform and array update only for valid elements.
>>> -
>>> -Resolves: `CID 246574` `CID 246710` `CID 246651`
>>> -
>>> -Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com>
>>> -Change-Id: I7530ecf7a1707351c6ee87e90cc3d33574088f57
>>> -
>>> -Backported from: 41af05154abe136938bcfb5f26c969933784bbef
>>> -[Adapted to apply on 1.5]
>>> -
>>> ----
>>> - lib/psci/psci_common.c | 20 ++++++++++----------
>>> - 1 file changed, 10 insertions(+), 10 deletions(-)
>>> -
>>> -diff --git a/lib/psci/psci_common.c b/lib/psci/psci_common.c -index
>>> 2220a745cd6e..6282d992a2f0 100644
>>> ---- a/lib/psci/psci_common.c
>>> -+++ b/lib/psci/psci_common.c
>>> -@@ -188,21 +188,17 @@ static unsigned int
>>> get_power_on_target_pwrlvl(void)
>>> -
>>> /*******************************************************************
>>> *
>>> *
>>> *********
>>> - * Helper function to update the requested local power state array.
>>> This array
>>> - * does not store the requested state for the CPU power level.
>>> Hence an
>>> -- * assertion is added to prevent us from accessing the wrong index.
>>> -+ * assertion is added to prevent us from accessing the CPU power level.
>>> -
>>> ********************************************************************
>>> *
>>> *
>>> *******/
>>> - static void psci_set_req_local_pwr_state(unsigned int pwrlvl,
>>> - unsigned int cpu_idx,
>>> - plat_local_state_t req_pwr_state)
>>> - {
>>> -- /*
>>> -- * This should never happen, we have this here to avoid
>>> -- * "array subscript is above array bounds" errors in GCC.
>>> -- */
>>> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
>>> --#pragma GCC diagnostic push
>>> --#pragma GCC diagnostic ignored "-Warray-bounds"
>>> -- psci_req_local_pwr_states[pwrlvl - 1][cpu_idx] = req_pwr_state;
>>> --#pragma GCC diagnostic pop
>>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
>>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
>>> -+ psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx] = req_pwr_state;
>>> -+ }
>>> - }
>>> -
>>> -
>>> /*******************************************************************
>>> *
>>> *
>>> ********* -@@ -228,7 +224,11 @@ static plat_local_state_t
>>> *psci_get_req_local_pwr_states(unsigned int pwrlvl,
>>> - {
>>> - assert(pwrlvl > PSCI_CPU_PWR_LVL);
>>> -
>>> -- return &psci_req_local_pwr_states[pwrlvl - 1][cpu_idx];
>>> -+ if ((pwrlvl > PSCI_CPU_PWR_LVL) && (pwrlvl <= PLAT_MAX_PWR_LVL) &&
>>> -+ (cpu_idx < PLATFORM_CORE_COUNT)) {
>>> -+ return &psci_req_local_pwr_states[pwrlvl - 1U][cpu_idx];
>>> -+ } else
>>> -+ return NULL;
>>> - }
>>> -
>>> - /*
>>> ---
>>> -2.34.0
>>> -
>>> diff --git
>>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo
>>> o
>>> t
>>> ing.patch
>>> b/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo
>>> o
>>> t
>>> ing.patch
>>> deleted file mode 100644
>>> index 4d85e1bb12..0000000000
>>> ---
>>> a/board/zynqmp/patches/uboot/0001-arm64-zynqmp-zcu106-fix-SPL-MMC-bo
>>> o
>>> t
>>> ing.patch
>>> +++ /dev/null
>>> @@ -1,52 +0,0 @@
>>> -From e5d72ed8339eb05285448aad3c89d21e4d18fd29 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Date: Mon, 26 Feb 2018 09:40:34 +0100
>>> -Subject: [PATCH] arm64: zynqmp: zcu106: fix SPL MMC booting
>>> -
>>> -The U-Boot SPL generated with the current zcu106 defconfig cannot
>>> boot -from MMC:
>>> -
>>> - [...]
>>> - U-Boot SPL 2018.01 (Feb 21 2018 - 17:47:14)
>>> - EL Level: EL3
>>> - Trying to boot from MMC1
>>> - sdhci_transfer_data: Error detected in status(0x408020)!
>>> - spl_load_image_fat_os: error reading image u-boot.bin, err - -2
>>> - spl_load_image_fat: error reading image u-boot.img, err - -6
>>> - SPL: failed to boot from all boot devices
>>> - ### ERROR ### Please RESET the board ###
>>> -
>>> -Fix by lowering the rpll value. The new value for the RPLL_CTRL
>>> -register comes from the current psu_init_gpl.c from the HDF file at
>>> -https://github.com/xilinx/hdf-examples/tree/01ad8ea5fd1989abf4ea5a0
>>> 7
>>> 2
>>> d019a16cb2bc546/zcu106-zynqmp
>>> -(generated by Vivado v2017.4).
>>> -
>>> -RPLL and sdio1_ref clocks before and after this change:
>>> -
>>> - - Old values: RPLL 1.36 GHz, sdio1_ref 272 MHz
>>> - - New values: RPLL 1.16 GHz, sdio1_ref 233 MHz
>>> -
>>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Cc: Michal Simek <michal.simek@xilinx.com>
>>> -Upstream-status: accepted upstream in a different form
>>> ----
>>> -
>>> - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 2 +-
>>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>>> -
>>> -diff --git a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>>> b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>>> -index 4d18abe000ca..e6fa477e53e7 100644
>>> ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>>> -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c
>>> -@@ -10,7 +10,7 @@
>>> - static unsigned long psu_pll_init_data(void)
>>> - {
>>> - psu_mask_write(0xFF5E0034, 0xFE7FEDEFU, 0x7E4E2C62U);
>>> -- psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00013C00U);
>>> -+ psu_mask_write(0xFF5E0030, 0x00717F00U, 0x00014600U);
>>> - psu_mask_write(0xFF5E0030, 0x00000008U, 0x00000008U);
>>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000001U);
>>> - psu_mask_write(0xFF5E0030, 0x00000001U, 0x00000000U);
>>> ---
>>> -2.7.4
>>> -
>>> diff --git
>>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>>> p
>>> atch
>>> b/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>>> p
>>> atch
>>> deleted file mode 100644
>>> index 487fff6812..0000000000
>>> ---
>>> a/board/zynqmp/patches/uboot/0002-arm64-zynqmp-Enable-booting-to-ATF.
>>> p
>>> atch
>>> +++ /dev/null
>>> @@ -1,114 +0,0 @@
>>> -From 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Date: Mon, 12 Mar 2018 17:18:38 +0100
>>> -Subject: [PATCH] arm64: zynqmp: Enable booting to ATF
>>> -
>>> -U-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot
>>> -flow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3)
>>> which -pass control to full u-boot(EL2). This has been tested on
>>> zcu106, so -enable it in this defconfig.
>>> -
>>> -To generate an image that triggers this booting flow, you need to
>>> pass -'-O arm-trusted-firmware' to mkimage.
>>> -
>>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
>>> from upstream:
>>> http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241
>>> 0
>>> 3
>>> 5a8d4162560c71
>>> ----
>>> -
>>> - configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 +
>>> - configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 +
>>> - 7 files changed, 7 insertions(+)
>>> -
>>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>>> b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>>> -index c5bfa2b12638..488c72258b0e 100644
>>> ---- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
>>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>>> b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>>> -index f86dce403a42..5d501eec0edd 100644
>>> ---- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
>>> -@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>>> b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>>> -index 6e947cf56827..6f7eaebd7676 100644
>>> ---- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
>>> -@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_CMD_MEMTEST=y
>>> - CONFIG_SYS_ALT_MEMTEST=y
>>> -diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>>> b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>>> -index 1c934858c61c..7a3806cba4b5 100644
>>> ---- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
>>> -@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_CMD_MEMTEST=y
>>> - CONFIG_SYS_ALT_MEMTEST=y
>>> -diff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>>> b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>>> -index e13c7c56f310..e4408f182ca0 100644
>>> ---- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
>>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> -diff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig
>>> b/configs/xilinx_zynqmp_zcu102_revA_defconfig
>>> -index 5b2cd495ee85..b52f6789fd4b 100644
>>> ---- a/configs/xilinx_zynqmp_zcu102_revA_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig
>>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> -diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig
>>> b/configs/xilinx_zynqmp_zcu102_revB_defconfig
>>> -index e6530fbfe7ff..80592554f682 100644
>>> ---- a/configs/xilinx_zynqmp_zcu102_revB_defconfig
>>> -+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig
>>> -@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
>>> - CONFIG_SPL_OS_BOOT=y
>>> - CONFIG_SPL_RAM_SUPPORT=y
>>> - CONFIG_SPL_RAM_DEVICE=y
>>> -+CONFIG_SPL_ATF=y
>>> - CONFIG_SYS_PROMPT="ZynqMP> "
>>> - CONFIG_FASTBOOT=y
>>> - CONFIG_FASTBOOT_FLASH=y
>>> ---
>>> -2.7.4
>>> -
>>> diff --git
>>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa
>>> t
>>> h
>>> -for-PMUFW_INIT_.patch
>>> b/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa
>>> t
>>> h
>>> -for-PMUFW_INIT_.patch
>>> deleted file mode 100644
>>> index 95ab7b3b75..0000000000
>>> ---
>>> a/board/zynqmp/patches/uboot/0003-arm64-zynqmp-accept-an-absolute-pa
>>> t
>>> h
>>> -for-PMUFW_INIT_.patch
>>> +++ /dev/null
>>> @@ -1,68 +0,0 @@
>>> -From c7df098a71e05dc81cee818747759e8060b59626 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Date: Mon, 4 Jun 2018 12:21:01 +0200
>>> -Subject: [PATCH] arm64: zynqmp: accept an absolute path for
>>> PMUFW_INIT_FILE
>>> -
>>> -The value of PMUFW_INIT_FILE is prefixed with "$(srctree)/", thus
>>> -forcing it to be a relative path inside the U-Boot source tree.
>>> Since -the PMUFW is a binary file generated outside of U-Boot, the
>>> PMUFW -binary must be copied inside the U-Boot source tree before
>>> the -build.
>>> -
>>> -This generates a few problems:
>>> -
>>> - * if the source tree is shared among different out-of-tree builds,
>>> - they will pollute (and potentially corrupt) each other
>>> - * the source tree cannot be read-only
>>> - * any buildsystem must add a command to copy the PMUFW binary
>>> - * putting an externally-generated binary in the source tree is ugly
>>> - as hell
>>> -
>>> -Avoid these problems by accepting an absolute path for
>>> -PMUFW_INIT_FILE. This would be as simple as removing the "$(srctree)/"
>>> -prefix, but in order to keep backward compatibility we rather use
>>> the -shell and readlink to get the absolute path even when starting
>>> from a -relative path.
>>> -
>>> -Since 'readlink -f' produces an empty string if the file does not
>>> -exist, we also add a check to ensure the file configured in
>>> -PMUFW_INIT_FILE exists. Otherwise the build would exit
>>> successfully, -but produce a boot.bin without PMUFW as if PMUFW_INIT_FILE were empty.
>>> -
>>> -Tested in the 12 possible combinations of:
>>> - - PMUFW_INIT_FILE empty, relative, absolute, non-existing
>>> - - building in-tree, in subdir, in other directory
>>> -
>>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Cc: Michal Simek <michal.simek@xilinx.com>
>>> -Cc: Simon Glass <sjg@chromium.org>
>>> -Cc: Emmanuel Vadot <manu@bidouilliste.com>
>>> -Signed-off-by: Michal Simek <michal.simek@xilinx.com> -Backported
>>> from upstream:
>>> https://git.denx.de/?p=u-boot.git;a=commit;h=c7df098a71e05dc81cee818
>>> 7
>>> 4
>>> 7759e8060b59626
>>> ----
>>> - scripts/Makefile.spl | 8 +++++++-
>>> - 1 file changed, 7 insertions(+), 1 deletion(-)
>>> -
>>> -diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl -index
>>> ef018b5b4056..252f13826d4c 100644
>>> ---- a/scripts/Makefile.spl
>>> -+++ b/scripts/Makefile.spl
>>> -@@ -167,8 +167,14 @@ ifdef CONFIG_ARCH_ZYNQ
>>> - MKIMAGEFLAGS_boot.bin = -T zynqimage -R
>>> $(srctree)/$(CONFIG_BOOT_INIT_FILE)
>>> - endif
>>> - ifdef CONFIG_ARCH_ZYNQMP
>>> -+ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
>>> -+spl/boot.bin: zynqmp-check-pmufw
>>> -+zynqmp-check-pmufw: FORCE
>>> -+ ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
>>> -+ || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" &&
>>> -+false ) endif
>>> - MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
>>> -- -n $(srctree)/$(CONFIG_PMUFW_INIT_FILE)
>>> -+ -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
>>> - endif
>>> -
>>> - spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
>>> ---
>>> -2.7.4
>>> -
>>> diff --git
>>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-
>>> i
>>> n
>>> it-file-as-a-kco.patch
>>> b/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-
>>> i
>>> n
>>> it-file-as-a-kco.patch
>>> deleted file mode 100644
>>> index b32e162780..0000000000
>>> ---
>>> a/board/zynqmp/patches/uboot/0004-arm-arm64-zynq-zynqmp-pass-the-PS-
>>> i
>>> n
>>> it-file-as-a-kco.patch
>>> +++ /dev/null
>>> @@ -1,175 +0,0 @@
>>> -From 4c9d54ab5a41d65000c8d249b6fb1b76056f1812 Mon Sep 17 00:00:00
>>> 2001
>>> -From: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Date: Wed, 20 Jun 2018 12:11:50 +0200
>>> -Subject: [PATCH] arm/arm64: zynq/zynqmp: pass the PS init file as a
>>> kconfig
>>> - variable
>>> -
>>> -U-Boot needs to link ps7_init_gpl.c on Zynq or psu_init_gpl.c on
>>> -ZynqMP (PS init for short). The current logic to locate this file
>>> for -both platforms is:
>>> -
>>> - 1. if a board-specific file exists in
>>> - board/xilinx/zynq[mp]/$(CONFIG_DEFAULT_DEVICE_TREE)/ps?_init_gpl.c
>>> - then use it
>>> - 2. otherwise use board/xilinx/zynq/ps?_init_gpl.c
>>> -
>>> -In the latter case the file does not exist in the U-Boot sources
>>> and -must be copied in the source tree from the outside before
>>> starting the -build. This is typical when it is generated from
>>> Xilinx tools while -developing a custom hardware. However making
>>> sure that a -board-specific file is _not_ found (and used) requires
>>> some trickery -such as removing or overwriting all PS init files
>>> (e.g.: the current -meta-xilinx yocto layer [0]).
>>> -
>>> -This generates a few problems:
>>> -
>>> - * if the source tree is shared among different out-of-tree builds,
>>> - they will pollute (and potentially corrupt) each other
>>> - * the source tree cannot be read-only
>>> - * any buildsystem must add a command to copy the PS init file
>>> binary
>>> - * overwriting or deleting files in the source tree is ugly as hell
>>> -
>>> -Simplify usage by allowing to pass the path to the desired PS init
>>> -file in kconfig variable XILINX_PS_INIT_FILE. It can be an absolute
>>> -path or relative to $(srctree). If the variable is set, the
>>> -user-specified file will always be used without being copied -around.
>>> If the the variable is left empty, for backward compatibility -fall
>>> back to the old behaviour.
>>> -
>>> -Since the issue is the same for Zynq and ZynqMP, add one kconfig
>>> -variable in a common place and use it for both.
>>> -
>>> -Also use the new kconfig help text to document all the ways to give
>>> -U-Boot the PS init file.
>>> -
>>> -Build-tested with all combinations of:
>>> - - platform: zynq or zynqmp
>>> - - PS init file: from XILINX_PS_INIT_FILE (absolute, relative path,
>>> - non-existing), in-tree board-specific, in board/xilinx/zynq[mp]/
>>> - - building in-tree, in subdir, in other directory
>>> -
>>> -[0]
>>> https://github.com/Xilinx/meta-xilinx/blob/b2f74cc7fe5c4881589d5e440
>>> a
>>> 1
>>> 7cb51fc66a7ab/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.
>>> inc#L9
>>> -
>>> -Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>>> -Cc: Albert Aribaud <albert.u.boot@aribaud.net>
>>> -Cc: Michal Simek <michal.simek@xilinx.com>
>>> -Cc: Nathan Rossi <nathan@nathanrossi.com> -Backported from upstream:
>>> https://git.denx.de/?p=u-boot.git;a=commit;h=6da4f67ad09cd8b311d77b2
>>> b
>>> 0
>>> 4e557b7ef65b56c
>>> ----
>>> - arch/arm/Kconfig | 1 +
>>> - board/xilinx/Kconfig | 41 +++++++++++++++++++++++++++++++++++++++++
>>> - board/xilinx/zynq/Makefile | 10 +++++++++-
>>> - board/xilinx/zynqmp/Makefile | 10 +++++++++-
>>> - 4 files changed, 60 insertions(+), 2 deletions(-)
>>> - create mode 100644 board/xilinx/Kconfig
>>> -
>>> -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index
>>> 22234cde2ab6..e04979d0ef7e 100644
>>> ---- a/arch/arm/Kconfig
>>> -+++ b/arch/arm/Kconfig
>>> -@@ -1293,4 +1293,5 @@ source "board/technologic/ts4600/Kconfig"
>>> - source "board/vscom/baltos/Kconfig"
>>> - source "board/woodburn/Kconfig"
>>> - source "board/work-microwave/work_92105/Kconfig"
>>> -+source "board/xilinx/Kconfig"
>>> - source "board/zipitz2/Kconfig"
>>> -
>>> - source "arch/arm/Kconfig.debug"
>>> -diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig -new file
>>> mode 100644 -index 000000000000..aa3fa061edef
>>> ---- /dev/null
>>> -+++ b/board/xilinx/Kconfig
>>> -@@ -0,0 +1,41 @@
>>> -+# Copyright (c) 2018, Luca Ceresoli <luca@lucaceresoli.net> # #
>>> -+SPDX-License-Identifier: GPL-2.0
>>> -+
>>> -+if ARCH_ZYNQ || ARCH_ZYNQMP
>>> -+
>>> -+config XILINX_PS_INIT_FILE
>>> -+ string "Zynq/ZynqMP PS init file(s) location"
>>> -+ help
>>> -+ On Zynq and ZynqMP U-Boot SPL (or U-Boot proper if
>>> -+ ZYNQMP_PSU_INIT_ENABLED is set) is responsible for some
>>> -+ basic initializations, such as enabling peripherals and
>>> -+ configuring pinmuxes. The PS init file (called
>>> -+ psu_init_gpl.c on ZynqMP, ps7_init_gpl.c for Zynq-7000)
>>> -+ contains the code for such initializations.
>>> -+
>>> -+ U-Boot contains PS init files for some boards, but each of
>>> -+ them describes only one specific configuration. Users of a
>>> -+ different board, or needing a different configuration, can
>>> -+ generate custom files using the Xilinx development tools.
>>> -+
>>> -+ There are three ways to give a PS init file to U-Boot:
>>> -+
>>> -+ 1. Set this variable to the path, either relative to the
>>> -+ source tree or absolute, where the psu_init_gpl.c or
>>> -+ ps7_init_gpl.c file is located. U-Boot will build this
>>> -+ file.
>>> -+
>>> -+ 2. If you leave an empty string here, U-Boot will use
>>> -+ board/xilinx/zynq/$(CONFIG_DEFAULT_DEVICE_TREE)/ps7_init_gpl.c
>>> -+ for Zynq-7000, or
>>> -+ board/xilinx/zynqmp/$(CONFIG_DEFAULT_DEVICE_TREE)/psu_init_gpl.c
>>> -+ for ZynqMP.
>>> -+
>>> -+ 3. If the above file does not exist, U-Boot will use
>>> -+ board/xilinx/zynq/ps7_init_gpl.c for Zynq-7000, or
>>> -+ board/xilinx/zynqmp/psu_init_gpl.c for ZynqMP. This file
>>> -+ is not provided by U-Boot, you have to copy it there
>>> -+ before the build.
>>> -+
>>> -+endif
>>> -diff --git a/board/xilinx/zynq/Makefile
>>> b/board/xilinx/zynq/Makefile -index 5a76a26720cd..03ad5f0532ee
>>> 100644
>>> ---- a/board/xilinx/zynq/Makefile
>>> -+++ b/board/xilinx/zynq/Makefile
>>> -@@ -5,10 +5,18 @@
>>> -
>>> - obj-y := board.o
>>> -
>>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
>>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
>>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
>>> -+spl/board/xilinx/zynq/ps_init_gpl.o board/xilinx/zynq/ps_init_gpl.o: $(PS_INIT_FILE)
>>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
>>> -
>>> -+ifeq ($(init-objs),)
>>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
>>> - $(hw-platform-y)/ps7_init_gpl.o)
>>> -+endif
>>> -
>>> - ifeq ($(init-objs),)
>>> - ifneq ($(wildcard $(srctree)/$(src)/ps7_init_gpl.c),)
>>> -diff --git a/board/xilinx/zynqmp/Makefile
>>> b/board/xilinx/zynqmp/Makefile -index 05ccd25dcef3..960b81fc5853
>>> 100644
>>> ---- a/board/xilinx/zynqmp/Makefile
>>> -+++ b/board/xilinx/zynqmp/Makefile
>>> -@@ -5,10 +5,18 @@
>>> -
>>> - obj-y := zynqmp.o
>>> -
>>> --hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>>> -+ifneq ($(CONFIG_XILINX_PS_INIT_FILE),"")
>>> -+PS_INIT_FILE := $(shell cd $(srctree); readlink -f
>>> -+$(CONFIG_XILINX_PS_INIT_FILE)) init-objs := ps_init_gpl.o
>>> -+spl/board/xilinx/zynqmp/ps_init_gpl.o board/xilinx/zynqmp/ps_init_gpl.o: $(PS_INIT_FILE)
>>> -+ $(CC) $(c_flags) -I $(srctree)/$(src) -c -o $@ $^ endif
>>> -
>>> -+ifeq ($(init-objs),)
>>> -+hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
>>> - init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/psu_init_gpl.c),\
>>> - $(hw-platform-y)/psu_init_gpl.o)
>>> -+endif
>>> -
>>> - ifeq ($(init-objs),)
>>> - ifneq ($(wildcard $(srctree)/$(src)/psu_init_gpl.c),)
>>> ---
>>> -2.7.4
>>> -
>>> diff --git a/configs/zynqmp_zcu102_defconfig
>>> b/configs/zynqmp_zcu102_defconfig new file mode 100644 index
>>> 0000000000..336f5c2dbe
>>> --- /dev/null
>>> +++ b/configs/zynqmp_zcu102_defconfig
>>> @@ -0,0 +1,35 @@
>>> +BR2_aarch64=y
>>> +BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>>> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>>> +BR2_LINUX_KERNEL=y
>>> +BR2_LINUX_KERNEL_CUSTOM_GIT=y
>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>>> +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>>> +BR2_LINUX_KERNEL_DTS_SUPPORT=y
>>> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0"
>>> +BR2_TARGET_ROOTFS_EXT2=y
>>> +BR2_TARGET_ROOTFS_EXT2_4=y
>>> +# BR2_TARGET_ROOTFS_TAR is not set
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
>>> +BR2_TARGET_UBOOT=y
>>> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>>> +BR2_TARGET_UBOOT_CUSTOM_GIT=y
>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
>>> +BR2_TARGET_UBOOT_NEEDS_DTC=y
>>> +BR2_TARGET_UBOOT_SPL=y
>>> +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
>>> +BR2_TARGET_UBOOT_ZYNQMP=y
>>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
>>> +BR2_TARGET_UBOOT_FORMAT_ITB=y
>>> +BR2_PACKAGE_HOST_DOSFSTOOLS=y
>>> +BR2_PACKAGE_HOST_GENIMAGE=y
>>> +BR2_PACKAGE_HOST_MTOOLS=y
>>
>> As pointed above this ^^^ file must be in a separate patch and it
>> deserves also a maintainer. So please you or maybe Luca could add an
>> entry to DEVELOPERS for this board
>>
>>> diff --git a/configs/zynqmp_zcu106_defconfig
>>> b/configs/zynqmp_zcu106_defconfig index bee7c1daf7..3a6947e1e8
>>> 100644
>>> --- a/configs/zynqmp_zcu106_defconfig
>>> +++ b/configs/zynqmp_zcu106_defconfig
>>> @@ -1,11 +1,11 @@
>>> BR2_aarch64=y
>>> BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches/"
>>
>> Since all patches are gone, this ^^^ is not needed anymore
>>
>>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
>>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh"
>>> BR2_LINUX_KERNEL=y
>>> BR2_LINUX_KERNEL_CUSTOM_GIT=y
>>> BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git"
>>> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.4"
>>> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xlnx_rebase_v5.10_2021.2"
>>> BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp"
>>> BR2_LINUX_KERNEL_DTS_SUPPORT=y
>>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA"
>>> @@ -14,21 +14,22 @@ BR2_TARGET_ROOTFS_EXT2_4=y
>>> # BR2_TARGET_ROOTFS_TAR is not set
>>> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
>>> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git"
>>> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="xlnx_rebase_v2.4_2021.2"
>>
>> It's worth mention in commit log that you're switching from ARM to
>> Xilinx ATF
>>
>>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp"
>>> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y
>>> BR2_TARGET_UBOOT=y
>>> BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>>> BR2_TARGET_UBOOT_CUSTOM_GIT=y
>>> BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/xilinx/u-boot-xlnx.git"
>>> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="228801a215909365ae1dcdd799034195ad7264f7"
>>> -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_zcu106_revA"
>>> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xlnx_rebase_v2021.01_2021.2"
>>> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
>>> BR2_TARGET_UBOOT_NEEDS_DTC=y
>>> BR2_TARGET_UBOOT_SPL=y
>>> BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
>>> BR2_TARGET_UBOOT_ZYNQMP=y
>>> -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/53fdb7b6c92860ceb0ec5fd14deee302f4a84269/bin/pmufw-zcu106-default-v2017.4.bin"
>>> +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/master/bin/pmufw-v2021.2.bin"
>>> +BR2_TARGET_UBOOT_FORMAT_ITB=y
>>
>> Here ^^^ I see that probably you're switching from .bin to .itb so
>> better mention it in commit log
>>
>>> BR2_PACKAGE_HOST_DOSFSTOOLS=y
>>> BR2_PACKAGE_HOST_GENIMAGE=y
>>> BR2_PACKAGE_HOST_MTOOLS=y
>>
>> Thank you!
>>
>> Best regards
>> --
>> Giulio Benetti
>> Benetti Engineering sas
>
> --
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2
2022-02-03 14:09 ` Neal Frager
@ 2022-02-03 14:25 ` Giulio Benetti
0 siblings, 0 replies; 13+ messages in thread
From: Giulio Benetti @ 2022-02-03 14:25 UTC (permalink / raw)
To: Neal Frager; +Cc: luca, buildroot
On 03/02/22 15:09, Neal Frager wrote:
[ SNIP ]
>> Yes it does work. Only remember to set your client using plain-text only. I’m on mobile now so probably my answer and yours will be in html.
>> But we need plain-text, please check your email client and set plain-text by default.
>
> As far as I can tell, my replies are already in plain-text by default. Let me know if you catch a message where that is not the case.
>
Ah sorry, I was on mobile, I've checked on PC now and you're sending in
plain-text mode.
Best regards
--
Giulio Benetti
Benetti Engineering sas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-02-03 14:25 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-02 16:55 [Buildroot] [PATCH 1/1] configs/zynqmp_zcu10x: Bump ATF/U-Boot/Linux to Xilinx 2021.2 Neal Frager
2022-02-02 22:28 ` Luca Ceresoli
2022-02-03 6:20 ` Neal Frager
2022-02-03 8:14 ` Luca Ceresoli
2022-02-03 10:07 ` Neal Frager
2022-02-03 11:04 ` Luca Ceresoli
2022-02-02 22:33 ` Giulio Benetti
2022-02-03 6:24 ` Neal Frager
2022-02-03 12:01 ` Giulio Benetti
2022-02-03 13:57 ` Neal Frager
2022-02-03 14:05 ` Giulio Benetti
2022-02-03 14:09 ` Neal Frager
2022-02-03 14:25 ` Giulio Benetti
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.