]> code.ossystems Code Review - openembedded-core.git/commit
u-boot: avoid blind merging all *.cfg
authorJens Rehsack <rehsack@gmail.com>
Thu, 11 Jun 2020 14:30:14 +0000 (16:30 +0200)
committerSteve Sakoman <steve@sakoman.com>
Mon, 6 Jul 2020 15:24:15 +0000 (05:24 -1000)
commit8c2f4dc79f69df2174b8ab4f8b69a749aee16129
tree22960eac773e0e0d6491d2bdade731c9b4476b24
parentcd7ca887f79f67f2cf0499481a4032825c3077f2
u-boot: avoid blind merging all *.cfg

This fixes u-boot-qoriq breakage of:

    commit 4fde8c8f479f5acd24fb6e0d0b9b4dc94d6f560b
    Author: Ming Liu <ming.liu@toradex.com>
    Date:   Wed Jun 3 13:56:01 2020 +0200

u-boot: support merging .cfg files for UBOOT_CONFIG

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.

The intension of 4fde8c8 looks more than append delta-config snippets to
u-boot config and should probably be rewritten to express that much better
than implicitely assume all "*.cfg" are for merging into .config.

Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b4644f231a1463123d4100fcaf1448b3d174ef1a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-bsp/u-boot/u-boot.inc