diff options
Diffstat (limited to 'import-layers/meta-raspberrypi/classes/linux-raspberrypi-base.bbclass')
-rw-r--r-- | import-layers/meta-raspberrypi/classes/linux-raspberrypi-base.bbclass | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/import-layers/meta-raspberrypi/classes/linux-raspberrypi-base.bbclass b/import-layers/meta-raspberrypi/classes/linux-raspberrypi-base.bbclass index 40beef1d8..dc2330af2 100644 --- a/import-layers/meta-raspberrypi/classes/linux-raspberrypi-base.bbclass +++ b/import-layers/meta-raspberrypi/classes/linux-raspberrypi-base.bbclass @@ -1,7 +1,8 @@ inherit linux-kernel-base +def get_dts(d, ver=None): + import re -def get_dts(d, ver): staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True) dts = d.getVar("KERNEL_DEVICETREE", True) @@ -13,27 +14,16 @@ def get_dts(d, ver): from the kernel staging ''' ver = get_kernelversion_file(staging_dir) - if ver is not None: - min_ver = ver.split('.', 3) - else: - return dts - - # Always turn off device tree support for kernel's < 3.18 - try: - if int(min_ver[0]) <= 3: - if int(min_ver[1]) < 18: - dts = "" - except IndexError: - min_ver = None - return dts -def split_overlays(d, out): - dts = get_dts(d, None) +def split_overlays(d, out, ver=None): + dts = get_dts(d, ver) if out: overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d) + overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d) else: - overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \ + " " + oe.utils.str_filter('\S+\.dtbo$', dts, d) return overlays |