From 6072401974b8044e1a8acc4d4d92d12c2ee590c8 Mon Sep 17 00:00:00 2001
From: Stefan Mavrodiev <stefan@olimex.com>
Date: Wed, 25 Apr 2018 15:47:14 +0300
Subject: [PATCH] Update A20-SOM204 configuration

---
 config/boards/olimex-som204-a20.csc | 16 ++++++++--------
 config/sources/sun7i.conf           | 16 ++++++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/config/boards/olimex-som204-a20.csc b/config/boards/olimex-som204-a20.csc
index 1a350ac4dc..302f89cdec 100644
--- a/config/boards/olimex-som204-a20.csc
+++ b/config/boards/olimex-som204-a20.csc
@@ -2,16 +2,16 @@
 BOARD_NAME="SOM204-A20"
 BOARDFAMILY="sun7i"
 BOOTCONFIG="A20-Olimex-SOM204-EVB-eMMC_defconfig"
-MODULES=""
-MODULES_NEXT=""
-MODULES_DEV="g_serial r8723bs gpio-ir-tx"
+MODULES="8021q a20_tp bonding g_serial gpio_sunxi m25p80 spi_sun7i sunxi_lirc_new sunxi_can"
+MODULES_NEXT="bonding g_serial gpio-ir-tx r8723bs"
+MODULES_DEV="bonding g_serial gpio-ir-tx r8723bs "
 #
-KERNEL_TARGET="dev"
-CLI_TARGET="stretch"
-DESKTOP_TARGET=""
+KERNEL_TARGET="default,next,dev"
+CLI_TARGET="stretch,xenial:next"
+DESKTOP_TARGET="xenial:default,next"
 #
-CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
+CLI_BETA_TARGET="stretch:next"
+DESKTOP_BETA_TARGET="xenial:default"
 #
 RECOMMENDED="Ubuntu_xenial_default_desktop:90,Debian_jessie_next:100"
 #
diff --git a/config/sources/sun7i.conf b/config/sources/sun7i.conf
index e2d21a5316..ad3fa890fe 100644
--- a/config/sources/sun7i.conf
+++ b/config/sources/sun7i.conf
@@ -32,27 +32,31 @@ CPUMIN=480000
 
 family_tweaks_s()
 {
-	if [[ $BRANCH == dev && $BOARD == olimex-som204-a20 ]]; then
+	if [[ $BOARD == olimex-som204-a20 ]]; then
 
 		# Enable serial login on USB-OTG
 		mkdir -p $SDCARD/etc/systemd/system/serial-getty@ttyGS0.service.d
 		chroot $SDCARD /bin/bash -c "systemctl --no-reload enable serial-getty@ttyGS0.service > /dev/null 2>&1"
 		echo "ttyGS0" >> $SDCARD/etc/securetty
 
-		# Enable bluetooth
-		chroot $SDCARD /bin/bash -c "systemctl --no-reload enable olinuxino-bluetooth.service >/dev/null 2>&1"
+		if [[ $BRANCH != default ]]; then
+			# Enable bluetooth
+			chroot $SDCARD /bin/bash -c "systemctl --no-reload enable olinuxino-bluetooth.service >/dev/null 2>&1"
+		fi
 	fi
 }
 
 family_tweaks_bsp_s()
 {
-	if [[ $BRANCH == dev && $BOARD == olimex-som204-a20 ]]; then
+	if [[ $BRANCH != default && $BOARD == olimex-som204-a20 ]]; then
 
 		# Copy bluetooth service
 		install -m 755 $SRC/packages/bsp/olinuxino/rtk_hciattach $destination/usr/bin
 		cp $SRC/packages/bsp/olinuxino/olinuxino-bluetooth.service $destination/lib/systemd/system
 
-		# Copy fbdev configuration
-		cp $SRC/packages/bsp/olinuxino/02-olinuxino-hdmi-fbdev.conf $destination/etc/X11/xorg.conf.d/
+		if [[ $BRANCH == dev ]]; then
+			# Copy fbdev configuration
+			cp $SRC/packages/bsp/olinuxino/02-olinuxino-hdmi-fbdev.conf $destination/etc/X11/xorg.conf.d/
+		fi
 	fi
 }