diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-09 18:54:21 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-09 18:55:00 +0200 |
| commit | cdb56d341f4e275860084cce887d6096ade14f27 (patch) | |
| tree | 2268dc17b0c7bbff07daaba816134e6c7df49179 /recipes-bsp | |
| parent | 42134c73685ccad307179eb6f2e88af45580c672 (diff) | |
Revert "u-boot: merge .cfg files for multiple configs"
This reverts commit 6a74de45bfed1842912b580488f5d82baf4a5621.
Prepare to cherry-pick to reworked commit from zeus.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot.inc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index 9cd4651..55d8b47 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -79,21 +79,7 @@ def find_cfgs(d): return sources_list do_configure () { - 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 - KCONFIG_CONFIG=${S}/configs/${config%_*}_defconfig merge_config.sh -m ${S}/configs/${config%_*}_defconfig ${@" ".join(find_cfgs(d))} - oe_runmake -C ${S} O=${B}/${config} ${config} - fi - done - unset j - done - unset i - else + if [ -z "${UBOOT_CONFIG}" ]; then if [ -n "${UBOOT_MACHINE}" ]; then oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} else @@ -128,6 +114,7 @@ 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); |