From 8e2a7bdf43f5ff179e5f02e3436aa750ab54e683 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sat, 27 Nov 2021 01:11:27 +0000
Subject: [PATCH 1/2] u-boot-tools: fix make_host

Without defining HOSTCC Makefile.host was defaulting to the operating
system cc. In the minimal docker image (focal) - cc is not available.

PROJECT=Amlogic ARCH=aarch64 DEVICE=AMLGX UBOOT_SYSTEM=odroid-n2 scripts/build u-boot-tools:host
BUILD      u-boot-tools (host)
    TOOLCHAIN      make (auto-detect)
PKG_NAME="u-boot-tools"
  HOSTCC  scripts/basic/fixdep
/bin/sh: 1: cc: not found
make[1]: *** [scripts/Makefile.host:95: scripts/basic/fixdep] Error 127
make: *** [Makefile:488: scripts_basic] Error 2
FAILURE: s/build u-boot-tools:host during make_host (package.mk)
*********** FAILED COMMAND ***********
make qemu-x86_64_defconfig
**************************************
---
 packages/tools/u-boot-tools/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tools/u-boot-tools/package.mk b/packages/tools/u-boot-tools/package.mk
index e5d24240f6..7c4dee6cbb 100644
--- a/packages/tools/u-boot-tools/package.mk
+++ b/packages/tools/u-boot-tools/package.mk
@@ -11,7 +11,7 @@ PKG_DEPENDS_HOST="ccache:host bison:host flex:host openssl:host pkg-config:host"
 PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 
 make_host() {
-  make qemu-x86_64_defconfig
+  make qemu-x86_64_defconfig HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}"
   make tools-only HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}"
 }
 

From dfac76b2fb14e4e54525987de7e6ffc5a0d86c60 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sat, 27 Nov 2021 01:39:42 +0000
Subject: [PATCH 2/2] u-boot: fix make config with HOSTCC

Without defining HOSTCC Makefile.host was defaulting to the operating
system cc. In the minimal docker image (focal) - cc is not available.

BUILD      u-boot (target)
    TOOLCHAIN      make (auto-detect)
make[1]: Entering directory
  HOSTCC  scripts/basic/fixdep
/bin/sh: 1: cc: not found
make[2]: *** [scripts/Makefile.host:95: scripts/basic/fixdep] Error 127
make[1]: *** [Makefile:488: scripts_basic] Error 2
make[1]: Leaving directory
FAILURE: scripts/build u-boot:target during make_target (package.mk)
*********** FAILED COMMAND ***********
DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make $(${ROOT}/${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} config)
*********** FAILED COMMAND ***********
---
 packages/tools/u-boot/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index ee34e34926..ca1dee08d6 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -61,7 +61,7 @@ make_target() {
     [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0
     DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make mrproper
     [ -n "${UBOOT_FIRMWARE}" ] && find_file_path bootloader/firmware && . ${FOUND_PATH}
-    DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make $(${ROOT}/${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} config)
+    DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}" $(${ROOT}/${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} config)
     DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make ${UBOOT_TARGET} HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc"
   fi
 }