diff options
| author | Ming Liu <ming.liu@toradex.com> | 2022-08-01 15:08:32 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-08-08 14:06:43 +0000 |
| commit | d2c82eb165043c314795c4172588ed39f716ede8 (patch) | |
| tree | 5abd25e2a76c8bb88d562e84090a0f3dd6605806 /classes | |
| parent | e4f0f9dda029026655402ebc80a17a00e30ffa5c (diff) | |
meta: drop tk1/tegra/vf machine references
We've decided not maintain these machines in BSP6, let's drop the
machine references.
There is a special varialbe UBOOT_KERNEL_TYPE, it's only being used by
apalis-tk1 machine, so also drop it.
Related-to: ELB-4471
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_type_tezi.bbclass | 1 | ||||
| -rw-r--r-- | classes/toradex-devicetree.bbclass | 2 | ||||
| -rw-r--r-- | classes/toradex-fitimage.bbclass | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index f1a984d..309f007 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -8,7 +8,6 @@ WKS_FILE_DEPENDS:append = " tezi-metadata virtual/dtb" DEPENDS += "${WKS_FILE_DEPENDS}" IMAGE_BOOT_FILES_REMOVE = "${@make_dtb_boot_files(d) if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" -IMAGE_BOOT_FILES_REMOVE:apalis-tk1 = "${@ d.getVar('KERNEL_DEVICETREE') if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else ''}" IMAGE_BOOT_FILES:append = " overlays.txt ${@'' if d.getVar('KERNEL_IMAGETYPE') == 'fitImage' else 'overlays/*;overlays/'}" IMAGE_BOOT_FILES:remove = "${IMAGE_BOOT_FILES_REMOVE}" diff --git a/classes/toradex-devicetree.bbclass b/classes/toradex-devicetree.bbclass index a646da0..b939db9 100644 --- a/classes/toradex-devicetree.bbclass +++ b/classes/toradex-devicetree.bbclass @@ -47,7 +47,7 @@ MACHINE_PREFIX:colibri-imx7-emmc = "colibri-imx7" do_collect_overlays () { if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" ] ; then machine_dts=`cd ${S} && ls ${MACHINE_PREFIX}[_-]*.dts 2>/dev/null || true` - common_dts=`cd ${S} && ls *.dts 2>/dev/null | grep -v -e 'imx[6-8]' -e 'tk1' | xargs || true` + common_dts=`cd ${S} && ls *.dts 2>/dev/null | grep -v -e 'imx[6-8]' | xargs || true` all_dts="$machine_dts $common_dts" else for dtbo in ${TEZI_EXTERNAL_KERNEL_DEVICETREE}; do diff --git a/classes/toradex-fitimage.bbclass b/classes/toradex-fitimage.bbclass index 65f7395..cbf7e86 100644 --- a/classes/toradex-fitimage.bbclass +++ b/classes/toradex-fitimage.bbclass @@ -38,9 +38,6 @@ fitimage_assemble() { uboot_prep_kimage fitimage_emit_section_kernel ${1} "${kernelcount}" linux.bin "${linux_comp}" - if [ "x${UBOOT_KERNEL_TYPE}" = "xkernel_noload" ]; then - sed 's/\(^\s*type.*\kernel\)\"/\1_noload\"/' -i ${1} - fi # # Step 2: Prepare a DTB image section |