summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2020-09-03 12:34:59 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2020-09-03 19:37:26 +0200
commit02e0f2172bb3a65a9406f35cd4758d72c9d6025b (patch)
treea367807ad4d915b421010559d17f60a77112d896
parenta21f73d1e08e80797f0a4cf23f21e161e1d8f188 (diff)
u-boot-toradex: complete update to 2020.07
2020.07 is reworked to use python3 so the patch which made 2019.07 build in a python3 only enviromenent can be dropped. Use the 2020.07 branch also with use-head-next. Fixes commit a21f73d1 ("u-boot-toradex: update to 2020.07") Related-to: ELB-2758 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--recipes-bsp/u-boot/files/0001-u-boot-tk1-make-it-build-with-python3-only-installat.patch44
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc2
2 files changed, 0 insertions, 46 deletions
diff --git a/recipes-bsp/u-boot/files/0001-u-boot-tk1-make-it-build-with-python3-only-installat.patch b/recipes-bsp/u-boot/files/0001-u-boot-tk1-make-it-build-with-python3-only-installat.patch
deleted file mode 100644
index b17818a..0000000
--- a/recipes-bsp/u-boot/files/0001-u-boot-tk1-make-it-build-with-python3-only-installat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d70da04905d284f9b5423bf297830451c62a777b Mon Sep 17 00:00:00 2001
-From: root <root@linuxdev2.toradex.int>
-Date: Sun, 2 Feb 2020 19:58:32 +0100
-Subject: [PATCH] u-boot: tk1: make it build with python3 only installation
-
-- Build libfdt with the python3 binary rather than using the inexistent
- python2 binary.
-- Fallback to the hardcoded U-Boot assembly rather than using the
- python2 only BINMAN functionality.
-
-Signed-off-by: root <root@linuxdev2.toradex.int>
----
- arch/arm/mach-tegra/Kconfig | 1 -
- scripts/dtc/pylibfdt/Makefile | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
-index 97e22ead59..9f49e87829 100644
---- a/arch/arm/mach-tegra/Kconfig
-+++ b/arch/arm/mach-tegra/Kconfig
-@@ -41,7 +41,6 @@ config TEGRA_PMC_SECURE
-
- config TEGRA_COMMON
- bool "Tegra common options"
-- select BINMAN
- select BOARD_EARLY_INIT_F
- select CLK
- select DM
-diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile
-index 15e66ad44d..42342c75bb 100644
---- a/scripts/dtc/pylibfdt/Makefile
-+++ b/scripts/dtc/pylibfdt/Makefile
-@@ -21,7 +21,7 @@ quiet_cmd_pymod = PYMOD $@
- CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
- SOURCES="$(PYLIBFDT_srcs)" \
- SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \
-- $(PYTHON2) $< --quiet build_ext --inplace
-+ $(PYTHON3) $< --quiet build_ext --inplace
-
- $(obj)/_libfdt.so: $(src)/setup.py $(PYLIBFDT_srcs) FORCE
- $(call if_changed,pymod)
---
-2.20.1
-
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc b/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc
index fdb97e2..ae88b4f 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common-tk1.inc
@@ -14,10 +14,8 @@ inherit toradex-u-boot-localversion
SRCREV = "c650daccd29536b63d7e1b7d3a2b6d5363c49cfd"
SRCBRANCH = "toradex_2020.07"
SRCREV_use-head-next = "${AUTOREV}"
-SRCBRANCH_use-head-next = "toradex_2019.07-next"
SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=https;branch=${SRCBRANCH}"
-SRC_URI += "file://0001-u-boot-tk1-make-it-build-with-python3-only-installat.patch"
S = "${WORKDIR}/git"