| Message ID | 20221113184933.47232-1-neal.frager@amd.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/1] board/zynqmp/kria/kv260/uboot.fragment: remove unnecessary CONFIG_MULTI_DTB_FIT option | expand |
On Sun, 13 Nov 2022 11:49:33 -0700 Neal Frager via buildroot <buildroot@buildroot.org> wrote: > This patch removes the CONFIG_MULTI_DTB_FIT u-boot option for the > zynqmp_kria_kv260_defconfig as it is not necessary. The post build > kv260.sh creates the proper u-boot.itb without needing this option. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > board/zynqmp/kria/kv260/uboot.fragment | 1 - > 1 file changed, 1 deletion(-) I've applied to master, after adding the following to the commit log: """ Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 """ For future patches, it would be nice if you could include such references if your patch is aimed at fixing a Gitlab CI failure, or an autobuilder failure. Thanks a lot! Thomas
Hi Thomas, > Le 13 nov. 2022 à 21:58, Thomas Petazzoni <thomas.petazzoni@bootlin.com> a écrit : > > On Sun, 13 Nov 2022 11:49:33 -0700 > Neal Frager via buildroot <buildroot@buildroot.org> wrote: > >> This patch removes the CONFIG_MULTI_DTB_FIT u-boot option for the >> zynqmp_kria_kv260_defconfig as it is not necessary. The post build >> kv260.sh creates the proper u-boot.itb without needing this option. >> >> Signed-off-by: Neal Frager <neal.frager@amd.com> >> --- >> board/zynqmp/kria/kv260/uboot.fragment | 1 - >> 1 file changed, 1 deletion(-) > > I've applied to master, after adding the following to the commit log: > > """ > Fixes: > > https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 > """ > > For future patches, it would be nice if you could include such > references if your patch is aimed at fixing a Gitlab CI failure, or an > autobuilder failure. Thanks a lot! > Yes, no problem. I will keep this in mind for the future. Best regards, Neal Frager AMD
Hi Thomas, > This patch removes the CONFIG_MULTI_DTB_FIT u-boot option for the > zynqmp_kria_kv260_defconfig as it is not necessary. The post build > kv260.sh creates the proper u-boot.itb without needing this option. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > board/zynqmp/kria/kv260/uboot.fragment | 1 - > 1 file changed, 1 deletion(-) > I've applied to master, after adding the following to the commit log: > """ > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 > """ I was too quick with this solution. If we remove the CONFIG_MULTI_DTB_FIT u-boot option, the generated u-boot.its file is wrong. With the wrong u-boot.its, the kv260.sh script generates a u-boot.itb with an incorrect device tree and all of the daughter card peripherals are missing. The SD card interface is thus missing which means that even though the zynqmp_kria_kv260_defconfig builds now, the image fails after loading u-boot. I am working on a new solution. Best regards, Neal Frager AMD
Hi Thomas, > This patch removes the CONFIG_MULTI_DTB_FIT u-boot option for the > zynqmp_kria_kv260_defconfig as it is not necessary. The post build > kv260.sh creates the proper u-boot.itb without needing this option. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > board/zynqmp/kria/kv260/uboot.fragment | 1 - > 1 file changed, 1 deletion(-) > I've applied to master, after adding the following to the commit log: > """ > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 > """ Could you add on the following patch? With this patch, the build generates a correct u-boot.itb without the CONFIG_MULTI_DTB_FIT u-boot option. https://patchwork.ozlabs.org/project/buildroot/patch/20221114135126.20201-1-neal.frager@amd.com/ Best regards, Neal Frager AMD
>>>>> "Thomas" == Thomas Petazzoni via buildroot <buildroot@buildroot.org> writes: > On Sun, 13 Nov 2022 11:49:33 -0700 > Neal Frager via buildroot <buildroot@buildroot.org> wrote: >> This patch removes the CONFIG_MULTI_DTB_FIT u-boot option for the >> zynqmp_kria_kv260_defconfig as it is not necessary. The post build >> kv260.sh creates the proper u-boot.itb without needing this option. >> >> Signed-off-by: Neal Frager <neal.frager@amd.com> >> --- >> board/zynqmp/kria/kv260/uboot.fragment | 1 - >> 1 file changed, 1 deletion(-) > I've applied to master, after adding the following to the commit log: > """ > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/3310463281 > """ > For future patches, it would be nice if you could include such > references if your patch is aimed at fixing a Gitlab CI failure, or an > autobuilder failure. Thanks a lot! Committed to 2022.08.x, thanks.
diff --git a/board/zynqmp/kria/kv260/uboot.fragment b/board/zynqmp/kria/kv260/uboot.fragment index 874eb470ac..0ed560c411 100644 --- a/board/zynqmp/kria/kv260/uboot.fragment +++ b/board/zynqmp/kria/kv260/uboot.fragment @@ -1,7 +1,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-smk-k26-revA" CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 CONFIG_DTB_RESELECT=y -CONFIG_MULTI_DTB_FIT=y CONFIG_DMA=y CONFIG_XILINX_DPDMA=y CONFIG_PHY=y
This patch removes the CONFIG_MULTI_DTB_FIT u-boot option for the zynqmp_kria_kv260_defconfig as it is not necessary. The post build kv260.sh creates the proper u-boot.itb without needing this option. Signed-off-by: Neal Frager <neal.frager@amd.com> --- board/zynqmp/kria/kv260/uboot.fragment | 1 - 1 file changed, 1 deletion(-)