diff options
8 files changed, 26 insertions, 26 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc index 8d421fb3..fb45b73f 100644 --- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc +++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc @@ -9,8 +9,8 @@ SOC_FAMILY ?= "zynqmp" SOC_VARIANT ?= "eg" -MACHINEOVERRIDES_prepend_zynqmpeg = "mali400:" -MACHINEOVERRIDES_prepend_zynqmpev = "mali400:vcu:" +MACHINEOVERRIDES_prepend_zynqmp-eg = "mali400:" +MACHINEOVERRIDES_prepend_zynqmp-ev = "mali400:vcu:" require soc-tune-include.inc require xilinx-soc-family.inc diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb index ed6ff60f..0e91ae79 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb @@ -102,16 +102,16 @@ NAND_RAMDISK_SIZE ?= "0x3200000" ## For zynqMP ## Load boot.scr at 0x3E80000 -> 62MB of QSPI/NAND Memory QSPI_KERNEL_OFFSET ?= "0xF00000" -QSPI_KERNEL_OFFSET_zynqmpdr ?= "0x3F00000" +QSPI_KERNEL_OFFSET_zynqmp-dr ?= "0x3F00000" QSPI_RAMDISK_OFFSET ?= "0x4000000" -QSPI_RAMDISK_OFFSET_zynqmpdr ?= "0x5D00000" +QSPI_RAMDISK_OFFSET_zynqmp-dr ?= "0x5D00000" NAND_KERNEL_OFFSET_zynqmp ?= "0x4100000" NAND_RAMDISK_OFFSET_zynqmp ?= "0x7800000" QSPI_KERNEL_SIZE_zynqmp ?= "0x1D00000" QSPI_RAMDISK_SIZE ?= "0x4000000" -QSPI_RAMDISK_SIZE_zynqmpdr ?= "0x1D00000" +QSPI_RAMDISK_SIZE_zynqmp-dr ?= "0x1D00000" ## For versal ## Load boot.scr at 0x7F80000 -> 127MB of QSPI/NAND Memory @@ -134,7 +134,7 @@ NAND_KERNEL_IMAGE ?= "image.ub" QSPI_FIT_IMAGE_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('QSPI_FIT_IMAGE_OFFSET'))}" QSPI_FIT_IMAGE_OFFSET ?= "0x10000000" QSPI_FIT_IMAGE_SIZE ?= "0x6400000" -QSPI_FIT_IMAGE_SIZE_zynqmpdr ?= "0x3F00000" +QSPI_FIT_IMAGE_SIZE_zynqmp-dr ?= "0x3F00000" QSPI_FIT_IMAGE_SIZE_zynq ?= "0xF00000" QSPI_FIT_IMAGE_SIZE_microblaze ?= "0xF00000" diff --git a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend index c3f12f63..bfade4aa 100644 --- a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend @@ -2,8 +2,8 @@ PACKAGECONFIG_zynqmp += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb egl glesv2" # OpenGL comes from libmali on ev/eg -DEPENDS_append_zynqmpev = " libmali-xlnx" -DEPENDS_append_zynqmpeg = " libmali-xlnx" +DEPENDS_append_zynqmp-ev = " libmali-xlnx" +DEPENDS_append_zynqmp-eg = " libmali-xlnx" -PACKAGE_ARCH_zynqmpev = "${SOC_VARIANT_ARCH}" -PACKAGE_ARCH_zynqmpeg = "${SOC_VARIANT_ARCH}" +PACKAGE_ARCH_zynqmp-ev = "${SOC_VARIANT_ARCH}" +PACKAGE_ARCH_zynqmp-eg = "${SOC_VARIANT_ARCH}" diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb index 5c45b2ba..f92e3095 100644 --- a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb +++ b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb @@ -27,8 +27,8 @@ SRC_URI = " \ " COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_zynqmpeg = "zynqmpeg" -COMPATIBLE_MACHINE_zynqmpev = "zynqmpev" +COMPATIBLE_MACHINE_zynqmp-eg = "zynqmp-eg" +COMPATIBLE_MACHINE_zynqmp-ev = "zynqmp-ev" PACKAGE_ARCH = "${SOC_VARIANT_ARCH}" diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb index 747ec724..f16758e8 100644 --- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb +++ b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb @@ -37,8 +37,8 @@ PARALLEL_MAKE = "-j 1" S = "${WORKDIR}/DX910-SW-99002-${PV}/driver/src/devicedrv/mali" COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_zynqmpeg = "zynqmpeg" -COMPATIBLE_MACHINE_zynqmpev = "zynqmpev" +COMPATIBLE_MACHINE_zynqmp-eg = "zynqmp-eg" +COMPATIBLE_MACHINE_zynqmp-ev = "zynqmp-ev" PACKAGE_ARCH = "${SOC_VARIANT_ARCH}" diff --git a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend index febf1636..9644aa1b 100644 --- a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -2,8 +2,8 @@ DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}" PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}" -DEPENDS_append_zynqmpev = " ${DEPENDS_MALI_XLNX}" -DEPENDS_append_zynqmpeg = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmp-ev = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmp-eg = " ${DEPENDS_MALI_XLNX}" -PACKAGE_ARCH_zynqmpev = "${PKG_ARCH_XLNX}" -PACKAGE_ARCH_zynqmpeg = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmp-ev = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmp-eg = "${PKG_ARCH_XLNX}" diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend index febf1636..9644aa1b 100644 --- a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend @@ -2,8 +2,8 @@ DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}" PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}" -DEPENDS_append_zynqmpev = " ${DEPENDS_MALI_XLNX}" -DEPENDS_append_zynqmpeg = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmp-ev = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmp-eg = " ${DEPENDS_MALI_XLNX}" -PACKAGE_ARCH_zynqmpev = "${PKG_ARCH_XLNX}" -PACKAGE_ARCH_zynqmpeg = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmp-ev = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmp-eg = "${PKG_ARCH_XLNX}" diff --git a/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend index febf1636..9644aa1b 100644 --- a/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend +++ b/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -2,8 +2,8 @@ DEPENDS_MALI_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', 'libmali-xlnx', '', d)}" PKG_ARCH_XLNX = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}" -DEPENDS_append_zynqmpev = " ${DEPENDS_MALI_XLNX}" -DEPENDS_append_zynqmpeg = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmp-ev = " ${DEPENDS_MALI_XLNX}" +DEPENDS_append_zynqmp-eg = " ${DEPENDS_MALI_XLNX}" -PACKAGE_ARCH_zynqmpev = "${PKG_ARCH_XLNX}" -PACKAGE_ARCH_zynqmpeg = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmp-ev = "${PKG_ARCH_XLNX}" +PACKAGE_ARCH_zynqmp-eg = "${PKG_ARCH_XLNX}" |