u-boot: update to 2020.01-rc3 pre-release and drop py2 dependencies

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index c3e458e9251935c2314c0f05b76594bcae9302f8..a0f9c41469e1bed3c1b9ad21694e0efc71715ed0 100644 (file)
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -10,9 +10,12 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 PE = "1"
 
+# Drop this line when updating to 2020.01 final
+PV = "2020.01~rc3"
+
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "61ba1244b548463dbfb3c5285b6b22e7c772c5bd"
+SRCREV = "d4a31e8ee5592072d8d5208b3e950cba2d89b6bd"
 
 SRC_URI = "git://git.denx.de/u-boot.git \
           "

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.10.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2020.01.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.10.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2020.01.bb

diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2019.10.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools_2019.10.bb
rename to meta/recipes-bsp/u-boot/u-boot-tools_2020.01.bb

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 9a754fd09b0965dec3eae0e0690b8caaa9ff3be7..55d8b478701c6f576f4f76a328c91a377fcc2e39 100644 (file)
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -7,13 +7,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS += "kern-tools-native"
 
-inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1
+inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native
 
-DEPENDS += "swig-native python-native"
+DEPENDS += "swig-native"
 
 EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1'
 EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
-EXTRA_OEMAKE += 'PYTHON2=nativepython STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}'
+EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}'
 
 PACKAGECONFIG ??= "openssl"
 # u-boot will compile its own tools during the build, with specific

diff --git a/meta/recipes-bsp/u-boot/u-boot_2019.10.bb b/meta/recipes-bsp/u-boot/u-boot_2020.01.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2019.10.bb
rename to meta/recipes-bsp/u-boot/u-boot_2020.01.bb