| Message ID | 20221207122133.14860-1-neal.frager@amd.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/2] board/zynqmp/zcu106/patches: remove patch | expand |
Hello Neal, On Wed, 7 Dec 2022 05:21:32 -0700 Neal Frager via buildroot <buildroot@buildroot.org> wrote: > The 0001-arm64-zynqmp-zynqmp-zcu106-revA-Fix-DP-PLL-configura.patch > is already committed in the Xilinx 2022.2 u-boot release tag. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > ...qmp-zcu102-revA-Fix-DP-PLL-configura.patch | 40 ------------------- > configs/zynqmp_zcu106_defconfig | 1 - > 2 files changed, 41 deletions(-) > delete mode 100644 board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch This should have been part of the commit updating U-Boot. If you didn't notice then, then this commit should have been very different: (1) it should clearly indicate that it fixes a bug and (2) it should point to the commit it is fixing. I've committed with the following commit log: board/zynqmp/zcu106/patches: fix build by dropping U-Boot patch Since commit 3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 ("configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2"), we're using U-Boot version Xilinx 2022.2, which already carries the psu_init_gpl.c, causing the build to fail as our patch doesn't apply. Fix this by dropping the no longer needed patch. Fixes: 3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 ("configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2") Signed-off-by: Neal Frager <neal.frager@amd.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Thanks, Thomas
>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes: > Hello Neal, > On Wed, 7 Dec 2022 05:21:32 -0700 > Neal Frager via buildroot <buildroot@buildroot.org> wrote: >> The 0001-arm64-zynqmp-zynqmp-zcu106-revA-Fix-DP-PLL-configura.patch >> is already committed in the Xilinx 2022.2 u-boot release tag. >> >> Signed-off-by: Neal Frager <neal.frager@amd.com> >> --- >> ...qmp-zcu102-revA-Fix-DP-PLL-configura.patch | 40 ------------------- >> configs/zynqmp_zcu106_defconfig | 1 - >> 2 files changed, 41 deletions(-) >> delete mode 100644 board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch > This should have been part of the commit updating U-Boot. If you didn't > notice then, then this commit should have been very different: (1) it > should clearly indicate that it fixes a bug and (2) it should point to > the commit it is fixing. I've committed with the following commit log: > board/zynqmp/zcu106/patches: fix build by dropping U-Boot patch > Since commit > 3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 ("configs/zynqmp_zcu106_defconfig: > bump to Xilinx 2022.2"), we're using U-Boot version Xilinx 2022.2, > which already carries the psu_init_gpl.c, causing the build to fail as > our patch doesn't apply. > Fix this by dropping the no longer needed patch. > Fixes: 3c997c457a4ee33d81e6b93e4f6f147bb9e861e9 ("configs/zynqmp_zcu106_defconfig: bump to Xilinx 2022.2") > Signed-off-by: Neal Frager <neal.frager@amd.com> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Committed to 2022.11.x, thanks.
diff --git a/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch b/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch deleted file mode 100644 index 4281880da0..0000000000 --- a/board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aaaa10b613165b7790fe1c084de007240b5bd77a Mon Sep 17 00:00:00 2001 -From: Neal Frager <neal.frager@amd.com> -Date: Thu, 5 May 2022 13:34:43 +0100 -Subject: [PATCH 1/1] arm64: zynqmp: zynqmp-zcu102-revA: Fix DP PLL - configuration - -This patch fixes the DP audio and video PLL configurations -for the zynqmp-zcu106-revA evaluation board - -The Linux DP driver expects the DP to be using the following PLL config: - - DP video PLL should use the VPLL (0x0) - - DP audio PLL should use the RPLL (0x3) - -Register 0xFD1A0070 configures the DP video PLL. -Register 0xFD1A0074 configures the DP audio PLL. - -Signed-off-by: Neal Frager <neal.frager@amd.com> -Signed-off-by: Michal Simek <michal.simek@amd.com> ---- - board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -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 15f0be1a43..cbc436289f 100644 ---- a/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -+++ b/board/xilinx/zynqmp/zynqmp-zcu106-revA/psu_init_gpl.c -@@ -81,8 +81,8 @@ static unsigned long psu_clock_init_data(void) - psu_mask_write(0xFF5E0104, 0x00000007U, 0x00000000U); - psu_mask_write(0xFF5E0128, 0x01003F07U, 0x01000F00U); - psu_mask_write(0xFD1A00A0, 0x01003F07U, 0x01000200U); -- psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010203U); -- psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C00U); -+ psu_mask_write(0xFD1A0070, 0x013F3F07U, 0x01010500U); -+ psu_mask_write(0xFD1A0074, 0x013F3F07U, 0x01013C03U); - psu_mask_write(0xFD1A007C, 0x013F3F07U, 0x01011303U); - psu_mask_write(0xFD1A0060, 0x03003F07U, 0x03000100U); - psu_mask_write(0xFD1A0068, 0x01003F07U, 0x01000200U); --- -2.17.1 - diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index dcbc4319e8..699e528f32 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -36,4 +36,3 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/zcu106/patches"
The 0001-arm64-zynqmp-zynqmp-zcu106-revA-Fix-DP-PLL-configura.patch is already committed in the Xilinx 2022.2 u-boot release tag. Signed-off-by: Neal Frager <neal.frager@amd.com> --- ...qmp-zcu102-revA-Fix-DP-PLL-configura.patch | 40 ------------------- configs/zynqmp_zcu106_defconfig | 1 - 2 files changed, 41 deletions(-) delete mode 100644 board/zynqmp/zcu106/patches/uboot/0001-arm64-zynqmp-zynqmp-zcu102-revA-Fix-DP-PLL-configura.patch