From 20f79076d588a2b35ec28cb137dfc75ce5a74910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= <igor.pecovnik@gmail.com>
Date: Tue, 3 Jul 2018 17:13:51 +0000
Subject: [PATCH] Rock64 DEV sources and kernel config adjustement. Switching
 DEV u-boot branch to stock, since mainline is failing to build.
 http://ix.io/1fTi

---
 config/boards/rock64.conf             |  2 +-
 config/kernel/linux-rk3328-dev.config |  4 ++--
 config/sources/rk3328.conf            | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/config/boards/rock64.conf b/config/boards/rock64.conf
index 081b14f9af..b2430d949d 100644
--- a/config/boards/rock64.conf
+++ b/config/boards/rock64.conf
@@ -6,7 +6,7 @@ BOOTCONFIG="rock64-rk3328_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="default"
+KERNEL_TARGET="default,dev"
 CLI_TARGET="xenial:default"
 DESKTOP_TARGET="stretch:default"
 #
diff --git a/config/kernel/linux-rk3328-dev.config b/config/kernel/linux-rk3328-dev.config
index ff397adb3d..eb38078657 100644
--- a/config/kernel/linux-rk3328-dev.config
+++ b/config/kernel/linux-rk3328-dev.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.17.0-rc3 Kernel Configuration
+# Linux/arm64 4.17.0-rc6 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -1805,7 +1805,6 @@ CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_AR5523 is not set
 # CONFIG_ATH10K is not set
 # CONFIG_WCN36XX is not set
-CONFIG_RTL8188EU=m
 CONFIG_WLAN_VENDOR_ATMEL=y
 # CONFIG_AT76C50X_USB is not set
 CONFIG_WLAN_VENDOR_BROADCOM=y
@@ -4253,6 +4252,7 @@ CONFIG_PHY_XGENE=y
 CONFIG_PHY_MAPPHONE_MDM6600=m
 # CONFIG_PHY_ROCKCHIP_DP is not set
 CONFIG_PHY_ROCKCHIP_EMMC=y
+CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_PCIE=m
 # CONFIG_PHY_ROCKCHIP_TYPEC is not set
diff --git a/config/sources/rk3328.conf b/config/sources/rk3328.conf
index c7b7b6850b..bfa8e2a2c8 100644
--- a/config/sources/rk3328.conf
+++ b/config/sources/rk3328.conf
@@ -11,9 +11,11 @@ UBOOT_USE_GCC='> 7.0'
 BOOTSOURCE='https://github.com/ayufan-rock64/linux-u-boot'
 BOOTDIR='u-boot-rk3328'
 BOOTPATCHDIR="u-boot-rk3328-${BRANCH}"
+BOOTBRANCH='branch:rockchip-master'
 
 BOOTDELAY=0
 OVERLAY_PREFIX='rk3328'
+SERIALCON=ttyS2
 
 ATFSOURCE='https://github.com/ayufan-rock64/arm-trusted-firmware'
 ATFDIR='arm-trusted-firmware-rk3328'
@@ -23,25 +25,23 @@ ATF_TARGET_MAP='PLAT=rk322xh DEBUG=1 bl31;;trust.bin'
 
 case $BRANCH in
 	default)
-	BOOTBRANCH='branch:rockchip-master'
 
-	KERNELSOURCE='https://github.com/ayufan-rock64/linux-kernel'
-	KERNELBRANCH='tag:ayufan-rock64/linux-build/0.6.45'
-	KERNELDIR='linux-rk3328'
-	KERNEL_USE_GCC='< 6.3'
+		KERNELSOURCE='https://github.com/ayufan-rock64/linux-kernel'
+		KERNELBRANCH='tag:ayufan-rock64/linux-build/0.6.45'
+		KERNELDIR='linux-rk3328'
+		KERNEL_USE_GCC='< 6.3'
 
-	SERIALCON=ttyS2
 	;;
 
 	dev)
-	BOOTBRANCH='branch:mainline-master'
 
-	KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel'
-	KERNELBRANCH='tag:4.17.0-rc6-1019-ayufan'
-	KERNELDIR='linux-rk3328-mainline'
-	KERNEL_USE_GCC='> 7.0'
+		# currently broken
+		#BOOTBRANCH='branch:mainline-master'
+		KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel'
+		KERNELBRANCH='tag:4.17.0-rc6-1019-ayufan'
+		KERNELDIR='linux-rk3328-mainline'
+		KERNEL_USE_GCC='> 7.0'
 
-	SERIALCON=ttyS2
 	;;
 esac