From e7b2090c73590b6e5d4d625a017f6325522e037f Mon Sep 17 00:00:00 2001
From: Gunjan Gupta <viraniac@gmail.com>
Date: Sat, 23 Dec 2023 00:17:31 +0530
Subject: [PATCH] Move board related configurations to board file

---
 config/boards/nanopi-r1.csc         |  8 ++++++++
 config/boards/olimex-som204-a20.eos |  8 ++++++++
 config/sources/families/sun7i.conf  | 12 ------------
 config/sources/families/sun8i.conf  | 10 ----------
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/config/boards/nanopi-r1.csc b/config/boards/nanopi-r1.csc
index 253deea1ef..9e7e4cdb04 100644
--- a/config/boards/nanopi-r1.csc
+++ b/config/boards/nanopi-r1.csc
@@ -12,3 +12,11 @@ HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
 BOOT_FDT_FILE="sun8i-h3-nanopi-r1.dtb"
+
+function post_family_tweaks__nanopi_r1_related_configs() {
+	# rename eth1 to wan0
+	echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*",ATTR{address}=="00:00:00:00:00:00",ATTR{dev_id}=="0x0", ATTR{type}=="1",KERNEL=="eth1", NAME="wan0"' > $SDCARD/etc/udev/rules.d/70-persisetn-net.rules
+	# change default console to tty1 which is wired to the chasis
+	sed -i "s/ttyS0/ttyS1/" $SDCARD/boot/boot.cmd
+	mkimage -C none -A arm -T script -d $SDCARD/boot/boot.cmd $SDCARD/boot/boot.scr
+}
diff --git a/config/boards/olimex-som204-a20.eos b/config/boards/olimex-som204-a20.eos
index c40d054654..cae53135b3 100644
--- a/config/boards/olimex-som204-a20.eos
+++ b/config/boards/olimex-som204-a20.eos
@@ -9,3 +9,11 @@ SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="current,edge"
 PACKAGE_LIST_DESKTOP_BOARD="xinput-calibrator"
+
+function post_family_tweaks_bsp__som204_a20() {
+	# BT
+	install -m 755 $SRC/packages/bsp/olinuxino/usr/bin/rtk_hciattach $destination/usr/bin
+	cp $SRC/packages/bsp/olinuxino/lib/systemd/system/olinuxino-bluetooth.service $destination/lib/systemd/system
+	# Copy fbdev configuration
+	cp $SRC/packages/bsp/olinuxino/etc/X11/xorg.conf.d/02-olinuxino-hdmi-fbdev.conf $destination/etc/X11/xorg.conf.d/
+}
diff --git a/config/sources/families/sun7i.conf b/config/sources/families/sun7i.conf
index ee0ca5d6fd..3730ee61fc 100644
--- a/config/sources/families/sun7i.conf
+++ b/config/sources/families/sun7i.conf
@@ -10,15 +10,3 @@ source "${BASH_SOURCE%/*}/include/sunxi_common.inc"
 OVERLAY_PREFIX='sun7i-a20'
 [[ -z $CPUMIN ]] && CPUMIN=480000
 [[ -z $CPUMAX ]] && CPUMAX=1010000
-
-family_tweaks_bsp_s() {
-	if [[ $BOARD == olimex-som204-a20 ]]; then
-
-		# BT
-		install -m 755 $SRC/packages/bsp/olinuxino/usr/bin/rtk_hciattach $destination/usr/bin
-		cp $SRC/packages/bsp/olinuxino/lib/systemd/system/olinuxino-bluetooth.service $destination/lib/systemd/system
-		# Copy fbdev configuration
-		cp $SRC/packages/bsp/olinuxino/etc/X11/xorg.conf.d/02-olinuxino-hdmi-fbdev.conf $destination/etc/X11/xorg.conf.d/
-
-	fi
-}
diff --git a/config/sources/families/sun8i.conf b/config/sources/families/sun8i.conf
index 2958fa491a..dae62e69ad 100644
--- a/config/sources/families/sun8i.conf
+++ b/config/sources/families/sun8i.conf
@@ -15,13 +15,3 @@ fi
 [[ -z $CPUMIN ]] && CPUMIN=480000
 [[ -z $CPUMAX ]] && CPUMAX=1400000
 
-family_tweaks_s() {
-	if [[ ${BOARD} == nanopi-r1 ]]; then
-		# rename eth1 to wan0
-		echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*",ATTR{address}=="00:00:00:00:00:00",ATTR{dev_id}=="0x0", ATTR{type}=="1",KERNEL=="eth1", NAME="wan0"' > $SDCARD/etc/udev/rules.d/70-persisetn-net.rules
-		# change default console to tty1 which is wired to the chasis
-		sed -i "s/ttyS0/ttyS1/" $SDCARD/boot/boot.cmd
-		mkimage -C none -A arm -T script -d $SDCARD/boot/boot.cmd $SDCARD/boot/boot.scr
-	fi
-
-}