From 791a4e765cc27d53aab05f7733b599b8c990c1df Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 11 Jul 2018 16:32:32 -0300 Subject: [PATCH] imx-base.inc: Use KERNEL_DEVICETREE variable in IMAGE_BOOT_FILES OE-Core commit 1860d9d3c62e2e94cd68a809385873ffd8270b6d removed KERNEL_IMAGETYPE prefix from device tree name, so we don't need to use utilities.inc and we can just use KERNEL_DEVICETREE variable in IMAGE_BOOT_FILES. Signed-off-by: Fabio Berton Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 4 +--- conf/machine/include/utilities.inc | 28 ---------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 conf/machine/include/utilities.inc diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 89df1dec..b6b5c9b9 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -3,8 +3,6 @@ include conf/machine/include/fsl-default-settings.inc include conf/machine/include/fsl-default-versions.inc -require conf/machine/include/utilities.inc - # Set specific make target and binary suffix PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc" @@ -293,7 +291,7 @@ IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" IMAGE_BOOT_FILES ?= " \ ${KERNEL_IMAGETYPE} \ - ${@make_dtb_boot_files(d)} \ + ${KERNEL_DEVICETREE} \ " ### wic default support diff --git a/conf/machine/include/utilities.inc b/conf/machine/include/utilities.inc deleted file mode 100644 index bcb1c2a7..00000000 --- a/conf/machine/include/utilities.inc +++ /dev/null @@ -1,28 +0,0 @@ -### Machine definition file utilities - -def make_dtb_boot_files(d): - # Generate IMAGE_BOOT_FILES entries for device tree files listed in - # KERNEL_DEVICETREE. - alldtbs = d.getVar('KERNEL_DEVICETREE') - imgtyp = d.getVar('KERNEL_IMAGETYPE') - - def transform(dtb): - if dtb.endswith('dtb'): - # eg: whatever/bcm2708-rpi-b.dtb has: - # DEPLOYDIR file: ${KERNEL_IMAGETYPE}-bcm2708-rpi-b.dtb - # destination: bcm2708-rpi-b.dtb - base = os.path.basename(dtb) - src = '{}-{}'.format(imgtyp, base) - dst = base - return '{};{}'.format(src, dst) - elif dtb.endswith('dtbo'): - # overlay dtb: - # eg: overlays/hifiberry-amp.dtbo has: - # DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo - # destination: overlays/hifiberry-amp.dtbo - base = os.path.basename(dtb) - src = '{}-{}'.format(imgtyp, base) - dst = dtb - return '{};{}'.format(src, dtb) - - return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) -- 2.40.1