diff options
author | Ming Liu <ming.liu@toradex.com> | 2020-09-03 09:58:47 +0200 |
---|---|---|
committer | Ming Liu <ming.liu@toradex.com> | 2020-09-03 12:34:06 +0200 |
commit | d48a90f293f8d44a7538f6b412c7b0ad6361f867 (patch) | |
tree | dc33916caf283ebf54b45fd0ef8aa781b2910f9c /recipes-sota/ostree-kernel-initramfs | |
parent | 9319d351d1c475386ca7b939459f6bf9f7aea9d6 (diff) | |
download | meta-updater-d48a90f293f8d44a7538f6b412c7b0ad6361f867.tar.gz |
sota: introduce OSTREE_MULTI_DEVICETREE_SUPPORT
ostree supports multiple devicetrees provided that there is no
/lib/modules/$kversion/devicetree installed on rootfs, in which case,
a uboot variable 'fdtdir' would be written to /boot/loader/uEnv.txt
instead of fdt_file.
Introduce OSTREE_MULTI_DEVICETREE_SUPPORT to control that, when it's
set to '0', there is no functional changes with current implementation,
while it's set to '1', then /lib/modules/$kversion/devicetree would not
be installed and the end users need set their own fdtfile/fdt_file in
boot script to locate the devicetree in 'fdtdir'.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Diffstat (limited to 'recipes-sota/ostree-kernel-initramfs')
-rw-r--r-- | recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb index 136bb22..9ac90b9 100644 --- a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb +++ b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | |||
@@ -15,7 +15,7 @@ ALLOW_EMPTY_ostree-devicetrees = "1" | |||
15 | FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz" | 15 | FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz" |
16 | FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img" | 16 | FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img" |
17 | FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \ | 17 | FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \ |
18 | ${nonarch_base_libdir}/modules/*/devicetree \ | 18 | ${@'' if oe.types.boolean(d.getVar('OSTREE_MULTI_DEVICETREE_SUPPORT')) else '${nonarch_base_libdir}/modules/*/devicetree'} \ |
19 | " | 19 | " |
20 | 20 | ||
21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
@@ -47,7 +47,10 @@ do_install() { | |||
47 | dts_file_basename=$(basename $dts_file) | 47 | dts_file_basename=$(basename $dts_file) |
48 | cp ${DEPLOY_DIR_IMAGE}/$dts_file_basename $kerneldir/dtb/$dts_file_basename | 48 | cp ${DEPLOY_DIR_IMAGE}/$dts_file_basename $kerneldir/dtb/$dts_file_basename |
49 | done | 49 | done |
50 | cp $kerneldir/dtb/$(basename $(echo ${OSTREE_DEVICETREE} | awk '{print $1}')) $kerneldir/devicetree | 50 | |
51 | if [ ${@ oe.types.boolean('${OSTREE_MULTI_DEVICETREE_SUPPORT}')} = False ]; then | ||
52 | cp $kerneldir/dtb/$(basename $(echo ${OSTREE_DEVICETREE} | awk '{print $1}')) $kerneldir/devicetree | ||
53 | fi | ||
51 | fi | 54 | fi |
52 | fi | 55 | fi |
53 | } | 56 | } |