From 010077305cd3abcec185e5cafa418f84baf88531 Mon Sep 17 00:00:00 2001
From: SteeManMI <36392828+SteeManMI@users.noreply.github.com>
Date: Sun, 19 Mar 2023 19:13:05 -0400
Subject: [PATCH] aml-s9xx-box: Move board specific bsp file handling to the
 board (#4971)

config file from from the family config file

 Changes to be committed:
	modified:   config/boards/aml-s9xx-box.tvb
	modified:   config/sources/families/meson-gxl.conf
---
 config/boards/aml-s9xx-box.tvb         | 10 ++++++++++
 config/sources/families/meson-gxl.conf |  7 ++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/config/boards/aml-s9xx-box.tvb b/config/boards/aml-s9xx-box.tvb
index 7563928d0..86fe17e32 100644
--- a/config/boards/aml-s9xx-box.tvb
+++ b/config/boards/aml-s9xx-box.tvb
@@ -10,3 +10,13 @@ FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
 BOOT_LOGO="desktop"
 SRC_CMDLINE='rootflags=data=writeback console=ttyAML0,115200n8 console=tty0'
+
+
+function post_family_tweaks__config_aml-s9xx-box_bsp() {
+
+    display_alert "$BOARD" "Installing bsp files" "info"
+
+    cp -r $SRC/packages/bsp/aml-s9xx-box/boot $SDCARD
+    install -m 755 $SRC/packages/bsp/aml-s9xx-box/root/install-aml.sh $SDCARD/root
+    install -m 644 $SRC/packages/bsp/aml-s9xx-box/root/fstab.template $SDCARD/root
+}
diff --git a/config/sources/families/meson-gxl.conf b/config/sources/families/meson-gxl.conf
index 758ad7781..35ffbeebb 100644
--- a/config/sources/families/meson-gxl.conf
+++ b/config/sources/families/meson-gxl.conf
@@ -23,13 +23,10 @@ if [[ $BOARD = khadas-vim2 ]]; then
 fi
 
 family_tweaks() {
-	if [[ $BOARD = aml-s9xx-box ]]; then
-		cp -r $SRC/packages/bsp/aml-s9xx-box/boot $SDCARD
-		install -m 755 $SRC/packages/bsp/aml-s9xx-box/root/install-aml.sh $SDCARD/root
-		install -m 644 $SRC/packages/bsp/aml-s9xx-box/root/fstab.template $SDCARD/root
-	fi
+	:
 }
 
+
 uboot_custom_postprocess() {
 	if [[ $BOARD == lepotato ]]; then
 		uboot_gxl_postprocess $SRC/cache/sources/odroidc2-blobs/ gxl