diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 2212817d01..67e689aa66 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -32,6 +32,14 @@ PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" [ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader" case "$PROJECT" in + Rockchip) + PKG_VERSION="5ecf0ee" + PKG_SHA256="fba1d26583d446a5bbb5713fe37848e05b546d125384c2c2d2883414d61b7cad" + PKG_URL="https://github.com/rockchip-linux/u-boot/archive/$PKG_VERSION.tar.gz" + PKG_PATCH_DIRS="rockchip" + PKG_DEPENDS_TARGET+=" rkbin" + PKG_NEED_UNPACK+=" $(get_pkg_directory rkbin)" + ;; *) PKG_VERSION="2017.09" PKG_SHA256="b2d15f2cf5f72e706025cde73d67247c6da8cd35f7e10891eefe7d9095089744" diff --git a/packages/tools/u-boot/patches/rockchip/u-boot-0001-dont-build-libfdt.patch b/packages/tools/u-boot/patches/rockchip/u-boot-0001-dont-build-libfdt.patch new file mode 100644 index 0000000000..2fdfa55d68 --- /dev/null +++ b/packages/tools/u-boot/patches/rockchip/u-boot-0001-dont-build-libfdt.patch @@ -0,0 +1,75 @@ +From 726b4484a18c5fc135fc6e744d799308c33798fb Mon Sep 17 00:00:00 2001 +From: Jonas Karlman +Date: Sat, 2 Dec 2017 11:47:07 +0100 +Subject: [PATCH 1/2] dont build libfdt + +--- + Makefile | 2 +- + scripts/Makefile.spl | 4 ++-- + tools/Makefile | 4 ---- + tools/dtoc/fdt.py | 2 +- + 4 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index 8086f3c93e..4796b488ae 100644 +--- a/Makefile ++++ b/Makefile +@@ -1379,7 +1379,7 @@ $(timestamp_h): $(srctree)/Makefile FORCE + $(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 --git a/scripts/Makefile.spl b/scripts/Makefile.spl +index b86ea76bab..ea54f9098c 100644 +--- a/scripts/Makefile.spl ++++ b/scripts/Makefile.spl +@@ -246,7 +246,7 @@ quiet_cmd_fdtgrep = FDTGREP $@ + $(obj)/$(SPL_BIN).dtb: dts/dt.dtb $(objtree)/tools/fdtgrep FORCE + $(call if_changed,fdtgrep) + +-pythonpath = PYTHONPATH=tools ++pythonpath = python + + quiet_cmd_dtocc = DTOC C $@ + cmd_dtocc = $(pythonpath) $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ platdata +@@ -370,7 +370,7 @@ ifneq ($(cmd_files),) + endif + + checkdtoc: tools +- @if ! ( echo 'import libfdt' | ( PYTHONPATH=tools $(PYTHON) )); then \ ++ @if ! ( echo 'from pylibfdt import libfdt' | ( python )); then \ + echo '*** dtoc needs the Python libfdt library. Either '; \ + echo '*** install it on your system, or try:'; \ + echo '***'; \ +diff --git a/tools/Makefile b/tools/Makefile +index a0db19d6b0..d6906a9603 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -232,10 +232,6 @@ clean-dirs := lib common + + 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 +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 + + # This deals with a device tree, presenting it as an assortment of Node and + # Prop objects, representing nodes and properties, respectively. This file diff --git a/packages/tools/u-boot/patches/rockchip/u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch b/packages/tools/u-boot/patches/rockchip/u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch new file mode 100644 index 0000000000..125ccc13f8 --- /dev/null +++ b/packages/tools/u-boot/patches/rockchip/u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch @@ -0,0 +1,25 @@ +From 41e6e8066bd63aa560f272b2ef04d87735c2ec2a Mon Sep 17 00:00:00 2001 +From: Jonas Karlman +Date: Sun, 22 Oct 2017 12:48:24 +0200 +Subject: [PATCH 2/2] rockchip: tinker: enable rockchip video driver + +--- + configs/tinker-rk3288_defconfig | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig +index 00e2d81954..62cae4f21e 100644 +--- a/configs/tinker-rk3288_defconfig ++++ b/configs/tinker-rk3288_defconfig +@@ -80,6 +80,11 @@ CONFIG_G_DNL_PRODUCT_NUM=0x320a + CONFIG_USB_HOST_ETHER=y + CONFIG_USB_ETHER_ASIX=y + CONFIG_USB_ETHER_SMSC95XX=y ++CONFIG_DM_VIDEO=y ++CONFIG_DISPLAY=y ++CONFIG_VIDEO_ROCKCHIP=y ++CONFIG_DISPLAY_ROCKCHIP_HDMI=y ++CONFIG_CONSOLE_SCROLL_LINES=10 + CONFIG_USE_TINY_PRINTF=y + CONFIG_CMD_DHRYSTONE=y + CONFIG_ERRNO_STR=y