On Fri, 2020-07-17 at 15:19 +0100, Usama Arif wrote: > This patch adds support for adding default config node even > when dtb is not part of the FIT image. The conf options are > therefore changed to point to kernel ID rather than dtb > ID when dtb does not exist. > > Signed-off-by: Usama Arif <usama.a...@arm.com> > --- > meta/classes/kernel-fitimage.bbclass | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-)
I keep asking someone to start providing tests for kernel-fitimage but nobody does. Its near impossible to tell whether this is a good change or one that could cause someone else problems as we have little documented behaviour and no tests. Could someone please start looking at adding some (and documentation)? Cheers, Richard > diff --git a/meta/classes/kernel-fitimage.bbclass > b/meta/classes/kernel-fitimage.bbclass > index 72b05ff8d1..6f4530fc3b 100644 > --- a/meta/classes/kernel-fitimage.bbclass > +++ b/meta/classes/kernel-fitimage.bbclass > @@ -257,6 +257,7 @@ fitimage_emit_section_config() { > # Test if we have any DTBs at all > sep="" > conf_desc="" > + conf_node="conf@" > kernel_line="" > fdt_line="" > ramdisk_line="" > @@ -287,12 +288,18 @@ fitimage_emit_section_config() { > fi > > if [ "${6}" = "1" ]; then > - default_line="default = \"conf@${3}\";" > + if [ -n "${3}" ]; then > + default_line="default = \"conf@${3}\";" > + conf_node=$conf_node${3} > + else > + default_line="default = \"conf@${2}\";" > + conf_node=$conf_node${2} > + fi > fi > > cat << EOF >> ${1} > ${default_line} > - conf@${3} { > + $conf_node { > description = "${6} ${conf_desc}"; > ${kernel_line} > ${fdt_line} > @@ -445,6 +452,9 @@ fitimage_assemble() { > fi > i=`expr ${i} + 1` > done > + else > + defaultconfigcount=1 > + fitimage_emit_section_config ${1} "${kernelcount}" "" > "${ramdiskcount}" "${setupcount}" "${defaultconfigcount}" > fi > > fitimage_emit_section_maint ${1} sectend >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#140798): https://lists.openembedded.org/g/openembedded-core/message/140798 Mute This Topic: https://lists.openembedded.org/mt/75612723/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-