u-boot: Bump to 2018.09

This commit is contained in:
Jernej Skrabec 2018-11-09 17:08:54 +01:00
parent e8e28165ff
commit baa9c8d2a2
3 changed files with 27 additions and 40 deletions

View File

@ -23,8 +23,8 @@ case "$PROJECT" in
PKG_NEED_UNPACK+=" $(get_pkg_directory rkbin)"
;;
*)
PKG_VERSION="2017.09"
PKG_SHA256="b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744"
PKG_VERSION="2018.09"
PKG_SHA256="839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268"
PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2"
;;
esac

View File

@ -1,38 +0,0 @@
diff -Naur a/Makefile b/Makefile
--- a/Makefile 2017-09-11 11:10:40.000000000 -0700
+++ b/Makefile 2017-10-03 13:41:57.992106628 -0700
@@ -1379,7 +1379,7 @@
$(call filechk,timestamp.h)
checkbinman: tools
- @if ! ( echo 'import libfdt' | ( PYTHONPATH=tools $(PYTHON) )); then \
+ @if ! ( echo 'from pylibfdt import libfdt' | ( python )); then \
echo >&2; \
echo >&2 '*** binman needs the Python libfdt library.'; \
echo >&2 '*** Either install it on your system, or try:'; \
diff -Naur a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
--- a/tools/dtoc/fdt.py 2017-09-11 11:10:40.000000000 -0700
+++ b/tools/dtoc/fdt.py 2017-10-03 13:42:18.398306028 -0700
@@ -10,7 +10,7 @@
import sys
import fdt_util
-import libfdt
+from pylibfdt import libfdt
# This deals with a device tree, presenting it as an assortment of Node and
# Prop objects, representing nodes and properties, respectively. This file
diff -Naur a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile 2017-09-11 11:10:40.000000000 -0700
+++ b/tools/Makefile 2017-10-03 13:42:33.286451519 -0700
@@ -232,10 +232,6 @@
always := $(hostprogs-y)
-# Build a libfdt Python module if swig is available
-# Use 'sudo apt-get install swig libpython-dev' to enable this
-always += $(if $(shell which swig 2> /dev/null),_libfdt.so)
-
# Generated LCD/video logo
LOGO_H = $(objtree)/include/bmp_logo.h
LOGO_DATA_H = $(objtree)/include/bmp_logo_data.h

View File

@ -0,0 +1,25 @@
diff --git a/dts/Kconfig b/dts/Kconfig
index 0cef225ba9..e4e3455d4c 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -13,7 +13,6 @@ config PYLIBFDT
config DTOC
bool
- select PYLIBFDT
config BINMAN
bool
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index dbc338653b..04f3c5935c 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -10,7 +10,7 @@ import struct
import sys
import fdt_util
-import libfdt
+from pylibfdt import libfdt
from libfdt import QUIET_NOTFOUND
# This deals with a device tree, presenting it as an assortment of Node and