meta-xilinx-standalone: Using S instead of WORKDIR

External source class manipulates S to point to external source directories,
so use this variable instead of WORKDIR. Point S to the top directory as we need to
access scripts directory in top directory. And instead, using OECMAKE_SOURCEPATH to
point to deeper driver specific directory with necessary cmake files.

Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
Signed-off-by: Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>

4 files changed, 14 insertions, 13 deletions

diff --git a/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx-standalone/classes/esw.bbclass
index 87628f7e..8a24428e 100644
--- a/meta-xilinx-standalone/classes/esw.bbclass
+++ b/meta-xilinx-standalone/classes/esw.bbclass
@@ -2,7 +2,7 @@ inherit pkgconfig cmake yocto-cmake-translation
 
 LICENSE = "Proprietary"
 LICFILENAME = "license.txt"
-LIC_FILES_CHKSUM = "file://${ESWS}/${LICFILENAME};md5=f64f573816f568a50a7a8aad895b3d84"
+LIC_FILES_CHKSUM = "file://${S}/${LICFILENAME};md5=f64f573816f568a50a7a8aad895b3d84"
 
 XILINX_RELEASE_VERSION = "v2019.2"
 
@@ -13,8 +13,9 @@ SRC_URI = "git://gitenterprise.xilinx.com/decoupling/embeddedsw.git;branch=maste
 
 SRCREV_FORMAT = "src_decouple"
 
-ESWS = "${WORKDIR}/git/"
-S = "${ESWS}/${ESW_COMPONENT_SRC}"
+S = "${WORKDIR}/git/"
+B = "${WORKDIR}/build/"
+OECMAKE_SOURCEPATH = "${S}/${ESW_COMPONENT_SRC}"
 
 
 inherit ccmake
@@ -90,10 +91,10 @@ python(){
         lic_file = d.getVar('LIC_FILES_CHKSUM', False)
         licpath=externalsrc
         for i in range(5):
-            licpath=os.path.dirname(licpath)
             if os.path.isfile(licpath + '/' + d.getVar('LICFILENAME',True)):
-                lic_file = lic_file.replace('${ESWS}',licpath)
+                lic_file = lic_file.replace('${S}',licpath)
                 d.setVar('LIC_FILES_CHKSUM', lic_file)
                 return
+            licpath=os.path.dirname(licpath)
         bb.error("Couldn't find license file: %s, within directory %s or his parent directories" % (d.getVar('LICFILENAME',True), externalsrc))
 }
diff --git a/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb b/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb
index a2b7fa05..5aae9024 100644
--- a/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb
+++ b/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb
@@ -8,13 +8,13 @@ PSU_INIT = "${RECIPE_SYSROOT}/${includedir}/devicetree/psu_init*"
 
 do_configure_prepend() {
     # Copy psu_init* files to fsbl source code
-    cp ${PSU_INIT} ${WORKDIR}/git/lib/sw_apps/zynqmp_fsbl/src/
+    cp ${PSU_INIT} ${S}/${ESW_COMPONENT_SRC}
 }
 
 do_install() {
     install -d ${D}/${base_libdir}/firmware
     # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${WORKDIR}/build/zynqmp_fsbl* ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/zynqmp_fsbl* ${D}/${base_libdir}/firmware
 }
 
 ZYNQMP_FSBL_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
diff --git a/meta-xilinx-standalone/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone/recipes-libraries/libxil_git.bb
index 4fa5dc75..7c693b96 100644
--- a/meta-xilinx-standalone/recipes-libraries/libxil_git.bb
+++ b/meta-xilinx-standalone/recipes-libraries/libxil_git.bb
@@ -8,13 +8,13 @@ DEPENDS += "dtc-native python3-pyyaml-native xilmem device-tree"
 do_generate_cmake (){
     # This will generate CMakeLists.txt which contains
     # drivers for the libxil 
-    cd ${WORKDIR}/git
-    DRIVERS_LIST=$(nativepython3 ${WORKDIR}/git/scripts/getdrvlist.py -d ${DTBFILE})
+    cd ${S}
+    DRIVERS_LIST=$(nativepython3 ${S}/scripts/getdrvlist.py -d ${DTBFILE})
 }
 do_generate_driver_data (){
     # This script should also not rely on relative paths and such
-    cd ${WORKDIR}/git
-    nativepython3 ${WORKDIR}/git/scripts/generate_drvdata.py -d ${DTBFILE}
+    cd ${S}
+    nativepython3 ${S}/scripts/generate_drvdata.py -d ${DTBFILE}
 }
 
 # Task dependencies might need to be fixed after unifying the DTB flow
diff --git a/meta-xilinx-standalone/recipes-libraries/xilstandalone_git.bb b/meta-xilinx-standalone/recipes-libraries/xilstandalone_git.bb
index 072f336f..5762b027 100644
--- a/meta-xilinx-standalone/recipes-libraries/xilstandalone_git.bb
+++ b/meta-xilinx-standalone/recipes-libraries/xilstandalone_git.bb
@@ -7,8 +7,8 @@ DEPENDS += "dtc-native python3-pyyaml-native libgloss device-tree"
 
 do_generate_bspcfg_data () {
     # This script should also not rely on relative paths and such
-    cd ${WORKDIR}/git
-    nativepython3 ${WORKDIR}/git/scripts/generate_libdata.py -d ${DTBFILE}
+    cd ${S}
+    nativepython3 ${S}/scripts/generate_libdata.py -d ${DTBFILE}
 }
 
 # Task dependencies might need to be fixed after unifying the DTB flow