From 1d8f0c9985be7d5488abb93acaa8ee76d2b04a05 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 7 Dec 2022 18:55:01 -0800 Subject: meta-xilinx-standalone: Sync embeddedsw and git version Update the integration to match latest changes. Signed-off-by: Mark Hatle --- .../recipes-bsp/embeddedsw/fsbl-firmware_git.bb | 1 + .../recipes-bsp/embeddedsw/plm-firmware_git.bb | 42 ++-------------------- .../recipes-bsp/embeddedsw/pmu-firmware_git.bb | 34 ++---------------- .../recipes-bsp/embeddedsw/psm-firmware_git.bb | 42 ++-------------------- 4 files changed, 10 insertions(+), 109 deletions(-) (limited to 'meta-xilinx-standalone') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb index 697431ad..0094384a 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb @@ -6,6 +6,7 @@ require fsbl-firmware.inc FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ + file://makefile-skip-copy_bsp.sh.patch \ file://fsbl-fixups.patch \ " diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb index af906e5e..2d06fa6a 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware_git.bb @@ -7,49 +7,13 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ + file://0001-versal_fw-Fixup-core-makefiles.patch \ " -do_configure() { - # manually do the copy_bsp step first, so as to be able to fix up use of - # mb-* commands - . ${B}/../misc/copy_bsp.sh - echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak -} +EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" do_compile() { - # First process the sequential items - for i in $(cat seq.mak); do - echo Include Seq: $i - if [ ! -d $i ]; then - echo "Skipping...." - continue - fi - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(cat seq.mak); do - echo Libs Seq: $i - if [ ! -d $i ]; then - echo "Skipping...." - continue - fi - oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)} - done - - # the Makefile in ${B}/../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 - echo Include: $i - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Libs: $i - 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 - echo Construct: executable - oe_runmake plm.elf ${@bsp_make_vars(d)} CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" + oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin } diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb index a17aad55..5d806067 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware_git.bb @@ -7,41 +7,13 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ + file://0001-zynqmp_pmufw-Fixup-core-makefiles.patch \ " -do_configure() { - # manually do the copy_bsp step first, so as to be able to fix up use of - # mb-* commands - . ${B}/../misc/copy_bsp.sh - echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak -} +EXTRA_COMPILER_FLAGS = "-ffunction-sections -fdata-sections -Wall -Wextra -Os -flto -ffat-lto-objects" do_compile() { - # First process the sequential items - for i in $(cat seq.mak); do - echo Include Seq: $i - oe_runmake -C $(dirname $i) -s include - done - for i in $(cat seq.mak); do - echo Libs Seq: $i - oe_runmake -C $(dirname $i) -s libs - done - - # the Makefile in ${B}/../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 - echo Include: $i - oe_runmake -C $(dirname $i) -s include - done - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Libs: $i - oe_runmake -C $(dirname $i) -s libs - done - - # --build-id=none is required due to linker script not defining a location for it. - # Again, recipe-systoot include is necessary - echo Construct: executable - oe_runmake executable.elf CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" + oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin } diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb index 94a2c22d..d04d9183 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware_git.bb @@ -7,49 +7,13 @@ FILESPATH .= ":${FILE_DIRNAME}/embeddedsw" SRC_URI += " \ file://makefile-skip-copy_bsp.sh.patch \ + file://0001-versal_fw-Fixup-core-makefiles.patch \ " -do_configure() { - # manually do the copy_bsp step first, so as to be able to fix up use of - # mb-* commands - . ${B}/../misc/copy_bsp.sh - echo "$BSP_SEQUENTIAL_MAKEFILES" > ${B}/seq.mak -} +EXTRA_COMPILER_FLAGS = "-g -ffunction-sections -fdata-sections -Wall -Wextra" do_compile() { - # First process the sequential items - for i in $(cat seq.mak); do - echo Include Seq: $i - if [ ! -d $i ]; then - echo "Skipping...." - continue - fi - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(cat seq.mak); do - echo Libs Seq: $i - if [ ! -d $i ]; then - echo "Skipping...." - continue - fi - oe_runmake -C $(dirname $i) -s libs ${@bsp_make_vars(d)} - done - - # the Makefile in ${B}/../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 - echo Include: $i - oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)} - done - for i in $(ls ${BSP_TARGETS_DIR}/*/src/Makefile); do - echo Libs: $i - 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 - echo Construct: executable - oe_runmake psmfw.elf ${@bsp_make_vars(d)} CC_FLAGS="-MMD -MP -Wl,--build-id=none -I${STAGING_DIR_TARGET}/usr/include" + oe_runmake ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin } -- cgit v1.2.3-54-g00ecf