From ea047be150a35d5c9be5617f132c9c0dbf7c249b Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 27 Jul 2023 08:55:39 +0200 Subject: toradex-fitimage.bbclass: follow changed function definition in oe openembedded-core commit e3eb79c0a1 ("kernel-fitimage: adding support for Initramfs bundle and u-boot script") is a backport to dunfell. A parameter was added in the middle of the parameter list of the shell function fitimage_emit_section_config(). Follow that and change the calls to it accordingly. Fixes colibri-imx6ull not booting from the fitimage for the lack of a default configuration setting. Related-to: TEI-1053 Signed-off-by: Max Krummenacher --- classes/toradex-fitimage.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/toradex-fitimage.bbclass b/classes/toradex-fitimage.bbclass index de6662b..f0344e6 100644 --- a/classes/toradex-fitimage.bbclass +++ b/classes/toradex-fitimage.bbclass @@ -120,15 +120,15 @@ fitimage_assemble() { for DTB in ${DTBS}; do dtb_ext=${DTB##*.} if [ "${dtb_ext}" = "dtbo" ]; then - fitimage_emit_section_config ${1} "" "${DTB}" "" "" "`expr ${i} = ${dtbcount}`" + fitimage_emit_section_config ${1} "" "${DTB}" "" "" "" "`expr ${i} = ${dtbcount}`" else - fitimage_emit_section_config ${1} "${kernelcount}" "${DTB}" "${ramdiskcount}" "${setupcount}" "`expr ${i} = ${dtbcount}`" + fitimage_emit_section_config ${1} "${kernelcount}" "${DTB}" "${ramdiskcount}" "" "${setupcount}" "`expr ${i} = ${dtbcount}`" fi i=`expr ${i} + 1` done else defaultconfigcount=1 - fitimage_emit_section_config ${1} "${kernelcount}" "" "${ramdiskcount}" "${setupcount}" "${defaultconfigcount}" + fitimage_emit_section_config ${1} "${kernelcount}" "" "${ramdiskcount}" "" "${setupcount}" "${defaultconfigcount}" fi fitimage_emit_section_maint ${1} sectend -- cgit v1.2.3