From 2f7eeaadc25fc6e5e9deb9ebe5145e15bd631d1c Mon Sep 17 00:00:00 2001 From: Jaewon Lee Date: Wed, 27 Mar 2019 10:50:40 -0700 Subject: Update recipes for 2019.2 release Update u-boot, kernel, ATF, QEMU, pmu-firmware, multimedia recipes for 2019.2 release. The patch also upgrades gcc microblaze, newlib and libgloss versions. Signed-off-by: Jaewon Lee Signed-off-by: Sai Hari Chandana Kalluri Signed-off-by: Manjukumar Matha --- meta-xilinx-standalone/conf/layer.conf | 3 +- .../newlib/libgloss_3.0.0.bbappend | 10 --- .../newlib/libgloss_3.1.0.bbappend | 10 +++ .../newlib/newlib_3.0.0.bbappend | 4 -- .../newlib/newlib_3.1.0.bbappend | 4 ++ .../pmu-firmware/pmu-firmware_2019.1.bb | 71 ---------------------- .../pmu-firmware/pmu-firmware_2019.2.bb | 71 ++++++++++++++++++++++ 7 files changed, 87 insertions(+), 86 deletions(-) delete mode 100644 meta-xilinx-standalone/recipes-standalone/newlib/libgloss_3.0.0.bbappend create mode 100644 meta-xilinx-standalone/recipes-standalone/newlib/libgloss_3.1.0.bbappend delete mode 100644 meta-xilinx-standalone/recipes-standalone/newlib/newlib_3.0.0.bbappend create mode 100644 meta-xilinx-standalone/recipes-standalone/newlib/newlib_3.1.0.bbappend delete mode 100644 meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.1.bb create mode 100644 meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.2.bb (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf index 16bfb74a..db3c2853 100644 --- a/meta-xilinx-standalone/conf/layer.conf +++ b/meta-xilinx-standalone/conf/layer.conf @@ -11,4 +11,5 @@ BBFILE_PRIORITY_xilinx-standalone = "5" LAYERDEPENDS_xilinx-standalone = "core xilinx" -LAYERSERIES_COMPAT_xilinx-standalone = "warrior" +LAYERSERIES_COMPAT_xilinx-standalone = "zeus" +XILINX_RELEASE_VERSION = "v2019.2" diff --git a/meta-xilinx-standalone/recipes-standalone/newlib/libgloss_3.0.0.bbappend b/meta-xilinx-standalone/recipes-standalone/newlib/libgloss_3.0.0.bbappend deleted file mode 100644 index fc4db884..00000000 --- a/meta-xilinx-standalone/recipes-standalone/newlib/libgloss_3.0.0.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -do_configure_prepend_microblaze() { - # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) - export CC="${CC} -L${S}/libgloss/microblaze" -} - - -# We use libgloss as if it was libxil, to avoid linking issues -do_install_append_zynqmp-pmu(){ - cp ${D}/${libdir}/libgloss.a ${D}/${libdir}/libxil.a -} diff --git a/meta-xilinx-standalone/recipes-standalone/newlib/libgloss_3.1.0.bbappend b/meta-xilinx-standalone/recipes-standalone/newlib/libgloss_3.1.0.bbappend new file mode 100644 index 00000000..fc4db884 --- /dev/null +++ b/meta-xilinx-standalone/recipes-standalone/newlib/libgloss_3.1.0.bbappend @@ -0,0 +1,10 @@ +do_configure_prepend_microblaze() { + # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) + export CC="${CC} -L${S}/libgloss/microblaze" +} + + +# We use libgloss as if it was libxil, to avoid linking issues +do_install_append_zynqmp-pmu(){ + cp ${D}/${libdir}/libgloss.a ${D}/${libdir}/libxil.a +} diff --git a/meta-xilinx-standalone/recipes-standalone/newlib/newlib_3.0.0.bbappend b/meta-xilinx-standalone/recipes-standalone/newlib/newlib_3.0.0.bbappend deleted file mode 100644 index e5249ab0..00000000 --- a/meta-xilinx-standalone/recipes-standalone/newlib/newlib_3.0.0.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -do_configure_prepend_microblaze() { - # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) - export CC="${CC} -L${S}/libgloss/microblaze" -} diff --git a/meta-xilinx-standalone/recipes-standalone/newlib/newlib_3.1.0.bbappend b/meta-xilinx-standalone/recipes-standalone/newlib/newlib_3.1.0.bbappend new file mode 100644 index 00000000..e5249ab0 --- /dev/null +++ b/meta-xilinx-standalone/recipes-standalone/newlib/newlib_3.1.0.bbappend @@ -0,0 +1,4 @@ +do_configure_prepend_microblaze() { + # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) + export CC="${CC} -L${S}/libgloss/microblaze" +} diff --git a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.1.bb b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.1.bb deleted file mode 100644 index 030de054..00000000 --- a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.1.bb +++ /dev/null @@ -1,71 +0,0 @@ -inherit deploy - -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://../../../../license.txt;md5=e9b6d01d45faccfbf05d8caea53f0a35" - -XILINX_RELEASE_VERSION = "v2019.1" -SRCREV = "26c14d9861010a0e3a55c73fb79efdb816eb42ca" -PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}" - -SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1" - -COMPATIBLE_HOST = "microblaze.*-elf" -COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE_zynqmp-pmu = "zynqmp-pmu" - - -S = "${WORKDIR}/git/lib/sw_apps/zynqmp_pmufw/src" - -# The makefile does not handle parallelization -PARALLEL_MAKE = "" - -do_configure() { - # manually do the copy_bsp step first, so as to be able to fix up use of - # mb-* commands - ${S}/../misc/copy_bsp.sh -} - -COMPILER = "${CC}" -COMPILER_FLAGS = "-O2 -c" -EXTRA_COMPILER_FLAGS = "-g -Wall -Wextra -Os -flto -ffat-lto-objects" -ARCHIVER = "${AR}" - -BSP_DIR ?= "${S}/../misc/zynqmp_pmufw_bsp" -BSP_TARGETS_DIR ?= "${BSP_DIR}/psu_pmu_0/libsrc" - -def bsp_make_vars(d): - s = ["COMPILER", "CC", "COMPILER_FLAGS", "EXTRA_COMPILER_FLAGS", "ARCHIVER", "AR", "AS"] - return " ".join(["\"%s=%s\"" % (v, d.getVar(v)) for v in s]) - -do_compile() { - # the Makefile in ${S}/../misc/Makefile, does not handle CC, AR, AS, etc - # properly. So do its job manually. Preparing the includes first, then libs. - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)} - done - - # --build-id=none is required due to linker script not defining a location for it. - # Again, recipe-systoot include is necessary - oe_runmake CC="${CC}" CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" -} - -do_install() { - : -} - -PMU_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -PMU_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME" - -do_deploy() { - install -Dm 0644 ${B}/executable.elf ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.elf - ln -sf ${PMU_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf - ${OBJCOPY} -O binary ${B}/executable.elf ${B}/executable.bin - install -m 0644 ${B}/executable.bin ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.bin - ln -sf ${PMU_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin -} - -addtask deploy before do_build after do_install - diff --git a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.2.bb b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.2.bb new file mode 100644 index 00000000..3d0142f8 --- /dev/null +++ b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.2.bb @@ -0,0 +1,71 @@ +inherit deploy + +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://../../../../license.txt;md5=39ab6ab638f4d1836ba994ec6852de94" + +XILINX_RELEASE_VERSION = "v2019.2" +SRCREV = "e8db5fb118229fdc621e0ec7848641a23bf60998" +PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}" + +SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1" + +COMPATIBLE_HOST = "microblaze.*-elf" +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE_zynqmp-pmu = "zynqmp-pmu" + + +S = "${WORKDIR}/git/lib/sw_apps/zynqmp_pmufw/src" + +# The makefile does not handle parallelization +PARALLEL_MAKE = "" + +do_configure() { + # manually do the copy_bsp step first, so as to be able to fix up use of + # mb-* commands + ${S}/../misc/copy_bsp.sh +} + +COMPILER = "${CC}" +COMPILER_FLAGS = "-O2 -c" +EXTRA_COMPILER_FLAGS = "-g -Wall -Wextra -Os -flto -ffat-lto-objects" +ARCHIVER = "${AR}" + +BSP_DIR ?= "${S}/../misc/zynqmp_pmufw_bsp" +BSP_TARGETS_DIR ?= "${BSP_DIR}/psu_pmu_0/libsrc" + +def bsp_make_vars(d): + s = ["COMPILER", "CC", "COMPILER_FLAGS", "EXTRA_COMPILER_FLAGS", "ARCHIVER", "AR", "AS"] + return " ".join(["\"%s=%s\"" % (v, d.getVar(v)) for v in s]) + +do_compile() { + # the Makefile in ${S}/../misc/Makefile, does not handle CC, AR, AS, etc + # properly. So do its job manually. Preparing the includes first, then libs. + for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do + oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} + done + for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do + oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)} + done + + # --build-id=none is required due to linker script not defining a location for it. + # Again, recipe-systoot include is necessary + oe_runmake CC="${CC}" CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" +} + +do_install() { + : +} + +PMU_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" +PMU_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME" + +do_deploy() { + install -Dm 0644 ${B}/executable.elf ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.elf + ln -sf ${PMU_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf + ${OBJCOPY} -O binary ${B}/executable.elf ${B}/executable.bin + install -m 0644 ${B}/executable.bin ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.bin + ln -sf ${PMU_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin +} + +addtask deploy before do_build after do_install + -- cgit v1.2.3-54-g00ecf