From f8c27bee4b3d0d28888f7eb96c59d071090a6326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Goulpi=C3=A9?= Date: Thu, 1 Jun 2023 16:38:34 +0200 Subject: [PATCH] fit-conf: fix u-boot boot fail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On board using a fitImage, poky's upstream change from the following commit: https://git.yoctoproject.org/poky/commit/?id=ab6b5e97cebe19938baa403da63 07ca320294b3a inserted a regression of the fit-conf.bb recipe. Causing a U-boot boot fault displaying this type of message: ``` Could not find configuration node ERROR: can't get kernel image! Unknown command '!' - try 'help' resetting ... ``` fitImage configuration labels are now prefixed with conf- instead of conf@. This commit incorporates this modification for the fit-conf.bb recipe. Signed-off-by: Paul Goulpié --- recipes-sota/fit-conf/fit-conf.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-sota/fit-conf/fit-conf.bb b/recipes-sota/fit-conf/fit-conf.bb index b3714f40..026dc43c 100644 --- a/recipes-sota/fit-conf/fit-conf.bb +++ b/recipes-sota/fit-conf/fit-conf.bb @@ -9,11 +9,11 @@ do_install() { echo -n "fit_conf=" >${D}${libdir}/fit_conf if [ -n ${SOTA_MAIN_DTB} ]; then - echo -n "#conf@${SOTA_MAIN_DTB}" >> ${D}${libdir}/fit_conf + echo -n "#conf-${SOTA_MAIN_DTB}" >> ${D}${libdir}/fit_conf fi for ovrl in ${SOTA_DT_OVERLAYS}; do - echo -n "#conf@overlays_${ovrl}" >> ${D}${libdir}/fit_conf + echo -n "#conf-overlays_${ovrl}" >> ${D}${libdir}/fit_conf done for conf_frag in ${SOTA_EXTRA_CONF_FRAGS}; do