Adding Pine64 Quartz64a as WIP target (#3539)

* add Quartz64a

* quartz64 to wip

* add m2\p2 current

* move patch archive

config/boards/quartz64a.wip

@@ -0,0 +1,13 @@
+# Rockchip RK3566 quad core 4GB-8GB GBE PCIe USB3
+BOARD_NAME="Quartz64 A"
+BOARDFAMILY="media"
+BOOT_SOC="rk3568"
+BOOTCONFIG="quartz64-a-rk3566_defconfig"
+KERNEL_TARGET="current,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3566-quartz64-a.dtb"
+SRC_EXTLINUX="yes"
+SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
+ASOUND_STATE="asound.state.station-m2"
+IMAGE_PARTITION_TABLE="gpt"

config/boards/station-m2.conf

@@ -2,7 +2,7 @@
 BOARD_NAME="Station M2"
 BOARDFAMILY="media"
 BOOTCONFIG="firefly-m2-rk3568_defconfig"
-KERNEL_TARGET="legacy,edge"
+KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-firefly-roc-pc.dtb"

config/boards/station-p2.conf

@@ -2,7 +2,7 @@
 BOARD_NAME="Station P2"
 BOARDFAMILY="media"
 BOOTCONFIG="firefly-rk3568_defconfig"
-KERNEL_TARGET="legacy,edge"
+KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-firefly-roc-pc.dtb"

config/kernel/linux-media-edge.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.11 Kernel Configuration
+# Linux/arm64 5.16.12 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -1874,7 +1874,7 @@ CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
 CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
 CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_MTK=y
 CONFIG_BT_HCIBTUSB_RTL=y
@@ -3670,6 +3670,7 @@ CONFIG_RTL8723_COMMON=m
 CONFIG_RTLBTCOEXIST=m
 CONFIG_RTL8XXXU=m
 CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTL8723CS=m
 CONFIG_RTW88=m
 CONFIG_RTW88_CORE=m
 CONFIG_RTW88_PCI=m

config/sources/families/include/rockchip64_common.inc

@@ -15,20 +15,9 @@ BOOTPATCHDIR="u-boot-rockchip64"
 PACKAGE_LIST_FAMILY="ethtool"
 
 RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
-#if [ "$(uname -m)" = "aarch64" ]; then
-#	case "$(lsb_release -sc)" in
-#	"bullseye"|"focal"|"hirsute"|"impish"|"jammy")
-#		PKG_PREFIX="qemu-x86_64-static -L /usr/x86_64-linux-gnu "
-#		;;
-#	*)
-#		PKG_PREFIX="qemu-x86_64 -L /usr/x86_64-linux-gnu "
-#		;;
-#	esac
-#else
-#	PKG_PREFIX=""
-#fi
 
-BOOT_SOC=`expr $BOOTCONFIG : '.*\(rk[[:digit:]]\+.*\)_.*'`
+#BOOT_SOC=`expr $BOOTCONFIG : '.*\(rk[[:digit:]]\+.*\)_.*'`
+BOOT_SOC=${BOOT_SOC:=`expr $BOOTCONFIG : '.*\(rk[[:digit:]]\+.*\)_.*'`}
 
 CPUMIN=${CPUMIN:="408000"}
 
@@ -81,7 +70,7 @@ elif [[ $BOOT_SOC == rk3568 ]]; then
 
 	BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
 	DDR_BLOB='rk35/rk3568_ddr_1560MHz_v1.10.bin'
-	BL31_BLOB='rk35/rk3568_bl31_v1.29.elf'
+	BL31_BLOB='rk35/rk3568_bl31_v1.28.elf'
 
 elif [[ $BOARD == rockpi-s ]]; then
 

config/sources/families/media.conf

@@ -3,6 +3,10 @@ source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"
 if [[ $BOARD == station-p2 || $BOARD == station-m2 ]]; then
 	BOOTSOURCE='https://github.com/150balbes/u-boot-rk'
 	BOOTBRANCH='branch:rk356x'
+	BOOTPATCHDIR="u-boot-media"
+elif [[ $BOARD == quartz64a ]]; then
+	BOOTSOURCE='https://gitlab.com/pgwipeout/u-boot-quartz64.git'
+	BOOTBRANCH='branch:quartz64'
 	BOOTPATCHDIR="u-boot-station-p2"
 fi
 
@@ -15,32 +19,48 @@ case $BRANCH in
 			KERNELSOURCE='https://github.com/150balbes/rockchip-kernel'
 			KERNELBRANCH='branch:kernel-4.19'
 			KERNELPATCHDIR='station-p2-'$BRANCH
-			LINUXCONFIG='linux-station-p2-'$BRANCH
 			LINUXFAMILY=station-p2
+			LINUXCONFIG='linux-station-p2-'$BRANCH
 			EXTRAWIFI="no"
 			WIREGUARD="no"
 		else
 			KERNELSOURCE='https://github.com/ayufan-rock64/linux-kernel'
 			KERNELBRANCH='tag:4.4.202-1237-rockchip-ayufan'
 			KERNELPATCHDIR='rockchip64-'$BRANCH
-			LINUXCONFIG='linux-rockchip64-'$BRANCH
 			LINUXFAMILY=rockchip64
+			LINUXCONFIG='linux-rockchip64-'$BRANCH
 		fi
 	;;
 
 	current)
+		if [[ $BOARD == station-p2 || $BOARD == station-m2 || $BOARD == quartz64a ]]; then
+			KERNELBRANCH="branch:linux-5.16.y"
+			KERNELPATCHDIR='media-edge'
+			LINUXFAMILY=station-p2
+			LINUXCONFIG='linux-media-edge'
+		else
 			KERNELBRANCH="branch:linux-5.15.y"
 			KERNELPATCHDIR='media-'$BRANCH
 			LINUXFAMILY=media
 			LINUXCONFIG='linux-media-'$BRANCH
+		fi
 	;;
 
 	edge)
-#			SKIP_BOOTSPLASH="yes"
+		if [[ $BOARD == station-p2 || $BOARD == station-m2 || $BOARD == quartz64a ]]; then
+			SKIP_BOOTSPLASH="yes"
+			EXTRAWIFI="no"
+			KERNELSOURCE='https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
+			KERNELBRANCH='tag:v5.17-rc8'
+			KERNELPATCHDIR='station-p2-'$BRANCH
+			LINUXFAMILY=station-p2
+			LINUXCONFIG='linux-station-p2-'$BRANCH
+		else
 			KERNELBRANCH="branch:linux-5.16.y"
 			KERNELPATCHDIR='media-'$BRANCH
 			LINUXFAMILY=media
 			LINUXCONFIG='linux-media-'$BRANCH
+		fi
 	;;
 esac
 

config/targets-cli-beta.conf

@@ -68,6 +68,11 @@ orangepizero                 edge            sid         cli
 orangepizero2                edge            sid         cli                      beta         yes
 
 
+# Quartz64 A
+quartz54a                    edge            sid         cli                      beta         yes
+quartz64a                    edge            jammy       cli                      beta         yes
+
+
 # radxa-zero
 radxa-zero                   edge            sid         cli                      beta         yes