Message ID | 20240612075559.436482-3-neal.frager@amd.com |
---|---|
State | Superseded, archived |
Headers | show |
Series | [v1,1/5] boot/xilinx-prebuilt: new boot package | expand |
On 2024.06.12 08:55, Neal Frager via buildroot wrote: > Migrate zynqmp defconfigs to xilinx-prebuilt. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > .checkpackageignore | 5 ----- > configs/zynqmp_kria_kr260_defconfig | 8 +++++++- > configs/zynqmp_kria_kv260_defconfig | 8 +++++++- > configs/zynqmp_zcu102_defconfig | 8 +++++++- > configs/zynqmp_zcu104_defconfig | 8 +++++++- > configs/zynqmp_zcu106_defconfig | 8 +++++++- > 6 files changed, 35 insertions(+), 10 deletions(-) > > diff --git a/.checkpackageignore b/.checkpackageignore > index eea412d01d..6d0011a299 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -362,11 +362,6 @@ configs/visionfive_defconfig lib_defconfig.ForceCheckHash > configs/wandboard_defconfig lib_defconfig.ForceCheckHash > configs/warp7_defconfig lib_defconfig.ForceCheckHash > configs/zynqmp_kria_kd240_defconfig lib_defconfig.ForceCheckHash > -configs/zynqmp_kria_kr260_defconfig lib_defconfig.ForceCheckHash > -configs/zynqmp_kria_kv260_defconfig lib_defconfig.ForceCheckHash > -configs/zynqmp_zcu102_defconfig lib_defconfig.ForceCheckHash > -configs/zynqmp_zcu104_defconfig lib_defconfig.ForceCheckHash > -configs/zynqmp_zcu106_defconfig lib_defconfig.ForceCheckHash > linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch lib_patch.Upstream > package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream > package/4th/0001-avoid-regen-during-install.patch lib_patch.Upstream > diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig > index 3bf269ab6b..b7b5b4d432 100644 > --- a/configs/zynqmp_kria_kr260_defconfig > +++ b/configs/zynqmp_kria_kr260_defconfig > @@ -31,10 +31,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kr260-kria/pmufw.elf" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > +BR2_TARGET_XILINX_PREBUILT_BOARD="kr260" > +BR2_TARGET_XILINX_PREBUILT_KRIA=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" > diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig > index 7b402e032c..a16da66e38 100644 > --- a/configs/zynqmp_kria_kv260_defconfig > +++ b/configs/zynqmp_kria_kv260_defconfig > @@ -31,10 +31,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kv260-kria/pmufw.elf" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > +BR2_TARGET_XILINX_PREBUILT_BOARD="kv260" > +BR2_TARGET_XILINX_PREBUILT_KRIA=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > index f40002f6d9..faee93b1c6 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -30,10 +30,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu102-zynqmp/pmufw.elf" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > +BR2_TARGET_XILINX_PREBUILT_BOARD="zcu102" > +BR2_TARGET_XILINX_PREBUILT_ZYNQMP=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" > diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig > index ef9c9bad49..466527695b 100644 > --- a/configs/zynqmp_zcu104_defconfig > +++ b/configs/zynqmp_zcu104_defconfig > @@ -30,10 +30,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu104-zynqmp/pmufw.elf" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > +BR2_TARGET_XILINX_PREBUILT_BOARD="zcu104" > +BR2_TARGET_XILINX_PREBUILT_ZYNQMP=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index 07c595436f..686b7f9f94 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -30,10 +30,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" > BR2_TARGET_UBOOT_ZYNQMP=y > -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu106-zynqmp/pmufw.elf" > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y > BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_XILINX_PREBUILT=y > +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" > +BR2_TARGET_XILINX_PREBUILT_BOARD="zcu106" > +BR2_TARGET_XILINX_PREBUILT_ZYNQMP=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" > -- > 2.25.1 Reviewed-by: Brandon Maier <brandon.maier@collins.com>
diff --git a/.checkpackageignore b/.checkpackageignore index eea412d01d..6d0011a299 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -362,11 +362,6 @@ configs/visionfive_defconfig lib_defconfig.ForceCheckHash configs/wandboard_defconfig lib_defconfig.ForceCheckHash configs/warp7_defconfig lib_defconfig.ForceCheckHash configs/zynqmp_kria_kd240_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_kria_kr260_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_kria_kv260_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_zcu102_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_zcu104_defconfig lib_defconfig.ForceCheckHash -configs/zynqmp_zcu106_defconfig lib_defconfig.ForceCheckHash linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch lib_patch.Upstream package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/4th/0001-avoid-regen-during-install.patch lib_patch.Upstream diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 3bf269ab6b..b7b5b4d432 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -31,10 +31,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kr260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="kr260" +BR2_TARGET_XILINX_PREBUILT_KRIA=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index 7b402e032c..a16da66e38 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -31,10 +31,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="kv260" +BR2_TARGET_XILINX_PREBUILT_KRIA=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index f40002f6d9..faee93b1c6 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -30,10 +30,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu102-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="zcu102" +BR2_TARGET_XILINX_PREBUILT_ZYNQMP=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index ef9c9bad49..466527695b 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -30,10 +30,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu104-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="zcu104" +BR2_TARGET_XILINX_PREBUILT_ZYNQMP=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 07c595436f..686b7f9f94 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -30,10 +30,16 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu106-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_XILINX_PREBUILT=y +BR2_TARGET_XILINX_PREBUILT_VERSION="xilinx_v2024.1" +BR2_TARGET_XILINX_PREBUILT_BOARD="zcu106" +BR2_TARGET_XILINX_PREBUILT_ZYNQMP=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches"
Migrate zynqmp defconfigs to xilinx-prebuilt. Signed-off-by: Neal Frager <neal.frager@amd.com> --- .checkpackageignore | 5 ----- configs/zynqmp_kria_kr260_defconfig | 8 +++++++- configs/zynqmp_kria_kv260_defconfig | 8 +++++++- configs/zynqmp_zcu102_defconfig | 8 +++++++- configs/zynqmp_zcu104_defconfig | 8 +++++++- configs/zynqmp_zcu106_defconfig | 8 +++++++- 6 files changed, 35 insertions(+), 10 deletions(-)