Message ID | 20241104081453.430619-2-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: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>
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
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(+)