| Message ID | 20241104081453.430619-1-neal.frager@amd.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [v1,1/2] configs/versal: re-adding xilinx-prebuilt version | expand |
On Mon, 4 Nov 2024 08:14:52 +0000 Neal Frager <neal.frager@amd.com> wrote: > The regenerate all defconfigs commit removed the xilinx-prebuilt version from > the versal defconfigs. If the version is not defined in the defconfig, then > it is not possible to change the xilinx-prebuilt default version number > independently of the board configs. For this reason, this patch re-adds > the xilinx-prebuilt version to the versal defconfigs. > > Also, the vck190 board name has been added to the versal_vck190_defconfig in > case the default versal board name ever changes. > > https://github.com/buildroot/buildroot/commit/edc0a6b1a43689fb832bc024b5997312e0770e99 > > Signed-off-by: Neal Frager <neal.frager@amd.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Hi Neal, On Mon Nov 4, 2024 at 8:14 AM UTC, Neal Frager via buildroot wrote: > The regenerate all defconfigs commit removed the xilinx-prebuilt version from > the versal defconfigs. If the version is not defined in the defconfig, then > it is not possible to change the xilinx-prebuilt default version number > independently of the board configs. For this reason, this patch re-adds > the xilinx-prebuilt version to the versal defconfigs. > > Also, the vck190 board name has been added to the versal_vck190_defconfig in > case the default versal board name ever changes. > > https://github.com/buildroot/buildroot/commit/edc0a6b1a43689fb832bc024b5997312e0770e99 This commit refers to the new "Rules for defconfigs"[1]. Those say that defconfigs should now be formatted by `make savedefconfig`. So setting these options manually wouldn't be consistent. Yann had a similar problem for the Linux package which they fixed by setting the default version to the oldest supported[2]. So we could set the xilinx-prebuilt default to "xilinx_v2023.1" and then set it in each config to 2024.1. I don't know of a solution for the board name, but the default shouldn't be changing normally. [1] https://elinux.org/Buildroot:DeveloperDaysELCE2024#Rules_for_defconfigs [2] https://github.com/buildroot/buildroot/commit/b2fdc16c47 Thanks, Brandon Maier > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > configs/versal_vck190_defconfig | 2 ++ > configs/versal_vpk180_defconfig | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig > index 697b6c5169..448195d6ac 100644 > --- a/configs/versal_vck190_defconfig > +++ b/configs/versal_vck190_defconfig > @@ -35,7 +35,9 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y > BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" > BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > BR2_TARGET_XILINX_PREBUILT_VERSAL=y > +BR2_TARGET_XILINX_PREBUILT_BOARD="vck190" > BR2_PACKAGE_HOST_BOOTGEN=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig > index 9fc694a898..a4a6ed98ff 100644 > --- a/configs/versal_vpk180_defconfig > +++ b/configs/versal_vpk180_defconfig > @@ -35,6 +35,7 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y > BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vpk180-revA" > BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > BR2_TARGET_XILINX_PREBUILT_VERSAL=y > BR2_TARGET_XILINX_PREBUILT_BOARD="vpk180" > BR2_PACKAGE_HOST_BOOTGEN=y
Hi Brandon, all, > The regenerate all defconfigs commit removed the xilinx-prebuilt version from > the versal defconfigs. If the version is not defined in the defconfig, then > it is not possible to change the xilinx-prebuilt default version number > independently of the board configs. For this reason, this patch re-adds > the xilinx-prebuilt version to the versal defconfigs. > > Also, the vck190 board name has been added to the versal_vck190_defconfig in > case the default versal board name ever changes. > > https://github.com/buildroot/buildroot/commit/edc0a6b1a43689fb832bc024b5997312e0770e99 > This commit refers to the new "Rules for defconfigs"[1]. Those say that > defconfigs should now be formatted by `make savedefconfig`. So setting > these options manually wouldn't be consistent. Thanks for clarifying. I had overlooked that. > Yann had a similar problem for the Linux package which they fixed by > setting the default version to the oldest supported[2]. So we could set > the xilinx-prebuilt default to "xilinx_v2023.1" and then set it > in each config to 2024.1. I am not sure I like this approach for xilinx-prebuilt for two reasons. 1. The kd240 and vek280 boards were not released yet with the xilinx_v2023.1 version, so going back in time with the default could cause build issues. 2. We would need a hash for the default version, and I would prefer not to promote the use of older software versions. > I don't know of a solution for the board name, but the default shouldn't > be changing normally. Agreed. The defconfigs can use the default board names when applicable. > [1] https://elinux.org/Buildroot:DeveloperDaysELCE2024#Rules_for_defconfigs > [2] https://github.com/buildroot/buildroot/commit/b2fdc16c47 Now that I think of it, this patch set is not necessary. In a few weeks, when xilinx_v2024.2 is released, I will bump all the defconfigs to the new version including the version number in each defconfig. Only after all the defconfigs have been bumped to xilinx_v2024.2, I will then bump the default version of the xilinx-prebuilt to xilinx_v2024.2 and we can then remove the versions from the defconfigs again. I can then repeat this process every 6 months when a new version is released. Does anyone have thoughts regarding this solution? Best regards, Neal Frager AMD > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > configs/versal_vck190_defconfig | 2 ++ > configs/versal_vpk180_defconfig | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig > index 697b6c5169..448195d6ac 100644 > --- a/configs/versal_vck190_defconfig > +++ b/configs/versal_vck190_defconfig > @@ -35,7 +35,9 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y > BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" > BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > BR2_TARGET_XILINX_PREBUILT_VERSAL=y > +BR2_TARGET_XILINX_PREBUILT_BOARD="vck190" > BR2_PACKAGE_HOST_BOOTGEN=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig > index 9fc694a898..a4a6ed98ff 100644 > --- a/configs/versal_vpk180_defconfig > +++ b/configs/versal_vpk180_defconfig > @@ -35,6 +35,7 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y > BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y > BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vpk180-revA" > BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > BR2_TARGET_XILINX_PREBUILT_VERSAL=y > BR2_TARGET_XILINX_PREBUILT_BOARD="vpk180" > BR2_PACKAGE_HOST_BOOTGEN=y
diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 697b6c5169..448195d6ac 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -35,7 +35,9 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" BR2_TARGET_XILINX_PREBUILT_VERSAL=y +BR2_TARGET_XILINX_PREBUILT_BOARD="vck190" BR2_PACKAGE_HOST_BOOTGEN=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/versal_vpk180_defconfig b/configs/versal_vpk180_defconfig index 9fc694a898..a4a6ed98ff 100644 --- a/configs/versal_vpk180_defconfig +++ b/configs/versal_vpk180_defconfig @@ -35,6 +35,7 @@ BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vpk180-revA" BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" BR2_TARGET_XILINX_PREBUILT_VERSAL=y BR2_TARGET_XILINX_PREBUILT_BOARD="vpk180" BR2_PACKAGE_HOST_BOOTGEN=y
The regenerate all defconfigs commit removed the xilinx-prebuilt version from the versal defconfigs. If the version is not defined in the defconfig, then it is not possible to change the xilinx-prebuilt default version number independently of the board configs. For this reason, this patch re-adds the xilinx-prebuilt version to the versal defconfigs. Also, the vck190 board name has been added to the versal_vck190_defconfig in case the default versal board name ever changes. https://github.com/buildroot/buildroot/commit/edc0a6b1a43689fb832bc024b5997312e0770e99 Signed-off-by: Neal Frager <neal.frager@amd.com> --- configs/versal_vck190_defconfig | 2 ++ configs/versal_vpk180_defconfig | 1 + 2 files changed, 3 insertions(+)