meta-xilinx-standalone-experimental: Adjust to match recent changes

Changes to meta-xilinx-standalone, as well as the embeddedsw require various
changes to be made.  This brings the implementation up to the current level.

Note: various things do not yet compile!

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

2 files changed, 47 insertions, 17 deletions

diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index 1f7e35f4..682752dd 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -1,17 +1,7 @@
-inherit pkgconfig cmake
-
-LICENSE = "Proprietary"
-LICFILENAME = "license.txt"
-LIC_FILES_CHKSUM = "file://${S}/${LICFILENAME};md5=39ab6ab638f4d1836ba994ec6852de94"
-
 # We should move to an actual SRCREV eventually
 include conf/xilinx/esw-srcrev.inc
 
-SRCREV ?= "${AUTOREV}"
-PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
-REPO ?= "git://github.com/xilinx/embeddedsw.git;protocol=https"
-BRANCH ?= "master"
-SRC_URI = "${REPO};branch=${BRANCH}"
+inherit xlnx-embeddedsw pkgconfig cmake
 
 SRCREV_FORMAT = "src_decouple"
 
@@ -23,6 +13,8 @@ SPECFILE_PATH_arm = "${S}/scripts/specs/arm/Xilinx.spec"
 SPECFILE_PATH_aarch64 = "${S}/scripts/specs/arm/Xilinx.spec"
 SPECFILE_PATH_microblaze = "${S}/scripts/specs/microblaze/Xilinx.spec"
 
+ESW_MACHINE ?= "${MACHINE}"
+
 ESW_CFLAGS += "-specs=${SPECFILE_PATH}"
 
 inherit ccmake
@@ -30,7 +22,14 @@ inherit ccmake
 COMPATIBLE_HOST = ".*-elf"
 COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi"
 
-DTBFILE ?= "${RECIPE_SYSROOT}/boot/devicetree/system-top.dtb"
+DTS_FILE = "${DEPLOY_DIR_IMAGE}/${ESW_MACHINE}-baremetal.dtb"
+
+DEPENDS += "python3-pyyaml-native lopper-native device-tree-lops python3-dtc-native"
+
+# We need the deployed output
+do_configure[depends] += "device-tree-lops:do_deploy"
+do_compile[depends] += "device-tree-lops:do_deploy"
+do_install[depends] += "device-tree-lops:do_deploy"
 
 def get_xlnx_cmake_machine(fam, d):
     cmake_machine = fam
@@ -62,7 +61,7 @@ def get_xlnx_cmake_processor(tune, machine, d):
     return cmake_processor
 
 XLNX_CMAKE_MACHINE = "${@get_xlnx_cmake_machine(d.getVar('SOC_FAMILY'), d)}"
-XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('MACHINE'), d)}"
+XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d)}"
 XLNX_CMAKE_SYSTEM_NAME ?= "Generic"
 
 cmake_do_generate_toolchain_file_append() {
@@ -104,3 +103,30 @@ python(){
             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))
 }
+
+do_generate_driver_data[dirs] = "${B}"
+do_generate_driver_data[depends] += "device-tree-lops:do_deploy"
+python do_generate_driver_data() {
+    import glob, subprocess, os
+
+    system_dt = glob.glob(d.getVar('DTS_FILE'))
+    src_dir = glob.glob(d.getVar('OECMAKE_SOURCEPATH'))
+    machine = d.getVar('ESW_MACHINE')
+
+    driver_name = d.getVar('REQUIRED_DISTRO_FEATURES')
+
+    if len(system_dt) == 0:
+        bb.error("Couldn't find device tree %s" % d.getVar('DTS_FILE'))
+
+    if len(src_dir) == 0:
+        bb.error("Couldn't find source dir %s" % d.getVar('OECMAKE_SOURCEPATH'))
+
+    os.chdir(d.getVar('B'))
+    command = ["lopper.py"] + ["-f"] + [system_dt[0]] + ["--"] + ["baremetalconfig_xlnx.py"] + [machine] + [src_dir[0]]
+    subprocess.run(command, check = True)
+    src_file = str("x") + driver_name.replace('-', '_') + str("_g.c")
+    if os.path.exists(src_file):
+         bb.note("Generated config file for driver %s" % driver_name)
+         command = ["install"] + ["-m"] + ["0755"] + [src_file] + [src_dir[0]]
+         subprocess.run(command, check = True)
+}
diff --git a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
index 391f388e..9b116e9e 100644
--- a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
@@ -1,15 +1,18 @@
 inherit esw deploy python3native
 
-DEPENDS += "dtc-native python3-dtc-native python3-pyyaml-native xilstandalone libxil xiltimer device-tree"
+DEPENDS += "python3-dtc-native python3-pyyaml-native xilstandalone libxil xiltimer"
 
 do_configure_prepend() {
     cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
+    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
 }
 
 do_generate_eglist () {
     cd ${S}
-    nativepython3 ${S}/scripts/example.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
+    lopper.py ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} drvcmake_metadata
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
 }
 addtask generate_eglist before do_configure after do_prepare_recipe_sysroot
 do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
@@ -20,7 +23,8 @@ do_install() {
 }
 
 do_deploy() {
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/
+    install -d ${DEPLOYDIR}/${MACHINE}-${BPN}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${MACHINE}-${BPN}/
 }
 addtask deploy before do_build after do_package