From 73c6066bda9bee56a459a09b5273ead84c7d5815 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 21 Jan 2025 10:22:21 +0000 Subject: [PATCH] configs/zynqmp_*: migrate to xilinx-embeddedsw Migrate zynqmp defconfigs to xilinx-embeddedsw package for building zynqmp pmufw. Signed-off-by: Neal Frager Tested-by: Luca Ceresoli [Luca: Tested on Kria KV260 starter kit] Reviewed-by: Luca Ceresoli Signed-off-by: Julien Olivain --- configs/zynqmp_kria_kd240_defconfig | 10 ++++++---- configs/zynqmp_kria_kr260_defconfig | 9 ++++++--- configs/zynqmp_kria_kv260_defconfig | 10 ++++++---- configs/zynqmp_zcu102_defconfig | 8 +++++--- configs/zynqmp_zcu104_defconfig | 9 +++++---- configs/zynqmp_zcu106_defconfig | 9 +++++---- 6 files changed, 33 insertions(+), 22 deletions(-) diff --git a/configs/zynqmp_kria_kd240_defconfig b/configs/zynqmp_kria_kd240_defconfig index 38a5aa378a..6a6ed87dff 100644 --- a/configs/zynqmp_kria_kd240_defconfig +++ b/configs/zynqmp_kria_kd240_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kd240/kd240.sh" @@ -35,12 +37,12 @@ BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=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_KRIA=y -BR2_TARGET_XILINX_PREBUILT_BOARD="kd240" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS="-DK24_SOM" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index a5d308a4d5..e679010d8a 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kr260/kr260.sh" @@ -35,11 +37,12 @@ BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=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_KRIA=y +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS="-DK26_SOM" 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 711f43c3a6..353ec165d3 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" @@ -35,12 +37,12 @@ BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=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_KRIA=y -BR2_TARGET_XILINX_PREBUILT_BOARD="kv260" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW_USER_CFLAGS="-DK26_SOM" 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 849f5bd811..5be8947ba3 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" @@ -34,11 +36,11 @@ BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=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.2" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y 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 c52bac1462..64d177b8d1 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" @@ -34,12 +36,11 @@ BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=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.2" -BR2_TARGET_XILINX_PREBUILT_BOARD="zcu104" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y 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 2f3edf7972..6fa078a84f 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,5 +1,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y +BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf" BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" @@ -34,12 +36,11 @@ BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW_PREBUILT=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW_EMBEDDEDSW=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.2" -BR2_TARGET_XILINX_PREBUILT_BOARD="zcu106" +BR2_TARGET_XILINX_EMBEDDEDSW=y +BR2_TARGET_XILINX_EMBEDDEDSW_ZYNQMP_PMUFW=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y