From 5e61ba92e36064b53bfc1ce2ffff610d1585bebd Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Thu, 12 Apr 2018 14:28:03 -0700 Subject: [PATCH] u-boot: upgrade to 2018.03 This version of u-boot includes nanopi-neo-plus2 support. Signed-off-by: Martin Kelly --- conf/machine/nanopi-neo-air.conf | 2 +- conf/machine/nanopi-neo.conf | 2 +- conf/machine/orange-pi-one.conf | 2 +- conf/machine/orange-pi-pc.conf | 2 +- conf/machine/orange-pi-zero-plus2.conf | 2 +- conf/machine/orange-pi-zero.conf | 2 +- conf/machine/pcduino.conf | 2 +- .../files/u-boot-pylibfdt-native-build.patch | 28 +++++++++++-------- .../{u-boot_2017.11.bb => u-boot_2018.03.bb} | 4 +-- 9 files changed, 25 insertions(+), 21 deletions(-) rename recipes-bsp/u-boot/{u-boot_2017.11.bb => u-boot_2018.03.bb} (93%) diff --git a/conf/machine/nanopi-neo-air.conf b/conf/machine/nanopi-neo-air.conf index d89838f..c4b0ee1 100644 --- a/conf/machine/nanopi-neo-air.conf +++ b/conf/machine/nanopi-neo-air.conf @@ -5,7 +5,7 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2017.11%" +PREFERRED_VERSION_u-boot = "v2018.03%" KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb" UBOOT_MACHINE = "nanopi_neo_air_defconfig" diff --git a/conf/machine/nanopi-neo.conf b/conf/machine/nanopi-neo.conf index 481178e..99135ee 100644 --- a/conf/machine/nanopi-neo.conf +++ b/conf/machine/nanopi-neo.conf @@ -4,7 +4,7 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2017.11%" +PREFERRED_VERSION_u-boot = "v2018.03%" KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb" UBOOT_MACHINE = "nanopi_neo_defconfig" diff --git a/conf/machine/orange-pi-one.conf b/conf/machine/orange-pi-one.conf index 81ae884..a617294 100644 --- a/conf/machine/orange-pi-one.conf +++ b/conf/machine/orange-pi-one.conf @@ -4,7 +4,7 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2017.11%" +PREFERRED_VERSION_u-boot = "v2018.03%" KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb" UBOOT_MACHINE = "orangepi_one_defconfig" diff --git a/conf/machine/orange-pi-pc.conf b/conf/machine/orange-pi-pc.conf index d8ae8a9..097d973 100644 --- a/conf/machine/orange-pi-pc.conf +++ b/conf/machine/orange-pi-pc.conf @@ -4,7 +4,7 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2017.11%" +PREFERRED_VERSION_u-boot = "v2018.03%" KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb" UBOOT_MACHINE = "orangepi_pc_defconfig" diff --git a/conf/machine/orange-pi-zero-plus2.conf b/conf/machine/orange-pi-zero-plus2.conf index 5777fcc..120ac16 100644 --- a/conf/machine/orange-pi-zero-plus2.conf +++ b/conf/machine/orange-pi-zero-plus2.conf @@ -5,7 +5,7 @@ require conf/machine/include/sun50i.inc -PREFERRED_VERSION_u-boot = "v2017.11%" +PREFERRED_VERSION_u-boot = "v2018.03%" KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-zero-plus2.dtb" UBOOT_MACHINE = "orangepi_zero_plus2_defconfig" diff --git a/conf/machine/orange-pi-zero.conf b/conf/machine/orange-pi-zero.conf index d3b2e22..c3fdcde 100644 --- a/conf/machine/orange-pi-zero.conf +++ b/conf/machine/orange-pi-zero.conf @@ -4,7 +4,7 @@ require conf/machine/include/sun8i.inc -PREFERRED_VERSION_u-boot = "v2017.11%" +PREFERRED_VERSION_u-boot = "v2018.03%" KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb" UBOOT_MACHINE = "orangepi_zero_defconfig" diff --git a/conf/machine/pcduino.conf b/conf/machine/pcduino.conf index 1c90f8e..8610a7a 100644 --- a/conf/machine/pcduino.conf +++ b/conf/machine/pcduino.conf @@ -4,7 +4,7 @@ require conf/machine/include/sun4i.inc -PREFERRED_VERSION_u-boot = "v2017.11%" +PREFERRED_VERSION_u-boot = "v2018.03%" KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb" UBOOT_MACHINE = "Linksprite_pcDuino_defconfig" diff --git a/recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch b/recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch index 9ac0005..3a4cc4f 100644 --- a/recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch +++ b/recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch @@ -1,12 +1,16 @@ -diff --git a/tools/Makefile b/tools/Makefile -index 5db2a54..54bd224 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -134,6 +134,7 @@ tools/_libfdt.so: $(LIBFDT_SRCS) $(LIBFDT_SWIG) - $(Q)unset CC; \ - unset CROSS_COMPILE; \ - LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= VERSION="u-boot-$(UBOOTVERSION)" \ -+ CC="$(HOSTCC)" LDSHARED="$(HOSTLDSHARED)" \ - CPPFLAGS="$(_hostc_flags)" OBJDIR=tools \ - SOURCES="$(LIBFDT_SRCS) tools/libfdt.i" \ - SWIG_OPTS="-I$(srctree)/lib/libfdt -I$(srctree)/lib" \ +diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile +index 01d5e0ffe3..2b2dfe0bd9 100644 +--- a/scripts/dtc/pylibfdt/Makefile ++++ b/scripts/dtc/pylibfdt/Makefile +@@ -15,6 +15,8 @@ PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \ + + quiet_cmd_pymod = PYMOD $@ + cmd_pymod = unset CC; unset CROSS_COMPILE; unset CFLAGS;\ ++ CC="$(HOSTCC)" \ ++ LDSHARED="$(HOSTLDSHARED)" \ + LDFLAGS="$(HOSTLDFLAGS)" \ + VERSION="u-boot-$(UBOOTVERSION)" \ + CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \ +-- +2.11.0 + diff --git a/recipes-bsp/u-boot/u-boot_2017.11.bb b/recipes-bsp/u-boot/u-boot_2018.03.bb similarity index 93% rename from recipes-bsp/u-boot/u-boot_2017.11.bb rename to recipes-bsp/u-boot/u-boot_2018.03.bb index 7bd20fc..f4a675d 100644 --- a/recipes-bsp/u-boot/u-boot_2017.11.bb +++ b/recipes-bsp/u-boot/u-boot_2018.03.bb @@ -21,9 +21,9 @@ SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ file://boot.cmd \ " -SRCREV = "c253573f3e269fd9a24ee6684d87dd91106018a5" +SRCREV = "f95ab1fb6e37f0601f397091bb011edf7a98b890" -PV = "v2017.11+git${SRCPV}" +PV = "v2018.03+git${SRCPV}" PE = "2" S = "${WORKDIR}/git"