[Buildroot] [PATCH v1 1/2] configs/versal: re-adding xilinx-prebuilt version

[Buildroot] [PATCH v1 1/2] configs/versal: re-adding xilinx-prebuilt version

[Neal Frager via buildroot]

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(+)

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
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v1 2/2] configs/zynqmp: re-adding xilinx-prebuilt version

[Neal Frager via buildroot]

The regenerate all defconfigs commit removed the xilinx-prebuilt version from
the zynqmp 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 zynqmp defconfigs.

Also, the zcu102 board name has been added to the zynqmp_zcu102_defconfig in
case the default zynqmp board name ever changes.

And, the kr260 board name has been added to the zynqmp_kria_kr260_defconfig
in case the default kria board name ever changes.

https://github.com/buildroot/buildroot/commit/edc0a6b1a43689fb832bc024b5997312e0770e99

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 configs/zynqmp_kria_kd240_defconfig | 1 +
 configs/zynqmp_kria_kr260_defconfig | 2 ++
 configs/zynqmp_kria_kv260_defconfig | 1 +
 configs/zynqmp_zcu102_defconfig     | 2 ++
 configs/zynqmp_zcu104_defconfig     | 1 +
 configs/zynqmp_zcu106_defconfig     | 1 +
 6 files changed, 8 insertions(+)

diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig
index 8cbc172a41..b40923b337 100644
--- a/configs/zynqmp_kria_kd240_defconfig
+++ b/configs/zynqmp_kria_kd240_defconfig
@@ -39,6 +39,7 @@ BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y
 BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kd240/pm_cfg_obj.c"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k24-revA"
 BR2_TARGET_XILINX_PREBUILT=y
+BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1"
 BR2_TARGET_XILINX_PREBUILT_KRIA=y
 BR2_TARGET_XILINX_PREBUILT_BOARD="kd240"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig
index d5a292b143..c802443e74 100644
--- a/configs/zynqmp_kria_kr260_defconfig
+++ b/configs/zynqmp_kria_kr260_defconfig
@@ -39,7 +39,9 @@ BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y
 BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA"
 BR2_TARGET_XILINX_PREBUILT=y
+BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1"
 BR2_TARGET_XILINX_PREBUILT_KRIA=y
+BR2_TARGET_XILINX_PREBUILT_BOARD="kr260"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig
index 06efa86e14..f42ae90f8b 100644
--- a/configs/zynqmp_kria_kv260_defconfig
+++ b/configs/zynqmp_kria_kv260_defconfig
@@ -39,6 +39,7 @@ BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y
 BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA"
 BR2_TARGET_XILINX_PREBUILT=y
+BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1"
 BR2_TARGET_XILINX_PREBUILT_KRIA=y
 BR2_TARGET_XILINX_PREBUILT_BOARD="kv260"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig
index c7a25eefb1..d3bba54d0b 100644
--- a/configs/zynqmp_zcu102_defconfig
+++ b/configs/zynqmp_zcu102_defconfig
@@ -38,6 +38,8 @@ BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y
 BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0"
 BR2_TARGET_XILINX_PREBUILT=y
+BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1"
+BR2_TARGET_XILINX_PREBUILT_BOARD="zcu102"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig
index bcd6b16488..5a0d68204a 100644
--- a/configs/zynqmp_zcu104_defconfig
+++ b/configs/zynqmp_zcu104_defconfig
@@ -38,6 +38,7 @@ BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y
 BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu104-revC"
 BR2_TARGET_XILINX_PREBUILT=y
+BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1"
 BR2_TARGET_XILINX_PREBUILT_BOARD="zcu104"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig
index 3a13834c96..bdd2cc12d0 100644
--- a/configs/zynqmp_zcu106_defconfig
+++ b/configs/zynqmp_zcu106_defconfig
@@ -38,6 +38,7 @@ BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y
 BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c"
 BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-rev1.0"
 BR2_TARGET_XILINX_PREBUILT=y
+BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1"
 BR2_TARGET_XILINX_PREBUILT_BOARD="zcu106"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/2] configs/versal: re-adding xilinx-prebuilt version

[Luca Ceresoli via buildroot]

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>

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 2/2] configs/zynqmp: re-adding xilinx-prebuilt version

[Luca Ceresoli via buildroot]

On Mon, 4 Nov 2024 08:14:53 +0000
Neal Frager <neal.frager@amd.com> wrote:

> From: Neal Frager <neal.frager@amd.com>
> To: <buildroot@buildroot.org>
> CC: <luca.ceresoli@bootlin.com>, <thomas.petazzoni@bootlin.com>,  <peter@korsgaard.com>, <michal.simek@amd.com>, <ju.o@free.fr>,  <brandon.maier@collins.com>, <romain.naour@smile.fr>,  <yann.morin.1998@free.fr>, Neal Frager <neal.frager@amd.com>
> Subject: [PATCH v1 2/2] configs/zynqmp: re-adding xilinx-prebuilt version
> Date: Mon, 4 Nov 2024 08:14:53 +0000
> X-Mailer: git-send-email 2.25.1
> 
> The regenerate all defconfigs commit removed the xilinx-prebuilt version from
> the zynqmp 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 zynqmp defconfigs.
> 
> Also, the zcu102 board name has been added to the zynqmp_zcu102_defconfig in
> case the default zynqmp board name ever changes.
> 
> And, the kr260 board name has been added to the zynqmp_kria_kr260_defconfig
> in case the default kria 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>


-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/2] configs/versal: re-adding xilinx-prebuilt version

[Brandon Maier via buildroot]

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
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/2] configs/versal: re-adding xilinx-prebuilt version

[Frager, Neal via buildroot]

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
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot