* [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 @ 2024-08-08 13:23 Neal Frager via buildroot 2024-08-08 19:44 ` Brandon Maier via buildroot 2024-08-09 15:51 ` Brandon Maier via buildroot 0 siblings, 2 replies; 10+ messages in thread From: Neal Frager via buildroot @ 2024-08-08 13:23 UTC (permalink / raw) To: buildroot Cc: luca.ceresoli, brandon.maier, thomas.petazzoni, Neal Frager, romain.naour, michal.simek, yann.morin.1998 This patch bumps all Xilinx board defconfigs to Linux 6.6.40. Xilinx Evaluation Boards: configs/versal_vck190_defconfig configs/versal_vpk180_defconfig configs/zynq_microzed_defconfig configs/zynq_zc702_defconfig configs/zynq_zc706_defconfig configs/zynq_zed_defconfig configs/zynqmp_kria_kd240_defconfig configs/zynqmp_kria_kr260_defconfig configs/zynqmp_kria_kv260_defconfig configs/zynqmp_zcu102_defconfig configs/zynqmp_zcu104_defconfig configs/zynqmp_zcu106_defconfig Signed-off-by: Neal Frager <neal.frager@amd.com> --- V1->V2: - Squashed bump of all Xilinx board defconfigs to single patch - Removed linux patch which is no longer necessary --- board/xilinx/patches/linux/linux.hash | 1 + configs/versal_vck190_defconfig | 2 +- configs/versal_vpk180_defconfig | 2 +- configs/zynq_microzed_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynqmp_kria_kd240_defconfig | 2 +- configs/zynqmp_kria_kr260_defconfig | 2 +- configs/zynqmp_kria_kv260_defconfig | 2 +- configs/zynqmp_zcu102_defconfig | 2 +- configs/zynqmp_zcu104_defconfig | 2 +- configs/zynqmp_zcu106_defconfig | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash index d85f773478..11f4dca651 100644 --- a/board/xilinx/patches/linux/linux.hash +++ b/board/xilinx/patches/linux/linux.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz +sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 21dfe2577a..58479c9f2d 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig index 253a6d2cff..4d3afc0e98 100644 --- a/configs/versal_vpk180_defconfig +++ b/configs/versal_vpk180_defconfig @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index f955a0c4ad..71a5d880b3 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 75ebc2a3ba..f3fc32145b 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index ce539eefaf..f1c9bd6622 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 925faeac8e..cada3bbd47 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index dff49b9837..262e80a145 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 24fdea9c30..65bba693a0 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index a16da66e38..22df2a4112 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 3f1726a13f..c2feb393de 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index b6d943333f..c26210b49c 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index c10ec70ed8..737a8454bb 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" -- 2.25.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 2024-08-08 13:23 [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 Neal Frager via buildroot @ 2024-08-08 19:44 ` Brandon Maier via buildroot 2024-08-09 3:52 ` Frager, Neal via buildroot 2024-08-09 15:51 ` Brandon Maier via buildroot 1 sibling, 1 reply; 10+ messages in thread From: Brandon Maier via buildroot @ 2024-08-08 19:44 UTC (permalink / raw) To: Neal Frager, buildroot Cc: michal.simek, romain.naour, luca.ceresoli, yann.morin.1998, thomas.petazzoni Hi Neal, On Thu Aug 8, 2024 at 1:23 PM UTC, Neal Frager via buildroot wrote: > This patch bumps all Xilinx board defconfigs to Linux 6.6.40. > > Xilinx Evaluation Boards: > configs/versal_vck190_defconfig > configs/versal_vpk180_defconfig > configs/zynq_microzed_defconfig > configs/zynq_zc702_defconfig > configs/zynq_zc706_defconfig > configs/zynq_zed_defconfig > configs/zynqmp_kria_kd240_defconfig > configs/zynqmp_kria_kr260_defconfig > configs/zynqmp_kria_kv260_defconfig > configs/zynqmp_zcu102_defconfig > configs/zynqmp_zcu104_defconfig > configs/zynqmp_zcu106_defconfig I attempted to boot this patch on a zcu106, but I get no output over the uart port from anything, U-Boot SPL, ATF, etc. So this board may be broken on master. Can you verify if it works on your end? Thanks, Brandon Maier > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > V1->V2: > - Squashed bump of all Xilinx board defconfigs to single patch > - Removed linux patch which is no longer necessary > --- > board/xilinx/patches/linux/linux.hash | 1 + > configs/versal_vck190_defconfig | 2 +- > configs/versal_vpk180_defconfig | 2 +- > configs/zynq_microzed_defconfig | 2 +- > configs/zynq_zc702_defconfig | 2 +- > configs/zynq_zc706_defconfig | 2 +- > configs/zynq_zed_defconfig | 2 +- > configs/zynqmp_kria_kd240_defconfig | 2 +- > configs/zynqmp_kria_kr260_defconfig | 2 +- > configs/zynqmp_kria_kv260_defconfig | 2 +- > configs/zynqmp_zcu102_defconfig | 2 +- > configs/zynqmp_zcu104_defconfig | 2 +- > configs/zynqmp_zcu106_defconfig | 2 +- > 13 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash > index d85f773478..11f4dca651 100644 > --- a/board/xilinx/patches/linux/linux.hash > +++ b/board/xilinx/patches/linux/linux.hash > @@ -1,2 +1,3 @@ > # Locally calculated > sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz > +sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz > diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig > index 21dfe2577a..58479c9f2d 100644 > --- a/configs/versal_vck190_defconfig > +++ b/configs/versal_vck190_defconfig > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" > diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig > index 253a6d2cff..4d3afc0e98 100644 > --- a/configs/versal_vpk180_defconfig > +++ b/configs/versal_vpk180_defconfig > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" > diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig > index f955a0c4ad..71a5d880b3 100644 > --- a/configs/zynq_microzed_defconfig > +++ b/configs/zynq_microzed_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig > index 75ebc2a3ba..f3fc32145b 100644 > --- a/configs/zynq_zc702_defconfig > +++ b/configs/zynq_zc702_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig > index ce539eefaf..f1c9bd6622 100644 > --- a/configs/zynq_zc706_defconfig > +++ b/configs/zynq_zc706_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig > index 925faeac8e..cada3bbd47 100644 > --- a/configs/zynq_zed_defconfig > +++ b/configs/zynq_zed_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig > index dff49b9837..262e80a145 100644 > --- a/configs/zynqmp_kria_kd240_defconfig > +++ b/configs/zynqmp_kria_kd240_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" > diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig > index 24fdea9c30..65bba693a0 100644 > --- a/configs/zynqmp_kria_kr260_defconfig > +++ b/configs/zynqmp_kria_kr260_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" > diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig > index a16da66e38..22df2a4112 100644 > --- a/configs/zynqmp_kria_kv260_defconfig > +++ b/configs/zynqmp_kria_kv260_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > index 3f1726a13f..c2feb393de 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig > index b6d943333f..c26210b49c 100644 > --- a/configs/zynqmp_zcu104_defconfig > +++ b/configs/zynqmp_zcu104_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index c10ec70ed8..737a8454bb 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 2024-08-08 19:44 ` Brandon Maier via buildroot @ 2024-08-09 3:52 ` Frager, Neal via buildroot 2024-08-09 6:30 ` Thomas Petazzoni via buildroot 2024-08-09 15:02 ` Brandon Maier via buildroot 0 siblings, 2 replies; 10+ messages in thread From: Frager, Neal via buildroot @ 2024-08-09 3:52 UTC (permalink / raw) To: Brandon Maier, buildroot@buildroot.org Cc: Simek, Michal, romain.naour@smile.fr, luca.ceresoli@bootlin.com, yann.morin.1998@free.fr, thomas.petazzoni@bootlin.com Hi Brandon, > This patch bumps all Xilinx board defconfigs to Linux 6.6.40. > > Xilinx Evaluation Boards: > configs/versal_vck190_defconfig > configs/versal_vpk180_defconfig > configs/zynq_microzed_defconfig > configs/zynq_zc702_defconfig > configs/zynq_zc706_defconfig > configs/zynq_zed_defconfig > configs/zynqmp_kria_kd240_defconfig > configs/zynqmp_kria_kr260_defconfig > configs/zynqmp_kria_kv260_defconfig > configs/zynqmp_zcu102_defconfig > configs/zynqmp_zcu104_defconfig > configs/zynqmp_zcu106_defconfig > I attempted to boot this patch on a zcu106, but I get no output over the > uart port from anything, U-Boot SPL, ATF, etc. So this board may be > broken on master. > Can you verify if it works on your end? I can help you with this problem. It is because there are two different versions of the zcu106 having different DDR memories. This is because the DDR that came on the revA version of the board became obsolete. I left the revA device tree in buildroot as I know this is the version of the zcu106 that Peter Korsgaard has. Based on your comment, I believe you have the newer version of the zcu106. To fix this, only the u-boot psu_init_gpl.c needs to be changed, so the correct spl psu_init routine will run. Please implement the following in your zcu106 defconfig: - BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0 This will build in the correct psu_init_gpl.c from the two choices below: https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0 https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-revA You can read about this issue for the zcu102 and zcu106 here: https://support.xilinx.com/s/article/71961?language=en_US Do you have any opinions for how this can be better handled in buildroot to support both versions of the zcu102 and zcu106? At the moment, the older version of the zcu106 is supported and the newer version of the zcu102 is supported in buildroot natively. In any case, this issue is not related to this patch you have reviewed. Best regards, Neal Frager AMD > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > V1->V2: > - Squashed bump of all Xilinx board defconfigs to single patch > - Removed linux patch which is no longer necessary > --- > board/xilinx/patches/linux/linux.hash | 1 + > configs/versal_vck190_defconfig | 2 +- > configs/versal_vpk180_defconfig | 2 +- > configs/zynq_microzed_defconfig | 2 +- > configs/zynq_zc702_defconfig | 2 +- > configs/zynq_zc706_defconfig | 2 +- > configs/zynq_zed_defconfig | 2 +- > configs/zynqmp_kria_kd240_defconfig | 2 +- > configs/zynqmp_kria_kr260_defconfig | 2 +- > configs/zynqmp_kria_kv260_defconfig | 2 +- > configs/zynqmp_zcu102_defconfig | 2 +- > configs/zynqmp_zcu104_defconfig | 2 +- > configs/zynqmp_zcu106_defconfig | 2 +- > 13 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash > index d85f773478..11f4dca651 100644 > --- a/board/xilinx/patches/linux/linux.hash > +++ b/board/xilinx/patches/linux/linux.hash > @@ -1,2 +1,3 @@ > # Locally calculated > sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz > +sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz > diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig > index 21dfe2577a..58479c9f2d 100644 > --- a/configs/versal_vck190_defconfig > +++ b/configs/versal_vck190_defconfig > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" > diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig > index 253a6d2cff..4d3afc0e98 100644 > --- a/configs/versal_vpk180_defconfig > +++ b/configs/versal_vpk180_defconfig > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" > diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig > index f955a0c4ad..71a5d880b3 100644 > --- a/configs/zynq_microzed_defconfig > +++ b/configs/zynq_microzed_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig > index 75ebc2a3ba..f3fc32145b 100644 > --- a/configs/zynq_zc702_defconfig > +++ b/configs/zynq_zc702_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig > index ce539eefaf..f1c9bd6622 100644 > --- a/configs/zynq_zc706_defconfig > +++ b/configs/zynq_zc706_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig > index 925faeac8e..cada3bbd47 100644 > --- a/configs/zynq_zed_defconfig > +++ b/configs/zynq_zed_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig > index dff49b9837..262e80a145 100644 > --- a/configs/zynqmp_kria_kd240_defconfig > +++ b/configs/zynqmp_kria_kd240_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" > diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig > index 24fdea9c30..65bba693a0 100644 > --- a/configs/zynqmp_kria_kr260_defconfig > +++ b/configs/zynqmp_kria_kr260_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" > diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig > index a16da66e38..22df2a4112 100644 > --- a/configs/zynqmp_kria_kv260_defconfig > +++ b/configs/zynqmp_kria_kv260_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > index 3f1726a13f..c2feb393de 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig > index b6d943333f..c26210b49c 100644 > --- a/configs/zynqmp_zcu104_defconfig > +++ b/configs/zynqmp_zcu104_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index c10ec70ed8..737a8454bb 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 2024-08-09 3:52 ` Frager, Neal via buildroot @ 2024-08-09 6:30 ` Thomas Petazzoni via buildroot 2024-08-09 6:39 ` Frager, Neal via buildroot 2024-08-09 15:02 ` Brandon Maier via buildroot 1 sibling, 1 reply; 10+ messages in thread From: Thomas Petazzoni via buildroot @ 2024-08-09 6:30 UTC (permalink / raw) To: Frager, Neal Cc: luca.ceresoli@bootlin.com, Brandon Maier, buildroot@buildroot.org, romain.naour@smile.fr, Simek, Michal, yann.morin.1998@free.fr On Fri, 9 Aug 2024 03:52:30 +0000 "Frager, Neal" <neal.frager@amd.com> wrote: > I can help you with this problem. It is because there are two different > versions of the zcu106 having different DDR memories. This is because the > DDR that came on the revA version of the board became obsolete. > > I left the revA device tree in buildroot as I know this is the version of the > zcu106 that Peter Korsgaard has. Based on your comment, I believe you have > the newer version of the zcu106. > > To fix this, only the u-boot psu_init_gpl.c needs to be changed, so the > correct spl psu_init routine will run. > > Please implement the following in your zcu106 defconfig: > > - BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA > + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0 > > This will build in the correct psu_init_gpl.c from the two choices below: > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0 > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-revA > > You can read about this issue for the zcu102 and zcu106 here: > https://support.xilinx.com/s/article/71961?language=en_US > > Do you have any opinions for how this can be better handled in buildroot to > support both versions of the zcu102 and zcu106? The only nice option from a Buildroot perspective would be to runtime detect the board revision in U-Boot and apply the correct DDR configuration accordingly. This way a single image would work on both revisions. Having two full defconfigs to address those two board revisions would be a bit annoying. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 2024-08-09 6:30 ` Thomas Petazzoni via buildroot @ 2024-08-09 6:39 ` Frager, Neal via buildroot [not found] ` <3036afae-2027-4993-bb1f-acd3b312759e@amd.com> 0 siblings, 1 reply; 10+ messages in thread From: Frager, Neal via buildroot @ 2024-08-09 6:39 UTC (permalink / raw) To: Thomas Petazzoni, Simek, Michal Cc: romain.naour@smile.fr, luca.ceresoli@bootlin.com, yann.morin.1998@free.fr, Brandon Maier, buildroot@buildroot.org Hi Michal, > I can help you with this problem. It is because there are two different > versions of the zcu106 having different DDR memories. This is because the > DDR that came on the revA version of the board became obsolete. > > I left the revA device tree in buildroot as I know this is the version of the > zcu106 that Peter Korsgaard has. Based on your comment, I believe you have > the newer version of the zcu106. > > To fix this, only the u-boot psu_init_gpl.c needs to be changed, so the > correct spl psu_init routine will run. > > Please implement the following in your zcu106 defconfig: > > - BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA > + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0 > > This will build in the correct psu_init_gpl.c from the two choices below: > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0 > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-revA > > You can read about this issue for the zcu102 and zcu106 here: > https://support.xilinx.com/s/article/71961?language=en_US > > Do you have any opinions for how this can be better handled in buildroot to > support both versions of the zcu102 and zcu106? > The only nice option from a Buildroot perspective would be to runtime > detect the board revision in U-Boot and apply the correct DDR > configuration accordingly. This way a single image would work on both > revisions. Having two full defconfigs to address those two board > revisions would be a bit annoying. I believe I already know your answer to this, but I will ask it anyway. Would you be ok with adding a small routine to the SPL that reads the I2C EEPROM on the ZCU102 and ZCU106 boards to detect the version before configuring the DDR like we do with the FSBL? We could make it such that the routine is only enabled if the device tree is set to one of the ZCU102 or ZCU106 device tree revisions. Would you be open to this? Best regards, Neal Frager AMD _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
[parent not found: <3036afae-2027-4993-bb1f-acd3b312759e@amd.com>]
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 [not found] ` <3036afae-2027-4993-bb1f-acd3b312759e@amd.com> @ 2024-08-09 8:22 ` Frager, Neal via buildroot 0 siblings, 0 replies; 10+ messages in thread From: Frager, Neal via buildroot @ 2024-08-09 8:22 UTC (permalink / raw) To: Simek, Michal, Thomas Petazzoni, Brandon Maier Cc: romain.naour@smile.fr, luca.ceresoli@bootlin.com, yann.morin.1998@free.fr, buildroot@buildroot.org Hi everyone, > Hi Michal, > >> I can help you with this problem. It is because there are two different >> versions of the zcu106 having different DDR memories. This is because the >> DDR that came on the revA version of the board became obsolete. >> >> I left the revA device tree in buildroot as I know this is the version of the >> zcu106 that Peter Korsgaard has. Based on your comment, I believe you have >> the newer version of the zcu106. >> >> To fix this, only the u-boot psu_init_gpl.c needs to be changed, so the >> correct spl psu_init routine will run. >> >> Please implement the following in your zcu106 defconfig: >> >> - BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA >> + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0 >> >> This will build in the correct psu_init_gpl.c from the two choices below: >> https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0 >> https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-revA >> >> You can read about this issue for the zcu102 and zcu106 here: >> https://support.xilinx.com/s/article/71961?language=en_US >> >> Do you have any opinions for how this can be better handled in buildroot to >> support both versions of the zcu102 and zcu106? > >> The only nice option from a Buildroot perspective would be to runtime >> detect the board revision in U-Boot and apply the correct DDR >> configuration accordingly. This way a single image would work on both >> revisions. Having two full defconfigs to address those two board >> revisions would be a bit annoying. > > I believe I already know your answer to this, but I will ask it anyway. Would > you be ok with adding a small routine to the SPL that reads the I2C EEPROM on > the ZCU102 and ZCU106 boards to detect the version before configuring the DDR > like we do with the FSBL? We could make it such that the routine is only > enabled if the device tree is set to one of the ZCU102 or ZCU106 device tree > revisions. > > Would you be open to this? > I replied origin email already. > And in connection to SPL hacks, psu_init hacks. DDR config is normally coming > from vivado via psu_init. > The issue with DIMM modules was that used modules were EOL. > Dynamic DDR configuration would be nice but then you need to mark which are > using DIMM modules and which configuration you want because chips can run in > different configurations (for example speeds). > Then people can start to exchange DIMM modules and I don't think anybody wants > to get to this area. It is a lot of work but pretty much for nothing. > And you will be also fighting with missing space in OCM for it. > Because of that you would have to start to change SPL layout to move this code > to area which is going to rewritten by TF-A later which ends up in another hack. > If anybody wants to spend time on this that's fine. I am happy to review it and > help with it but I don't think it is worth of effort. > What we have done for generic SD card for ZynqMP boards that we have small > application which reads board eeprom and based on data it setup multiboot > register and do soft reset to boot another boot.bin directly for the detected > board. This is working for zynqmp evaluation boards which have onboard eeprom at > the same location. This could be extended to support different board revisions > or detection based on SPD. But not sure if this is useful in buildroot content > because boot.bin can be placed to QSPI for example. > The easiest solution is to have different defconfigs for different board > revisions if this is acceptable. > Thanks, > Michal I agree with you that implementing and testing a solution for the spl would be a lot of effort. I would be open to eventually doing it, but I have other things that I think are more important at the moment. In the meantime, I propose the following solution for the zcu106: http://patchwork.ozlabs.org/project/buildroot/patch/20240809060336.3326177-1-neal.frager@amd.com/ For the zcu102, I do not have access to a board with the older DDR memory, so I have not been able to test if the spl actually works with the older DDR on the zcu102. For now, the buildroot zynqmp_zcu102_defconfig only supports the new DDR memory which matches the board I have. Unlike the zcu106, where I have been able to verify both versions of DDR, I do not know what to do for the zcu102. Any new boards purchased today will work with the buildroot defconfig, so the issue is really only for any really old zcu102 boards that may be out there. @Michal, have you been able to confirm which zcu102 revision name in u-boot corresponds to the zcu102 with the EOL DDR memory? I would be ok with adding a comment for the zcu102 as well, but only if someone has actually verified it. Best regards, Neal Frager AMD _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 2024-08-09 3:52 ` Frager, Neal via buildroot 2024-08-09 6:30 ` Thomas Petazzoni via buildroot @ 2024-08-09 15:02 ` Brandon Maier via buildroot 2024-08-09 15:19 ` Frager, Neal via buildroot 1 sibling, 1 reply; 10+ messages in thread From: Brandon Maier via buildroot @ 2024-08-09 15:02 UTC (permalink / raw) To: Frager, Neal, buildroot@buildroot.org Cc: luca.ceresoli@bootlin.com, romain.naour@smile.fr, Simek, Michal, yann.morin.1998@free.fr, thomas.petazzoni@bootlin.com Hi Neal, On Fri Aug 9, 2024 at 3:52 AM UTC, Frager, Neal via buildroot wrote: > Hi Brandon, > > > This patch bumps all Xilinx board defconfigs to Linux 6.6.40. > > > > Xilinx Evaluation Boards: > > configs/versal_vck190_defconfig > > configs/versal_vpk180_defconfig > > configs/zynq_microzed_defconfig > > configs/zynq_zc702_defconfig > > configs/zynq_zc706_defconfig > > configs/zynq_zed_defconfig > > configs/zynqmp_kria_kd240_defconfig > > configs/zynqmp_kria_kr260_defconfig > > configs/zynqmp_kria_kv260_defconfig > > configs/zynqmp_zcu102_defconfig > > configs/zynqmp_zcu104_defconfig > > configs/zynqmp_zcu106_defconfig > > > I attempted to boot this patch on a zcu106, but I get no output over the > > uart port from anything, U-Boot SPL, ATF, etc. So this board may be > > broken on master. > > > Can you verify if it works on your end? > > I can help you with this problem. It is because there are two different > versions of the zcu106 having different DDR memories. This is because the > DDR that came on the revA version of the board became obsolete. > > I left the revA device tree in buildroot as I know this is the version of the > zcu106 that Peter Korsgaard has. Based on your comment, I believe you have > the newer version of the zcu106. > > To fix this, only the u-boot psu_init_gpl.c needs to be changed, so the > correct spl psu_init routine will run. > > Please implement the following in your zcu106 defconfig: > > - BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA > + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0 > > This will build in the correct psu_init_gpl.c from the two choices below: > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0 > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-revA > > You can read about this issue for the zcu102 and zcu106 here: > https://support.xilinx.com/s/article/71961?language=en_US Thank you! Switching to the rev1.0 devicetree does let my board boot. > > Do you have any opinions for how this can be better handled in buildroot to > support both versions of the zcu102 and zcu106? My preference would be to having two defconfigs, as they are effectively different boards. But given Thomas would prefer not adding new defconfigs, documenting it in the defconfig as you did is a good idea. > > At the moment, the older version of the zcu106 is supported and the newer > version of the zcu102 is supported in buildroot natively. Would it be prudent to default the zcu106 to the newest revision? Is there any idea of if the zcu106 revA or rev1.0 is more widely used? > > In any case, this issue is not related to this patch you have reviewed. Agreed, I plan to test the vpk180 here then send a reviewed/tested. Thank you! Brandon Maier > > Best regards, > Neal Frager > AMD > > > > > Signed-off-by: Neal Frager <neal.frager@amd.com> > > --- > > V1->V2: > > - Squashed bump of all Xilinx board defconfigs to single patch > > - Removed linux patch which is no longer necessary > > --- > > board/xilinx/patches/linux/linux.hash | 1 + > > configs/versal_vck190_defconfig | 2 +- > > configs/versal_vpk180_defconfig | 2 +- > > configs/zynq_microzed_defconfig | 2 +- > > configs/zynq_zc702_defconfig | 2 +- > > configs/zynq_zc706_defconfig | 2 +- > > configs/zynq_zed_defconfig | 2 +- > > configs/zynqmp_kria_kd240_defconfig | 2 +- > > configs/zynqmp_kria_kr260_defconfig | 2 +- > > configs/zynqmp_kria_kv260_defconfig | 2 +- > > configs/zynqmp_zcu102_defconfig | 2 +- > > configs/zynqmp_zcu104_defconfig | 2 +- > > configs/zynqmp_zcu106_defconfig | 2 +- > > 13 files changed, 13 insertions(+), 12 deletions(-) > > > > diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash > > index d85f773478..11f4dca651 100644 > > --- a/board/xilinx/patches/linux/linux.hash > > +++ b/board/xilinx/patches/linux/linux.hash > > @@ -1,2 +1,3 @@ > > # Locally calculated > > sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz > > +sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz > > diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig > > index 21dfe2577a..58479c9f2d 100644 > > --- a/configs/versal_vck190_defconfig > > +++ b/configs/versal_vck190_defconfig > > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" > > diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig > > index 253a6d2cff..4d3afc0e98 100644 > > --- a/configs/versal_vpk180_defconfig > > +++ b/configs/versal_vpk180_defconfig > > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" > > diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig > > index f955a0c4ad..71a5d880b3 100644 > > --- a/configs/zynq_microzed_defconfig > > +++ b/configs/zynq_microzed_defconfig > > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > > BR2_LINUX_KERNEL_UIMAGE=y > > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > > diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig > > index 75ebc2a3ba..f3fc32145b 100644 > > --- a/configs/zynq_zc702_defconfig > > +++ b/configs/zynq_zc702_defconfig > > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > > BR2_LINUX_KERNEL_UIMAGE=y > > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > > diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig > > index ce539eefaf..f1c9bd6622 100644 > > --- a/configs/zynq_zc706_defconfig > > +++ b/configs/zynq_zc706_defconfig > > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > > BR2_LINUX_KERNEL_UIMAGE=y > > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > > diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig > > index 925faeac8e..cada3bbd47 100644 > > --- a/configs/zynq_zed_defconfig > > +++ b/configs/zynq_zed_defconfig > > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > > BR2_LINUX_KERNEL_UIMAGE=y > > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > > diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig > > index dff49b9837..262e80a145 100644 > > --- a/configs/zynqmp_kria_kd240_defconfig > > +++ b/configs/zynqmp_kria_kd240_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" > > diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig > > index 24fdea9c30..65bba693a0 100644 > > --- a/configs/zynqmp_kria_kr260_defconfig > > +++ b/configs/zynqmp_kria_kr260_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" > > diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig > > index a16da66e38..22df2a4112 100644 > > --- a/configs/zynqmp_kria_kv260_defconfig > > +++ b/configs/zynqmp_kria_kv260_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" > > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > > index 3f1726a13f..c2feb393de 100644 > > --- a/configs/zynqmp_zcu102_defconfig > > +++ b/configs/zynqmp_zcu102_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > > diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig > > index b6d943333f..c26210b49c 100644 > > --- a/configs/zynqmp_zcu104_defconfig > > +++ b/configs/zynqmp_zcu104_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" > > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > > index c10ec70ed8..737a8454bb 100644 > > --- a/configs/zynqmp_zcu106_defconfig > > +++ b/configs/zynqmp_zcu106_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > _______________________________________________ > 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] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 2024-08-09 15:02 ` Brandon Maier via buildroot @ 2024-08-09 15:19 ` Frager, Neal via buildroot 2024-08-19 10:01 ` Luca Ceresoli via buildroot 0 siblings, 1 reply; 10+ messages in thread From: Frager, Neal via buildroot @ 2024-08-09 15:19 UTC (permalink / raw) To: Brandon Maier, buildroot@buildroot.org Cc: Simek, Michal, thomas.petazzoni@bootlin.com, romain.naour@smile.fr, luca.ceresoli@bootlin.com, yann.morin.1998@free.fr Hi Brandon, > Hi Brandon, > > > This patch bumps all Xilinx board defconfigs to Linux 6.6.40. > > > > Xilinx Evaluation Boards: > > configs/versal_vck190_defconfig > > configs/versal_vpk180_defconfig > > configs/zynq_microzed_defconfig > > configs/zynq_zc702_defconfig > > configs/zynq_zc706_defconfig > > configs/zynq_zed_defconfig > > configs/zynqmp_kria_kd240_defconfig > > configs/zynqmp_kria_kr260_defconfig > > configs/zynqmp_kria_kv260_defconfig > > configs/zynqmp_zcu102_defconfig > > configs/zynqmp_zcu104_defconfig > > configs/zynqmp_zcu106_defconfig > > > I attempted to boot this patch on a zcu106, but I get no output over the > > uart port from anything, U-Boot SPL, ATF, etc. So this board may be > > broken on master. > > > Can you verify if it works on your end? > > I can help you with this problem. It is because there are two different > versions of the zcu106 having different DDR memories. This is because the > DDR that came on the revA version of the board became obsolete. > > I left the revA device tree in buildroot as I know this is the version of the > zcu106 that Peter Korsgaard has. Based on your comment, I believe you have > the newer version of the zcu106. > > To fix this, only the u-boot psu_init_gpl.c needs to be changed, so the > correct spl psu_init routine will run. > > Please implement the following in your zcu106 defconfig: > > - BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA > + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0 > > This will build in the correct psu_init_gpl.c from the two choices below: > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0 > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-revA > > You can read about this issue for the zcu102 and zcu106 here: > https://support.xilinx.com/s/article/71961?language=en_US > Thank you! Switching to the rev1.0 devicetree does let my board boot. Great! > > Do you have any opinions for how this can be better handled in buildroot to > support both versions of the zcu102 and zcu106? > My preference would be to having two defconfigs, as they are effectively > different boards. But given Thomas would prefer not adding new > defconfigs, documenting it in the defconfig as you did is a good idea. As I mentioned in my previous response, I will move this documentation to the readme.txt file. It makes more sense there. > > At the moment, the older version of the zcu106 is supported and the newer > version of the zcu102 is supported in buildroot natively. > Would it be prudent to default the zcu106 to the newest revision? Is > there any idea of if the zcu106 revA or rev1.0 is more widely used? Now that I think about it, you are absolutely right. Not only are all new boards using the rev1.0 DDR memories, but I have to believe the vast majority of boards out there are on the new memory at this point. The only reason I kept the zcu106 on revA was because I knew that Peter's zcu106 has revA DDR memory. That is probably not the best reason to keep the zcu106 defconfig on revA. Sorry Peter! So unless anyone objects, I plan to do the following. 1. Migrate the zynqmp_zcu106_defconfig to rev1.0 DDR memory. 2. Document the revA/rev1.0 issue in the board/zynqmp/readme.txt, so that users of the old boards have at least a chance of finding that they need to change the u-boot device_tree config for revA DDR memory. > > In any case, this issue is not related to this patch you have reviewed. > Agreed, I plan to test the vpk180 here then send a reviewed/tested. Great, thanks. > Thank you! > Brandon Maier Best regards, Neal Frager AMD > > > > > Signed-off-by: Neal Frager <neal.frager@amd.com> > > --- > > V1->V2: > > - Squashed bump of all Xilinx board defconfigs to single patch > > - Removed linux patch which is no longer necessary > > --- > > board/xilinx/patches/linux/linux.hash | 1 + > > configs/versal_vck190_defconfig | 2 +- > > configs/versal_vpk180_defconfig | 2 +- > > configs/zynq_microzed_defconfig | 2 +- > > configs/zynq_zc702_defconfig | 2 +- > > configs/zynq_zc706_defconfig | 2 +- > > configs/zynq_zed_defconfig | 2 +- > > configs/zynqmp_kria_kd240_defconfig | 2 +- > > configs/zynqmp_kria_kr260_defconfig | 2 +- > > configs/zynqmp_kria_kv260_defconfig | 2 +- > > configs/zynqmp_zcu102_defconfig | 2 +- > > configs/zynqmp_zcu104_defconfig | 2 +- > > configs/zynqmp_zcu106_defconfig | 2 +- > > 13 files changed, 13 insertions(+), 12 deletions(-) > > > > diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash > > index d85f773478..11f4dca651 100644 > > --- a/board/xilinx/patches/linux/linux.hash > > +++ b/board/xilinx/patches/linux/linux.hash > > @@ -1,2 +1,3 @@ > > # Locally calculated > > sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz > > +sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz > > diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig > > index 21dfe2577a..58479c9f2d 100644 > > --- a/configs/versal_vck190_defconfig > > +++ b/configs/versal_vck190_defconfig > > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" > > diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig > > index 253a6d2cff..4d3afc0e98 100644 > > --- a/configs/versal_vpk180_defconfig > > +++ b/configs/versal_vpk180_defconfig > > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" > > diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig > > index f955a0c4ad..71a5d880b3 100644 > > --- a/configs/zynq_microzed_defconfig > > +++ b/configs/zynq_microzed_defconfig > > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > > BR2_LINUX_KERNEL_UIMAGE=y > > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > > diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig > > index 75ebc2a3ba..f3fc32145b 100644 > > --- a/configs/zynq_zc702_defconfig > > +++ b/configs/zynq_zc702_defconfig > > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > > BR2_LINUX_KERNEL_UIMAGE=y > > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > > diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig > > index ce539eefaf..f1c9bd6622 100644 > > --- a/configs/zynq_zc706_defconfig > > +++ b/configs/zynq_zc706_defconfig > > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > > BR2_LINUX_KERNEL_UIMAGE=y > > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > > diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig > > index 925faeac8e..cada3bbd47 100644 > > --- a/configs/zynq_zed_defconfig > > +++ b/configs/zynq_zed_defconfig > > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > > BR2_LINUX_KERNEL_UIMAGE=y > > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > > diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig > > index dff49b9837..262e80a145 100644 > > --- a/configs/zynqmp_kria_kd240_defconfig > > +++ b/configs/zynqmp_kria_kd240_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" > > diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig > > index 24fdea9c30..65bba693a0 100644 > > --- a/configs/zynqmp_kria_kr260_defconfig > > +++ b/configs/zynqmp_kria_kr260_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" > > diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig > > index a16da66e38..22df2a4112 100644 > > --- a/configs/zynqmp_kria_kv260_defconfig > > +++ b/configs/zynqmp_kria_kv260_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" > > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > > index 3f1726a13f..c2feb393de 100644 > > --- a/configs/zynqmp_zcu102_defconfig > > +++ b/configs/zynqmp_zcu102_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > > diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig > > index b6d943333f..c26210b49c 100644 > > --- a/configs/zynqmp_zcu104_defconfig > > +++ b/configs/zynqmp_zcu104_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" > > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > > index c10ec70ed8..737a8454bb 100644 > > --- a/configs/zynqmp_zcu106_defconfig > > +++ b/configs/zynqmp_zcu106_defconfig > > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" > _______________________________________________ > 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] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 2024-08-09 15:19 ` Frager, Neal via buildroot @ 2024-08-19 10:01 ` Luca Ceresoli via buildroot 0 siblings, 0 replies; 10+ messages in thread From: Luca Ceresoli via buildroot @ 2024-08-19 10:01 UTC (permalink / raw) To: Frager, Neal Cc: Brandon Maier, thomas.petazzoni@bootlin.com, buildroot@buildroot.org, romain.naour@smile.fr, Simek, Michal, yann.morin.1998@free.fr Hello Nea, Michal, Brandon, Thomas, Peter, On Fri, 9 Aug 2024 15:19:30 +0000 "Frager, Neal" <neal.frager@amd.com> wrote: > Hi Brandon, > > > Hi Brandon, > > > > > This patch bumps all Xilinx board defconfigs to Linux 6.6.40. > > > > > > Xilinx Evaluation Boards: > > > configs/versal_vck190_defconfig > > > configs/versal_vpk180_defconfig > > > configs/zynq_microzed_defconfig > > > configs/zynq_zc702_defconfig > > > configs/zynq_zc706_defconfig > > > configs/zynq_zed_defconfig > > > configs/zynqmp_kria_kd240_defconfig > > > configs/zynqmp_kria_kr260_defconfig > > > configs/zynqmp_kria_kv260_defconfig > > > configs/zynqmp_zcu102_defconfig > > > configs/zynqmp_zcu104_defconfig > > > configs/zynqmp_zcu106_defconfig > > > > > I attempted to boot this patch on a zcu106, but I get no output over the > > > uart port from anything, U-Boot SPL, ATF, etc. So this board may be > > > broken on master. > > > > > Can you verify if it works on your end? > > > > I can help you with this problem. It is because there are two different > > versions of the zcu106 having different DDR memories. This is because the > > DDR that came on the revA version of the board became obsolete. > > > > I left the revA device tree in buildroot as I know this is the version of the > > zcu106 that Peter Korsgaard has. Based on your comment, I believe you have > > the newer version of the zcu106. > > > > To fix this, only the u-boot psu_init_gpl.c needs to be changed, so the > > correct spl psu_init routine will run. > > > > Please implement the following in your zcu106 defconfig: > > > > - BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA > > + BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0 > > > > This will build in the correct psu_init_gpl.c from the two choices below: > > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-rev1.0 > > https://github.com/Xilinx/u-boot-xlnx/tree/master/board/xilinx/zynqmp/zynqmp-zcu106-revA > > > > You can read about this issue for the zcu102 and zcu106 here: > > https://support.xilinx.com/s/article/71961?language=en_US > > > Thank you! Switching to the rev1.0 devicetree does let my board boot. > > Great! > > > > > Do you have any opinions for how this can be better handled in buildroot to > > support both versions of the zcu102 and zcu106? > > > My preference would be to having two defconfigs, as they are effectively > > different boards. But given Thomas would prefer not adding new > > defconfigs, documenting it in the defconfig as you did is a good idea. > > As I mentioned in my previous response, I will move this documentation to the > readme.txt file. It makes more sense there. I agree the readme file seems the most appropriate. > > At the moment, the older version of the zcu106 is supported and the newer > > version of the zcu102 is supported in buildroot natively. > > > Would it be prudent to default the zcu106 to the newest revision? Is > > there any idea of if the zcu106 revA or rev1.0 is more widely used? > > Now that I think about it, you are absolutely right. Not only are all new > boards using the rev1.0 DDR memories, but I have to believe the vast majority > of boards out there are on the new memory at this point. > > The only reason I kept the zcu106 on revA was because I knew that Peter's > zcu106 has revA DDR memory. That is probably not the best reason to keep the > zcu106 defconfig on revA. Sorry Peter! > > So unless anyone objects, I plan to do the following. > > 1. Migrate the zynqmp_zcu106_defconfig to rev1.0 DDR memory. > > 2. Document the revA/rev1.0 issue in the board/zynqmp/readme.txt, so that > users of the old boards have at least a chance of finding that they need to > change the u-boot device_tree config for revA DDR memory. Would it be possible to have a single psu_init_gpl.c that works for both revisions, albeit with non-optimal performance for both? I don't know what the differences are between the two revisions, but if it is a matter of timings it should be possible. Custom designs will use a custom psu_init_gpl.c anyway, so that wouldn't affect performance of industrial products. Luca -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 2024-08-08 13:23 [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 Neal Frager via buildroot 2024-08-08 19:44 ` Brandon Maier via buildroot @ 2024-08-09 15:51 ` Brandon Maier via buildroot 1 sibling, 0 replies; 10+ messages in thread From: Brandon Maier via buildroot @ 2024-08-09 15:51 UTC (permalink / raw) To: Neal Frager, buildroot Cc: michal.simek, romain.naour, luca.ceresoli, yann.morin.1998, thomas.petazzoni On Thu Aug 8, 2024 at 1:23 PM UTC, Neal Frager via buildroot wrote: > This patch bumps all Xilinx board defconfigs to Linux 6.6.40. > > Xilinx Evaluation Boards: > configs/versal_vck190_defconfig > configs/versal_vpk180_defconfig > configs/zynq_microzed_defconfig > configs/zynq_zc702_defconfig > configs/zynq_zc706_defconfig > configs/zynq_zed_defconfig > configs/zynqmp_kria_kd240_defconfig > configs/zynqmp_kria_kr260_defconfig > configs/zynqmp_kria_kv260_defconfig > configs/zynqmp_zcu102_defconfig > configs/zynqmp_zcu104_defconfig > configs/zynqmp_zcu106_defconfig > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > V1->V2: > - Squashed bump of all Xilinx board defconfigs to single patch > - Removed linux patch which is no longer necessary > --- > board/xilinx/patches/linux/linux.hash | 1 + > configs/versal_vck190_defconfig | 2 +- > configs/versal_vpk180_defconfig | 2 +- > configs/zynq_microzed_defconfig | 2 +- > configs/zynq_zc702_defconfig | 2 +- > configs/zynq_zc706_defconfig | 2 +- > configs/zynq_zed_defconfig | 2 +- > configs/zynqmp_kria_kd240_defconfig | 2 +- > configs/zynqmp_kria_kr260_defconfig | 2 +- > configs/zynqmp_kria_kv260_defconfig | 2 +- > configs/zynqmp_zcu102_defconfig | 2 +- > configs/zynqmp_zcu104_defconfig | 2 +- > configs/zynqmp_zcu106_defconfig | 2 +- > 13 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/board/xilinx/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash > index d85f773478..11f4dca651 100644 > --- a/board/xilinx/patches/linux/linux.hash > +++ b/board/xilinx/patches/linux/linux.hash > @@ -1,2 +1,3 @@ > # Locally calculated > sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz As these are now all bumped in this one commit, this hash can be removed. Otherwise, I boot tested a zcu106 and vpk180 and all looks good, thanks! Tested-by: Brandon Maier <brandon.maier@collins.com> Reviewed-by: Brandon Maier <brandon.maier@collins.com> > +sha256 6415cfcfd74e943d6ae44f6c1edcae09bf6cd89410b03c4290bf1464a8368f84 xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz > diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig > index 21dfe2577a..58479c9f2d 100644 > --- a/configs/versal_vck190_defconfig > +++ b/configs/versal_vck190_defconfig > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" > diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig > index 253a6d2cff..4d3afc0e98 100644 > --- a/configs/versal_vpk180_defconfig > +++ b/configs/versal_vpk180_defconfig > @@ -6,7 +6,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vpk180-revA" > diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig > index f955a0c4ad..71a5d880b3 100644 > --- a/configs/zynq_microzed_defconfig > +++ b/configs/zynq_microzed_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig > index 75ebc2a3ba..f3fc32145b 100644 > --- a/configs/zynq_zc702_defconfig > +++ b/configs/zynq_zc702_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig > index ce539eefaf..f1c9bd6622 100644 > --- a/configs/zynq_zc706_defconfig > +++ b/configs/zynq_zc706_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig > index 925faeac8e..cada3bbd47 100644 > --- a/configs/zynq_zed_defconfig > +++ b/configs/zynq_zed_defconfig > @@ -9,7 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" > BR2_LINUX_KERNEL_UIMAGE=y > BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig > index dff49b9837..262e80a145 100644 > --- a/configs/zynqmp_kria_kd240_defconfig > +++ b/configs/zynqmp_kria_kd240_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k24-revA-sck-kd-g-revA" > diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig > index 24fdea9c30..65bba693a0 100644 > --- a/configs/zynqmp_kria_kr260_defconfig > +++ b/configs/zynqmp_kria_kr260_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" > diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig > index a16da66e38..22df2a4112 100644 > --- a/configs/zynqmp_kria_kv260_defconfig > +++ b/configs/zynqmp_kria_kv260_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > index 3f1726a13f..c2feb393de 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" > diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig > index b6d943333f..c26210b49c 100644 > --- a/configs/zynqmp_zcu104_defconfig > +++ b/configs/zynqmp_zcu104_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index c10ec70ed8..737a8454bb 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -5,7 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_merge_6.6.40)/xlnx_rebase_v6.6_LTS_merge_6.6.40.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="xilinx" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-08-19 10:01 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-08 13:23 [Buildroot] [PATCH v2 1/1] board/xilinx: bump to linux 6.6.40 Neal Frager via buildroot
2024-08-08 19:44 ` Brandon Maier via buildroot
2024-08-09 3:52 ` Frager, Neal via buildroot
2024-08-09 6:30 ` Thomas Petazzoni via buildroot
2024-08-09 6:39 ` Frager, Neal via buildroot
[not found] ` <3036afae-2027-4993-bb1f-acd3b312759e@amd.com>
2024-08-09 8:22 ` Frager, Neal via buildroot
2024-08-09 15:02 ` Brandon Maier via buildroot
2024-08-09 15:19 ` Frager, Neal via buildroot
2024-08-19 10:01 ` Luca Ceresoli via buildroot
2024-08-09 15:51 ` Brandon Maier via buildroot
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.