From eb152f44731a35a74af09b5d900b43446b6037c2 Mon Sep 17 00:00:00 2001
From: hzy <hzyitc@outlook.com>
Date: Mon, 2 Jan 2023 23:47:19 +0800
Subject: [PATCH] meson: Move board-specific config (Odroid C1) away from
 family config

Includes change from https://github.com/armbian/build/commit/7488222b2aac8bc6a395b6714dbac3f88177585e
---
 config/boards/odroidc1.csc                    | 15 ++++++++++
 config/boards/onecloud.conf                   |  4 +++
 .../sources/families/include/meson_common.inc | 29 +------------------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/config/boards/odroidc1.csc b/config/boards/odroidc1.csc
index 1fde016a31..d7086e9fb6 100644
--- a/config/boards/odroidc1.csc
+++ b/config/boards/odroidc1.csc
@@ -4,8 +4,23 @@ BOARDFAMILY="meson8b"
 BOARD_MAINTAINER=""
 KERNEL_TARGET="current,edge"
 
+BOOTDIR='u-boot-odroidc1'
+BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
+BOOTBRANCH='branch:odroidc-v2011.03'
+BOOTPATCHDIR="legacy"
+UBOOT_COMPILER="arm-linux-gnueabi-"
+UBOOT_USE_GCC='< 4.9'
 BOOTCONFIG="odroidc_config"
 BOOTSCRIPT="boot-odroid-c1.ini:boot.ini"
 
+UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/u-boot.bin'
+
 BOOTSIZE="200"
 BOOTFS_TYPE="fat"
+
+write_uboot_platform() {
+    dd if=$1/bl1.bin.hardkernel of=$2 bs=1 count=442 conv=fsync > /dev/null 2>&1
+    dd if=$1/bl1.bin.hardkernel of=$2 bs=512 skip=1 seek=1 conv=fsync > /dev/null 2>&1
+    dd if=$1/u-boot.bin of=$2 bs=512 seek=64 conv=fsync > /dev/null 2>&1
+    dd if=/dev/zero of=$2 seek=1024 count=32 bs=512 conv=fsync > /dev/null 2>&1
+}
diff --git a/config/boards/onecloud.conf b/config/boards/onecloud.conf
index 4cfb7ebfcc..4a5cd947a9 100644
--- a/config/boards/onecloud.conf
+++ b/config/boards/onecloud.conf
@@ -16,3 +16,7 @@ BOOTFS_TYPE="fat"
 # FIXED_IMAGE_SIZE=7456
 
 BOOT_LOGO=desktop
+
+family_tweaks() {
+    cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp
+}
diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc
index 77e0ad5bee..f4f3db9b7d 100644
--- a/config/sources/families/include/meson_common.inc
+++ b/config/sources/families/include/meson_common.inc
@@ -19,26 +19,7 @@ CPUMIN=504000
 CPUMAX=1632000
 GOVERNOR=ondemand
 
-case $BOARD in
-	odroidc1)
-
-		BOOTDIR='u-boot-odroidc1'
-		BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
-		BOOTBRANCH='branch:odroidc-v2011.03'
-		BOOTPATCHDIR="legacy"
-		UBOOT_COMPILER="arm-linux-gnueabi-"
-
-		UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/u-boot.bin'
-
-		write_uboot_platform() {
-			dd if=$1/bl1.bin.hardkernel of=$2 bs=1 count=442 conv=fsync > /dev/null 2>&1
-			dd if=$1/bl1.bin.hardkernel of=$2 bs=512 skip=1 seek=1 conv=fsync > /dev/null 2>&1
-			dd if=$1/u-boot.bin of=$2 bs=512 seek=64 conv=fsync > /dev/null 2>&1
-			dd if=/dev/zero of=$2 seek=1024 count=32 bs=512 conv=fsync > /dev/null 2>&1
-		}
-
-		;;
-esac
+SKIP_BOOTSPLASH="yes"
 
 case $BRANCH in
 
@@ -55,14 +36,6 @@ case $BRANCH in
 		;;
 esac
 
-family_tweaks() {
-	case $BOARD in
-		onecloud)
-			cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp
-			;;
-	esac
-}
-
 family_tweaks_bsp() {
 	mkdir -p "$destination/etc/X11/xorg.conf.d"
 	cat <<- EOF > "$destination/etc/X11/xorg.conf.d/02-driver.conf"