On Fri, Jul 3, 2020 at 3:39 AM Noor Ahsan <noor_ah...@mentor.com> wrote:
> Can you merge this on Dunfell, These two patches are in a group currently under test. If all goes well they should be in next week's pull request. Steve > -----Original Message----- > From: openembedded-core@lists.openembedded.org > [mailto:openembedded-core@lists.openembedded.org] On Behalf Of Hussain, Ahsan > Sent: Monday, June 29, 2020 2:16 PM > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [dunfell][PATCH 1/2] u-boot: support merging .cfg files > for UBOOT_CONFIG > > From: Ming Liu <ming....@toradex.com> > > U-boot recipe supports .cfg files in SRC_URI, but they would be merged to > .config during do_configure only when UBOOT_MACHINE is set, we should also > support merging .cfg files for UBOOT_CONFIG. > > Signed-off-by: Max Krummenacher <max.krummenac...@toradex.com> > Signed-off-by: Ming Liu <ming....@toradex.com> > Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> > --- > meta/recipes-bsp/u-boot/u-boot.inc | 21 +++++++++++++++++---- > 1 file changed, 17 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-bsp/u-boot/u-boot.inc > b/meta/recipes-bsp/u-boot/u-boot.inc > index 80f828df52..8cfd25020c 100644 > --- a/meta/recipes-bsp/u-boot/u-boot.inc > +++ b/meta/recipes-bsp/u-boot/u-boot.inc > @@ -77,7 +77,23 @@ def find_cfgs(d): > return sources_list > > do_configure () { > - if [ -z "${UBOOT_CONFIG}" ]; then > + if [ -n "${UBOOT_CONFIG}" ]; then > + unset i j > + for config in ${UBOOT_MACHINE}; do > + i=$(expr $i + 1); > + for type in ${UBOOT_CONFIG}; do > + j=$(expr $j + 1); > + if [ $j -eq $i ]; then > + oe_runmake -C ${S} O=${B}/${config} ${config} > + merge_config.sh -m -O ${B}/${config} > ${B}/${config}/.config ${@" ".join(find_cfgs(d))} > + oe_runmake -C ${S} O=${B}/${config} oldconfig > + fi > + done > + unset j > + done > + unset i > + DEVTOOL_DISABLE_MENUCONFIG=true > + else > if [ -n "${UBOOT_MACHINE}" ]; then > oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} > else > @@ -85,8 +101,6 @@ do_configure () { > fi > merge_config.sh -m .config ${@" ".join(find_cfgs(d))} > cml1_do_configure > - else > - DEVTOOL_DISABLE_MENUCONFIG=true > fi > } > > @@ -114,7 +128,6 @@ do_compile () { > j=$(expr $j + 1); > if [ $j -eq $i ] > then > - oe_runmake -C ${S} O=${B}/${config} ${config} > oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} > for binary in ${UBOOT_BINARIES}; do > k=$(expr $k + 1); > -- > 2.25.1 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#140298): https://lists.openembedded.org/g/openembedded-core/message/140298 Mute This Topic: https://lists.openembedded.org/mt/75187816/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
