pmu/psm-firmware: Move from S to B which allows code to be patched

The system should never reference or build software that is above the 'S'
directory.  So S being the top of the source tree, and B (build) being the
location where we are running out build components will work correctly and
meet the Yocto Project requirements.

This also has a side effect of allowing patching of components above the
build directory, if necessary.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>

2 files changed, 13 insertions, 11 deletions

diff --git a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb
index 330e0209..6c0811ef 100644
--- a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb
+++ b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb
@@ -1,18 +1,19 @@
 inherit deploy
 
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://../../../../license.txt;md5=39ab6ab638f4d1836ba994ec6852de94"
+LIC_FILES_CHKSUM = "file://license.txt;md5=39ab6ab638f4d1836ba994ec6852de94"
 
 SRCREV = "e8db5fb118229fdc621e0ec7848641a23bf60998"
 PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
 SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1 \
-           file://fix-zynqmp-assert.patch;pnum=5"
+           file://fix-zynqmp-assert.patch"
 
 COMPATIBLE_HOST = "microblaze.*-elf"
 COMPATIBLE_MACHINE = "microblaze-pmu"
 
-S = "${WORKDIR}/git/lib/sw_apps/zynqmp_pmufw/src"
+S = "${WORKDIR}/git"
+B = "${S}/lib/sw_apps/zynqmp_pmufw/src"
 
 # The makefile does not handle parallelization
 PARALLEL_MAKE = ""
@@ -20,7 +21,7 @@ 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
+    ${B}/../misc/copy_bsp.sh
 }
 
 COMPILER = "${CC}"
@@ -28,7 +29,7 @@ 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_DIR ?= "${B}/../misc/zynqmp_pmufw_bsp"
 BSP_TARGETS_DIR ?= "${BSP_DIR}/psu_pmu_0/libsrc"
 
 def bsp_make_vars(d):
@@ -36,7 +37,7 @@ def bsp_make_vars(d):
     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
+    # 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
         oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)}
diff --git a/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.2.bb b/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.2.bb
index cd346b12..4466a748 100644
--- a/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.2.bb
+++ b/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.2.bb
@@ -1,7 +1,7 @@
 inherit deploy
 
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://../../../../license.txt;md5=39ab6ab638f4d1836ba994ec6852de94"
+LIC_FILES_CHKSUM = "file://license.txt;md5=39ab6ab638f4d1836ba994ec6852de94"
 
 SRCREV = "e8db5fb118229fdc621e0ec7848641a23bf60998"
 PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
@@ -12,7 +12,8 @@ COMPATIBLE_HOST = "microblaze.*-elf"
 COMPATIBLE_MACHINE = "versal-mb"
 
 
-S = "${WORKDIR}/git/lib/sw_apps/versal_psmfw/src"
+S = "${WORKDIR}/git"
+B = "${S}/lib/sw_apps/versal_psmfw/src"
 
 # The makefile does not handle parallelization
 PARALLEL_MAKE = ""
@@ -20,7 +21,7 @@ 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
+    ${B}/../misc/copy_bsp.sh
 }
 
 COMPILER = "${CC}"
@@ -28,7 +29,7 @@ COMPILER_FLAGS = "-O2 -c"
 EXTRA_COMPILER_FLAGS = "-g -Wall -Wextra -Os -flto -ffat-lto-objects"
 ARCHIVER = "${AR}"
 
-BSP_DIR ?= "${S}/../misc/versal_psmfw_bsp"
+BSP_DIR ?= "${B}/../misc/versal_psmfw_bsp"
 BSP_TARGETS_DIR ?= "${BSP_DIR}/psv_psm_0/libsrc"
 
 def bsp_make_vars(d):
@@ -36,7 +37,7 @@ def bsp_make_vars(d):
     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
+    # 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
         oe_runmake -C $(dirname $i) -s include ${@bsp_make_vars(d)}