summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2018-07-11 16:32:32 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2018-07-11 16:54:50 -0300
commit791a4e765cc27d53aab05f7733b599b8c990c1df (patch)
tree1717ba32b6c31e67e0a6473fcaaac6ebaab20439
parent291060cd3b0dc49aeb9a745f898f690949f24cc2 (diff)
downloadmeta-freescale-791a4e765cc27d53aab05f7733b599b8c990c1df.tar.gz
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 <fabio.berton@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/machine/include/imx-base.inc4
-rw-r--r--conf/machine/include/utilities.inc28
2 files changed, 1 insertions, 31 deletions
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 @@
3include conf/machine/include/fsl-default-settings.inc 3include conf/machine/include/fsl-default-settings.inc
4include conf/machine/include/fsl-default-versions.inc 4include conf/machine/include/fsl-default-versions.inc
5 5
6require conf/machine/include/utilities.inc
7
8# Set specific make target and binary suffix 6# Set specific make target and binary suffix
9PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc" 7PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc"
10PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc" 8PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc"
@@ -293,7 +291,7 @@ IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
293 291
294IMAGE_BOOT_FILES ?= " \ 292IMAGE_BOOT_FILES ?= " \
295 ${KERNEL_IMAGETYPE} \ 293 ${KERNEL_IMAGETYPE} \
296 ${@make_dtb_boot_files(d)} \ 294 ${KERNEL_DEVICETREE} \
297" 295"
298 296
299### wic default support 297### 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 @@
1### Machine definition file utilities
2
3def make_dtb_boot_files(d):
4 # Generate IMAGE_BOOT_FILES entries for device tree files listed in
5 # KERNEL_DEVICETREE.
6 alldtbs = d.getVar('KERNEL_DEVICETREE')
7 imgtyp = d.getVar('KERNEL_IMAGETYPE')
8
9 def transform(dtb):
10 if dtb.endswith('dtb'):
11 # eg: whatever/bcm2708-rpi-b.dtb has:
12 # DEPLOYDIR file: ${KERNEL_IMAGETYPE}-bcm2708-rpi-b.dtb
13 # destination: bcm2708-rpi-b.dtb
14 base = os.path.basename(dtb)
15 src = '{}-{}'.format(imgtyp, base)
16 dst = base
17 return '{};{}'.format(src, dst)
18 elif dtb.endswith('dtbo'):
19 # overlay dtb:
20 # eg: overlays/hifiberry-amp.dtbo has:
21 # DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo
22 # destination: overlays/hifiberry-amp.dtbo
23 base = os.path.basename(dtb)
24 src = '{}-{}'.format(imgtyp, base)
25 dst = dtb
26 return '{};{}'.format(src, dtb)
27
28 return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])