From 3c042fdce2c8d4e2fea5836be9fc49b49400fe7a Mon Sep 17 00:00:00 2001 From: Hiago De Franco Date: Tue, 23 Apr 2024 16:43:56 -0300 Subject: machine: verdin-am62: make verdin-am62.inc name more generic The make_dtb_boot_files python function can be also used to other future machines added to meta-toradex-ti, therefore make it naming more generic instead of calling it verdin-am62.inc. Related-to: ELB-5482 Signed-off-by: Hiago De Franco --- conf/machine/tdx-utilities.inc | 23 +++++++++++++++++++++++ conf/machine/verdin-am62.conf | 2 +- conf/machine/verdin-am62.inc | 23 ----------------------- 3 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 conf/machine/tdx-utilities.inc delete mode 100644 conf/machine/verdin-am62.inc diff --git a/conf/machine/tdx-utilities.inc b/conf/machine/tdx-utilities.inc new file mode 100644 index 0000000..a1c4a22 --- /dev/null +++ b/conf/machine/tdx-utilities.inc @@ -0,0 +1,23 @@ +# taken from meta-freescale/conf/machine/include/utilities.inc +def make_dtb_boot_files(d): + # Generate IMAGE_BOOT_FILES entries for device tree files listed in + # KERNEL_DEVICETREE. + # Use only the basename for dtb files: + alldtbs = d.getVar('KERNEL_DEVICETREE') + + + # DTBs may be built out of kernel with devicetree.bbclass + if not alldtbs: + return '' + + def transform(dtb): + if not (dtb.endswith('dtb') or dtb.endswith('dtbo')): + # eg: whatever/bcm2708-rpi-b.dtb has: + # DEPLOYDIR file: bcm2708-rpi-b.dtb + # destination: bcm2708-rpi-b.dtb + bb.error("KERNEL_DEVICETREE entry %s is not a .dtb or .dtbo file." % (dtb) ) + return os.path.basename(dtb) + + return ' '.join([transform(dtb) for dtb in alldtbs.split() if dtb]) + + diff --git a/conf/machine/verdin-am62.conf b/conf/machine/verdin-am62.conf index e5915b2..01a1e00 100644 --- a/conf/machine/verdin-am62.conf +++ b/conf/machine/verdin-am62.conf @@ -9,7 +9,7 @@ MACHINE_FEATURES:append = " tpm2" MACHINE_EXTRA_RRECOMMENDS:append = " btnxpuartconf mwifiexconf" -require conf/machine/verdin-am62.inc +require conf/machine/tdx-utilities.inc require conf/machine/include/am62xx.inc do_image[mcdepends] = "mc::k3r5:virtual/bootloader:do_deploy" diff --git a/conf/machine/verdin-am62.inc b/conf/machine/verdin-am62.inc deleted file mode 100644 index a1c4a22..0000000 --- a/conf/machine/verdin-am62.inc +++ /dev/null @@ -1,23 +0,0 @@ -# taken from meta-freescale/conf/machine/include/utilities.inc -def make_dtb_boot_files(d): - # Generate IMAGE_BOOT_FILES entries for device tree files listed in - # KERNEL_DEVICETREE. - # Use only the basename for dtb files: - alldtbs = d.getVar('KERNEL_DEVICETREE') - - - # DTBs may be built out of kernel with devicetree.bbclass - if not alldtbs: - return '' - - def transform(dtb): - if not (dtb.endswith('dtb') or dtb.endswith('dtbo')): - # eg: whatever/bcm2708-rpi-b.dtb has: - # DEPLOYDIR file: bcm2708-rpi-b.dtb - # destination: bcm2708-rpi-b.dtb - bb.error("KERNEL_DEVICETREE entry %s is not a .dtb or .dtbo file." % (dtb) ) - return os.path.basename(dtb) - - return ' '.join([transform(dtb) for dtb in alldtbs.split() if dtb]) - - -- cgit v1.2.3