diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/Manifest b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/Manifest
index ac8832e1b6..8af2fb54a3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/Manifest
@@ -1,12 +1,3 @@
-DIST u-boot-2016.03.tar.bz2 11076762 SHA256 e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb SHA512 d3a8d5f334a1a1a33756d9ac33d14eca689cafe1ada478e61b51dcbff1781266d4f0ea121e25d0232b292475721c04be63e5a153715b91a14dfc82656a54de6f WHIRLPOOL 32f246e3bdb71648f47a4246602b6f27de5dbae9834aed71880c5d5e737dfd63adcd03e9b47874b4fa61c0336fe13b8b079693baec633bd428d991abb47a88f0
-DIST u-boot-2016.07.tar.bz2 11506848 SHA256 974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253 SHA512 fa76dbd7e654ff9e4b3166162be6c0a77ecf2eb2a952b4865df3c818ebcdca7e2bb75e5ba19bf0346000c3d185888552193bb74510b115426cfe444b78efd3ef WHIRLPOOL 066019af0e8fd04d53569ebd001309238514daa757be6cc50db6d4544f34d0c720ff420811d44d88af6028d02dfb02667e44d8d1abb23bb364baff46c5a26a9f
-DIST u-boot-2016.09.01.tar.bz2 11783287 SHA256 95728e89dd476d17428f94080752ab48884be477b6a678941582aeef618b70bb SHA512 aa503acb1ce4f64a936fbc1292e80c54fe334fcfb1a0da412a755f9a56a24993178ad1a5b8a51f777388d8ce5a62b0626bb5fead503f9b118f7d9f3f1a7c07b7 WHIRLPOOL 35b6ecedcdf99eabfddc90157b1998be1732fbdf46b4ca1221f8fb95e47d6e5fce7725d6b72d04b973f05267b31b3fd9d9beadba9d77e3d4dfc1c0b09d396957
-DIST u-boot-2016.11.tar.bz2 12019669 SHA256 45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8 SHA512 d393b2aa4114a6de7f990efe370891376c934a1cfac9530c3bc44f988e7f2c9f0ec26653e3275c72a0a1c2f4b44fcd0afe8394c9ae3ca93fee1c689d870c063d WHIRLPOOL f9a7837cac2b7b4e1395350a9670e438396818bcb80baebbb9a65ebe739914319fa3e076c288bb3f10ffad0f954336a6a18ea5611824f7f05d7a1518bb65cdad
-EBUILD u-boot-tools-2016.03.ebuild 947 SHA256 8e4c10bb9dd953d8e1defe1653c95becd9040332da56a364ba0187f71b2775ed SHA512 d1f6ec3a8a150faf2a5b9e9c5ad902a94d59da34632472c91c0c37eef927bd62f12ab40eff654ed41b64950a28baff1e904beb93d5d5bb103fc6b4bb47ffc893 WHIRLPOOL 7f625d29c11db4f48bebd10c31eb77ff1923f279d275c1ea176a6b9f6fba75af3212a46ccc9d5724b121789b911675e5ea52d89e051c7cf227f155261295bcc3
-EBUILD u-boot-tools-2016.07.ebuild 955 SHA256 29d5921c97fa501186d3632a2cbac7c269ca1313fb98f5c3e675d0932591e73d SHA512 114839f5cee60d08a8ec807d626b19c060b9fe7a2f71573eea346f2c28a2be02392334f3921ff9cc69110eae26291d156fe47ccc788da6b3abdac68343b15313 WHIRLPOOL 986db29fb2e905b5a2d6c4e8a72b5ccd00ad6a149a50f846ddafb01cc3c1b9a96357194266f17b89a5c7bcc82a73856ce6a0ef4f8a9bd6cc50f4aded1c99f8c7
-EBUILD u-boot-tools-2016.09.01-r1.ebuild 977 SHA256 faf797684690c185d12249213eb5f11460981354193d39e2903f53035430cc97 SHA512 4ffcd4db167822aba087d4948b1e76def20f8fc505f3264e437c6b541828fc66579125f6220a3262fdf06570ed10fe7fbae9332de98636a9977a8a3cedad102d WHIRLPOOL 89b867e41f3fbd2d06e177e3d5494a82974c573aef39159cfcb91f0db48cfc1efbe0ce7e56435ce2a6a37ef74ce7e4a2194ee2b7325099c0cedf643d72fdf7c8
-EBUILD u-boot-tools-2016.09.01.ebuild 948 SHA256 a165dc59a71e3db6fae5c9575b4295d586c6213a760e096e13d7441e142cae62 SHA512 e59450e10f349f637d86767c423133798f44efa5d779e3efd03a56a35712c9e241b288957a88969a50af12990c29e21b7be9327957efd4c4ed01ad9eb0f0e7b7 WHIRLPOOL 13d77db71e9a758464daa78709f9ad413f6a0d2a21366c0cdbe51375b4f0d891b347c9cf5c2d768795ba8a17b33220e0698e1ad10a6e03028f240f767af450f8
-EBUILD u-boot-tools-2016.11.ebuild 977 SHA256 faf797684690c185d12249213eb5f11460981354193d39e2903f53035430cc97 SHA512 4ffcd4db167822aba087d4948b1e76def20f8fc505f3264e437c6b541828fc66579125f6220a3262fdf06570ed10fe7fbae9332de98636a9977a8a3cedad102d WHIRLPOOL 89b867e41f3fbd2d06e177e3d5494a82974c573aef39159cfcb91f0db48cfc1efbe0ce7e56435ce2a6a37ef74ce7e4a2194ee2b7325099c0cedf643d72fdf7c8
-MISC ChangeLog 3933 SHA256 4c8d3dea9fbb83b8880d3187f761cb576e267769871122b64fce493e555c5c05 SHA512 91900eb4361fa0b383e0edc3f18cc31c5a98c8fe770572eb8e30e0325137553e084fcd2273ca555d49098d33dcdcc8d3d0909bfbbd73635490a3f40520468e57 WHIRLPOOL 4f8380d08a99daf8a424127eebc5a43b4bcd415b50a1a1b42a800b8deee44ae5dbe2bac7473e54dac4f095763fb6e31a5fd6a47336317b65c622e54e3b3a414b
-MISC ChangeLog-2015 5985 SHA256 42713615155e36eef4d72dfdb4200b01ef285a4343145e8cf57d3a4023c290d8 SHA512 dc39ecc02c08703c4315f19e6d02fa5fb15b464d366a790ed9edaf8cff4fd3e30e810c32a9244cce452a010383479340aac4b0c29ce766abf8cc54d77d8eb20f WHIRLPOOL e55bd174beb38ad6f55f0a4a487af10c3d3321f198a0d7ea281fd8e1aeb57c034a6ce53a7b44c97b975cac6514e3223b688cd432db7e540d11bd9aa680125302
-MISC metadata.xml 247 SHA256 751aa1f012df292bed9716a5c6a7e64114b695d2ba0c0572fc7e87fc3bbcebc5 SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e WHIRLPOOL b6c074cf39f6ec1e2d085151836db47f9a4d71bcc9cc3296889bfa10172c7f07837ca79c8613f9c483b1332683e78eebe88e0a433a7caf801fc7ccac2552cd53
+DIST u-boot-2019.10.tar.bz2 14214608 BLAKE2B 0dc89ebe207f836d2430d5111def9b4efa22839311d28cbfe4f0387a1b211850b0bf3cd67440b3cc32fb23aa8ece270c2438c44f5432f72474b4802ff117e803 SHA512 d8e98fca4b6af8d49d20ec09beab16b77863fcee88cda3605cc14435de21030bf3ca5e7cf7d06e42d4c0f75279c7295ecd628d2b77666eff7b7fd50374e051fd
+DIST u-boot-2020.01.tar.bz2 14716125 BLAKE2B a2860f74cd3b147d39ed55ba4745e0400e19889a772f21d4bb18be9bdca9b43c6542b2b750207421f87b155529ddb38ea52b2820b46fdbd76232cdd6c13085cd SHA512 073d4e0234095c1bda1ffa7a648972aa4530d106ee1a73035e0501b1aba2951653582c8b7bcf338d4e95012fa67e75f97b7e1fbac5cc764d609b671ef29617f7
+DIST u-boot-2020.04.tar.bz2 15065656 BLAKE2B 29cf8be6027ce46e3bf3fae9b6736e6aba46dba2904112f845d79f50b52b7c7ff3437c71dac6ab22d112347467fb5baaa3ec421cb842ba3ae9b547e4f8378d03 SHA512 e04fe54883149123730605b084324ac0d1d72ce6913467bbe587a5a2675bcf7bb393405d9a446dc0c64ba42abc1e862ae5a132e9e51aa7390e2e9fce045af8d8
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch
new file mode 100644
index 0000000000..910e95a8cb
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/703132
+
+include/compiler.h implies to define 'ulong' type.
+glibc and musl define it on different conditions.
+As a result tools fail to build on musl as:
+    include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'?
+
+We fix it by defining 'ulong' unconditionally (as on BSD).
+
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -44,6 +44,7 @@
+ #ifdef __linux__
+ # include <endian.h>
+ # include <byteswap.h>
++typedef unsigned long ulong;
+ #elif defined(__MACH__) || defined(__FreeBSD__)
+ # include <machine/endian.h>
+ typedef unsigned long ulong;
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch
new file mode 100644
index 0000000000..3215597615
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch
@@ -0,0 +1,11 @@
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,7 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
++extern YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.03.ebuild b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.03.ebuild
deleted file mode 100644
index 9da0a90811..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.03.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools
-	dobin bmp_logo gen_eth_addr img2srec mkimage
-	dobin easylogo/easylogo
-	dobin env/fw_printenv
-	dosym fw_printenv /usr/bin/fw_setenv
-	insinto /etc
-	doins env/fw_env.config
-	doman "${S}/doc/mkimage.1"
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.07.ebuild b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.07.ebuild
deleted file mode 100644
index efa1a1a8cf..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.07.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo gen_eth_addr img2srec mkimage
-	dobin easylogo/easylogo
-	dobin env/fw_printenv
-	dosym fw_printenv /usr/bin/fw_setenv
-	insinto /etc
-	doins env/fw_env.config
-	doman "${S}"/doc/mkimage.1
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
similarity index 66%
rename from sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01-r1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
index 1896c254bc..cacfea7092 100644
--- a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,21 +7,37 @@ inherit toolchain-funcs
 
 MY_P="u-boot-${PV/_/-}"
 DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
 SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE=""
 
+DEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
 S=${WORKDIR}/${MY_P}
 
+PATCHES=("${FILESDIR}"/${P}-musl-ulong.patch)
+
 src_compile() {
 	# Unset a few KBUILD variables. Bug #540476
 	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
+
 	emake \
+		V=1 \
+		HOSTCC="$(tc-getCC)" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		tools-only_defconfig
+
+	emake \
+		V=1 \
+		NO_SDL=1 \
 		HOSTSTRIP=: \
 		STRIP=: \
 		HOSTCC="$(tc-getCC)" \
@@ -31,10 +47,11 @@ src_compile() {
 		tools-all
 }
 
+src_test() { :; }
+
 src_install() {
 	cd tools || die
 	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
 	dobin env/fw_printenv
 	dosym fw_printenv /usr/bin/fw_setenv
 	insinto /etc
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01.ebuild b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
similarity index 59%
rename from sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
index ce433d5300..798ff7a240 100644
--- a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
@@ -1,27 +1,45 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
 MY_P="u-boot-${PV/_/-}"
 DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
 SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+DEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	# Unset a few KBUILD variables. Bug #540476
 	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
+
 	emake \
+		V=1 \
+		HOSTCC="$(tc-getCC)" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		tools-only_defconfig
+
+	emake \
+		V=1 \
+		NO_SDL=1 \
 		HOSTSTRIP=: \
 		STRIP=: \
 		HOSTCC="$(tc-getCC)" \
@@ -31,10 +49,11 @@ src_compile() {
 		tools-all
 }
 
+src_test() { :; }
+
 src_install() {
 	cd tools || die
-	dobin bmp_logo gen_eth_addr img2srec mkimage
-	dobin easylogo/easylogo
+	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
 	dobin env/fw_printenv
 	dosym fw_printenv /usr/bin/fw_setenv
 	insinto /etc
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild
new file mode 100644
index 0000000000..32ca29504b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
+		scripts/kconfig/lxdialog/check-lxdialog.sh \
+		scripts/kconfig/Makefile \
+		tools/Makefile || die
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	# Unset a few KBUILD variables. Bug #540476
+	unset KBUILD_OUTPUT KBUILD_SRC
+
+	emake \
+		V=1 \
+		CC="${CC}" \
+		HOSTCC="${CC}" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		tools-only_defconfig
+
+	emake \
+		V=1 \
+		NO_SDL=1 \
+		HOSTSTRIP=: \
+		STRIP=: \
+		CC="${CC}" \
+		HOSTCC="${CC}" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		CONFIG_ENV_OVERWRITE=y \
+		tools-all
+}
+
+src_test() { :; }
+
+src_install() {
+	cd tools || die
+	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
+	dobin env/fw_printenv
+	dosym fw_printenv /usr/bin/fw_setenv
+	insinto /etc
+	doins env/fw_env.config
+	doman "${S}"/doc/mkimage.1
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild
new file mode 100644
index 0000000000..ac9b538b84
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_P="u-boot-${PV/_/-}"
+DESCRIPTION="utilities for working with Das U-Boot"
+HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
+SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
+		scripts/kconfig/lxdialog/check-lxdialog.sh \
+		scripts/kconfig/Makefile \
+		tools/Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+}
+
+src_compile() {
+	# Unset a few KBUILD variables. Bug #540476
+	unset KBUILD_OUTPUT KBUILD_SRC
+
+	emake \
+		V=1 \
+		AR="${AR}" \
+		CC="${CC}" \
+		HOSTCC="${CC}" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		tools-only_defconfig
+
+	emake \
+		V=1 \
+		NO_SDL=1 \
+		HOSTSTRIP=: \
+		STRIP=: \
+		AR="${AR}" \
+		CC="${CC}" \
+		HOSTCC="${CC}" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		CONFIG_ENV_OVERWRITE=y \
+		tools-all
+}
+
+src_test() { :; }
+
+src_install() {
+	cd tools || die
+	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
+	dobin env/fw_printenv
+	dosym fw_printenv /usr/bin/fw_setenv
+	insinto /etc
+	doins env/fw_env.config
+	doman "${S}"/doc/mkimage.1
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.11.ebuild b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04.ebuild
similarity index 68%
rename from sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.11.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04.ebuild
index 1896c254bc..6deafb7f05 100644
--- a/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2016.11.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-embedded/u-boot-tools/u-boot-tools-2020.04.ebuild
@@ -1,27 +1,41 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
 MY_P="u-boot-${PV/_/-}"
 DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
+HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
 SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
+DEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	# Unset a few KBUILD variables. Bug #540476
 	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
+
 	emake \
+		V=1 \
+		HOSTCC="$(tc-getCC)" \
+		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
+		HOSTLDFLAGS="${LDFLAGS}" \
+		tools-only_defconfig
+
+	emake \
+		V=1 \
+		NO_SDL=1 \
 		HOSTSTRIP=: \
 		STRIP=: \
 		HOSTCC="$(tc-getCC)" \
@@ -31,10 +45,11 @@ src_compile() {
 		tools-all
 }
 
+src_test() { :; }
+
 src_install() {
 	cd tools || die
 	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
 	dobin env/fw_printenv
 	dosym fw_printenv /usr/bin/fw_setenv
 	insinto /etc