| Message ID | 20240607094705.1962913-3-neal.frager@amd.com |
|---|---|
| State | Deferred |
| Headers | show |
| Series | [v12,1/3] boot/zynqmp-firmware: new boot firmware | expand |
Hi Neal, On Fri, Jun 07, 2024 at 10:47:05AM +0100, Neal Frager via buildroot wrote: > This patch migrates the zynqmp config files to use the new > zynqmp-firmware package for building the zynqmp pmufw from source. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > V4->V7: > - no changes > V7->V8: > - bump to xilinx_v2023.2 > V8->V9: > - add the new zynqmp defconfigs > - add BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH definition > V9->V10: > - no changes > V10->V11: > - BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is set by zynqmp-firmware > V11->V12: > - BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is set in each defconfig > --- > configs/zynqmp_kria_kr260_defconfig | 6 +++++- > configs/zynqmp_kria_kv260_defconfig | 6 +++++- > configs/zynqmp_zcu102_defconfig | 5 ++++- > configs/zynqmp_zcu104_defconfig | 5 ++++- > configs/zynqmp_zcu106_defconfig | 5 ++++- > 5 files changed, 22 insertions(+), 5 deletions(-) > > diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig > index 3bf269ab6b..3f475af882 100644 > --- a/configs/zynqmp_kria_kr260_defconfig > +++ b/configs/zynqmp_kria_kr260_defconfig > @@ -31,10 +31,14 @@ 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_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_UBOOT_ZYNQMP_PMUFW_SOURCE=y > +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" > +BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS="-DK26_SOM" > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" > 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 7b402e032c..313b324a13 100644 > --- a/configs/zynqmp_kria_kv260_defconfig > +++ b/configs/zynqmp_kria_kv260_defconfig > @@ -31,10 +31,14 @@ 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_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_UBOOT_ZYNQMP_PMUFW_SOURCE=y > +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" > +BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS="-DK26_SOM" > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig > index f40002f6d9..302ad1394e 100644 > --- a/configs/zynqmp_zcu102_defconfig > +++ b/configs/zynqmp_zcu102_defconfig > @@ -30,10 +30,13 @@ 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_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y > +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" > 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 ef9c9bad49..059858fff6 100644 > --- a/configs/zynqmp_zcu104_defconfig > +++ b/configs/zynqmp_zcu104_defconfig > @@ -30,10 +30,13 @@ 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_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y > +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig > index 07c595436f..39dd5c8ab3 100644 > --- a/configs/zynqmp_zcu106_defconfig > +++ b/configs/zynqmp_zcu106_defconfig > @@ -30,10 +30,13 @@ 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_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" > BR2_TARGET_UBOOT_FORMAT_ITB=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y > +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y > +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > Reviewed-by: Brandon Maier <brandon.maier@collins.com> Thanks, Brandon Maier
diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 3bf269ab6b..3f475af882 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -31,10 +31,14 @@ 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_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_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" +BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS="-DK26_SOM" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" 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 7b402e032c..313b324a13 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -31,10 +31,14 @@ 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_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_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" +BR2_TARGET_ZYNQMP_FIRMWARE_CUSTOM_CFLAGS="-DK26_SOM" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index f40002f6d9..302ad1394e 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -30,10 +30,13 @@ 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_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" 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 ef9c9bad49..059858fff6 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -30,10 +30,13 @@ 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_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 07c595436f..39dd5c8ab3 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -30,10 +30,13 @@ 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_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_SOURCE=y +BR2_TARGET_ZYNQMP_FIRMWARE_VERSION="xilinx_v2024.1" +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y
This patch migrates the zynqmp config files to use the new zynqmp-firmware package for building the zynqmp pmufw from source. Signed-off-by: Neal Frager <neal.frager@amd.com> --- V4->V7: - no changes V7->V8: - bump to xilinx_v2023.2 V8->V9: - add the new zynqmp defconfigs - add BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH definition V9->V10: - no changes V10->V11: - BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is set by zynqmp-firmware V11->V12: - BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH is set in each defconfig --- configs/zynqmp_kria_kr260_defconfig | 6 +++++- configs/zynqmp_kria_kv260_defconfig | 6 +++++- configs/zynqmp_zcu102_defconfig | 5 ++++- configs/zynqmp_zcu104_defconfig | 5 ++++- configs/zynqmp_zcu106_defconfig | 5 ++++- 5 files changed, 22 insertions(+), 5 deletions(-)