From d1f455cfd8b502a069858b51771bb36c8fbb122a Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 13 Sep 2021 12:48:40 -0700 Subject: meta-xilinx-standalone-experimental: Move from device-tree-lops to device-tree The device trees are now generated by the user as part of the configuration steps. As such, we need to simply copy/process these device trees as part of the system build so adjust the various usages to the new variable CONFIG_DTFILE, which is a full path reference to the device tree for a particular configuration. Signed-off-by: Mark Hatle --- meta-xilinx-standalone-experimental/classes/esw.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-xilinx-standalone-experimental/classes/esw.bbclass') diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass index a7bc7e2d..0d6e78a6 100644 --- a/meta-xilinx-standalone-experimental/classes/esw.bbclass +++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass @@ -23,14 +23,14 @@ inherit ccmake COMPATIBLE_HOST = ".*-elf" COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" -DTS_FILE = "${DEPLOY_DIR_IMAGE}/${ESW_MACHINE}-baremetal.dtb" +DTS_FILE = "${DEPLOY_DIR_IMAGE}/devicetree/${@os.path.basename(d.getVar('CONFIG_DTFILE'))}" -DEPENDS += "python3-pyyaml-native lopper-native device-tree-lops python3-dtc-native" +DEPENDS += "python3-pyyaml-native lopper-native device-tree 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" +do_configure[depends] += "device-tree:do_deploy" +do_compile[depends] += "device-tree:do_deploy" +do_install[depends] += "device-tree:do_deploy" def get_xlnx_cmake_machine(fam, d): cmake_machine = fam @@ -106,7 +106,7 @@ python(){ } do_generate_driver_data[dirs] = "${B}" -do_generate_driver_data[depends] += "device-tree-lops:do_deploy" +do_generate_driver_data[depends] += "device-tree:do_deploy" python do_generate_driver_data() { import glob, subprocess, os -- cgit v1.2.3-54-g00ecf