diff --git a/config/boards/station-p2.csc b/config/boards/station-p2.csc
index 8d6ec91625..a223af5e98 100644
--- a/config/boards/station-p2.csc
+++ b/config/boards/station-p2.csc
@@ -1,14 +1,12 @@
 # Rockchip RK3568 quad core 2GB-4GB GBE eMMC NVMe SATA USB3 WiFi
 BOARD_NAME="Station P2"
-BOARDFAMILY="media"
+BOARDFAMILY="rockchip64"
+BOOT_SOC="rk3568"
 BOARD_MAINTAINER="150balbes"
-BOOTCONFIG="firefly-p2-rk3568_defconfig"
 KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3568-firefly-roc-pc.dtb"
-SRC_EXTLINUX="yes"
-SRC_CMDLINE="console=ttyS02,1500000 console=tty0"
 ASOUND_STATE="asound.state.station-p2"
 IMAGE_PARTITION_TABLE="gpt"
 
@@ -20,3 +18,24 @@ function post_family_tweaks__station_p2() {
 
 	return 0
 }
+
+# Mainline U-Boot
+function post_family_config__station_p2_use_mainline_uboot() {
+	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
+
+	declare -g BOOTCONFIG="generic-rk3568_defconfig"             # Use generic defconfig which should boot all RK3568 boards
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2024.07-rc5"
+	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
+
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
+
+	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+}