From f90ea347731d9b098df697aa4fe190c72142e708 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Thu, 25 Oct 2018 11:28:50 +0200
Subject: [PATCH] [s5p6818] Adjust boot script to show HDMI console bootlog
 instead of serial. Adjust kernel configuration. @TonyMac32
 CONFIG_BT_HCIUART_3WIRE is gone from config here as well.

---
 config/bootscripts/boot-s5p6818.cmd     | 2 +-
 config/kernel/linux-s5p6818-next.config | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/bootscripts/boot-s5p6818.cmd b/config/bootscripts/boot-s5p6818.cmd
index 46395a4cb3..a2ee7affdd 100644
--- a/config/bootscripts/boot-s5p6818.cmd
+++ b/config/bootscripts/boot-s5p6818.cmd
@@ -22,7 +22,7 @@ if ext4load mmc ${devnum}:1 ${kernel_addr_r} ${prefix}/armbianEnv.txt; then
 	env import -t ${kernel_addr_r} ${filesize}
 fi
 
-setenv bootargs "console=ttySAC0,115200n8 root=${rootdev} rootwait rootfstype=${rootfstype} loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
+setenv bootargs "console=ttySAC0,115200n8 console=tty1 root=${rootdev} rootwait rootfstype=${rootfstype} loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
 
 if ext4load mmc ${devnum}:1 ${fdt_addr} ${prefix}dtb/nexell/${fdtfile} || ext4load mmc 1:1 ${fdt_addr} ${prefix}dtb/nexell/s5p6818-nanopi3-rev07.dtb; then echo "Loading DTB"; fi
 ext4load mmc ${devnum}:1 ${ramdisk_addr_r} ${prefix}uInitrd
diff --git a/config/kernel/linux-s5p6818-next.config b/config/kernel/linux-s5p6818-next.config
index 02a246d2c7..6cd3e45708 100644
--- a/config/kernel/linux-s5p6818-next.config
+++ b/config/kernel/linux-s5p6818-next.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.68 Kernel Configuration
+# Linux/arm64 4.14.78 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -1339,7 +1339,6 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y