mekotronics: u-boot: join rockchip-rk3588's default `u-boot-radxa-rk3…

…5xx` scheme

- rebased 2 patches
- moved null patches for dts & defconfigs to `dt` / `defconfig` dirs
- rename defconfigs since we're at it; use board-specific only
- defconfigs re-saved

config/boards/mekotronics-r58-minipc.csc

@@ -3,6 +3,7 @@ declare -g BOARD_NAME="Mekotronics R58 MiniPC"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOARD_MAINTAINER="monkaBlyat"
 declare -g KERNEL_TARGET="vendor"
+declare -g BOOTCONFIG="mekotronics_r58-rk3588_defconfig"              # generic ebv-ish defconfig
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-minipc-linux.dtb" # Specific to this board
 declare -g UEFI_EDK2_BOARD_ID="r58-mini"                              # This _only_ used for uefi-edk2-rk3588 extension
 

config/boards/mekotronics-r58x-4g.csc

@@ -3,11 +3,9 @@ declare -g BOARD_NAME="Mekotronics R58X-4G"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOARD_MAINTAINER="monkaBlyat"
 declare -g KERNEL_TARGET="vendor"
+declare -g BOOTCONFIG="mekotronics_r58x-rk3588_defconfig"               # vendor u-boot; with NVMe and a DTS
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v12-linux.dtb" # Specific to this board
 declare -g UEFI_EDK2_BOARD_ID="r58x"                                    # This _only_ used for uefi-edk2-rk3588 extension
 
 # Source vendor-specific configuration
 source "${SRC}/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh"
-
-# Board-specific override
-declare -g BOOTCONFIG="rk3588_meko_r58x_defconfig" # specific, with nvme

config/boards/mekotronics-r58x-pro.csc

@@ -3,11 +3,9 @@ declare -g BOARD_NAME="Mekotronics R58X-Pro"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOARD_MAINTAINER=""
 declare -g KERNEL_TARGET="vendor"
+declare -g BOOTCONFIG="mekotronics_r58x-rk3588_defconfig"                       # vendor u-boot; with NVMe and a DTS
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v12-maizhuo-linux.dtb" # Specific to this board
 declare -g UEFI_EDK2_BOARD_ID="r58x"                                            # This _only_ used for uefi-edk2-rk3588 extension
 
 # Source vendor-specific configuration
 source "${SRC}/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh"
-
-# Board-specific override
-declare -g BOOTCONFIG="rk3588_meko_r58x_defconfig" # specific, with nvme

config/boards/mekotronics-r58x.csc

@@ -3,6 +3,7 @@ declare -g BOARD_NAME="Mekotronics R58X"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOARD_MAINTAINER="monkaBlyat"
 declare -g KERNEL_TARGET="vendor"
+declare -g BOOTCONFIG="mekotronics_r58x-rk3588_defconfig"               # vendor u-boot; with NVMe and a DTS
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v10-linux.dtb" # Specific to this board
 declare -g UEFI_EDK2_BOARD_ID="r58x"                                    # This _only_ used for uefi-edk2-rk3588 extension
 

config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh

@@ -16,9 +16,8 @@ declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS6 bcm43xx 1500000" # F
 enable_extension "bluetooth-hciattach"                                       # Enable the bluetooth-hciattach extension
 
 # board-like config
-declare -g BOOT_SCENARIO="spl-blobs"          # so we don't depend on defconfig naming convention
-declare -g BOOT_SOC="rk3588"                  # so we don't depend on defconfig naming convention
-declare -g BOOTCONFIG="rk3588_meko_defconfig" # generic ebv plus distro dtb hacks
+declare -g BOOT_SCENARIO="spl-blobs" # so we don't depend on defconfig naming convention
+declare -g BOOT_SOC="rk3588"         # so we don't depend on defconfig naming convention
 declare -g IMAGE_PARTITION_TABLE="gpt"
 
 # Uses default DDR_BLOB and BL31_BLOB from rockchip64_common.

config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh

@@ -4,18 +4,9 @@
 # This file is a part of the Armbian Build Framework https://github.com/armbian/build/
 #
 
-# Vendor u-boot, standard rockchip, plus patches.
+# Vendor u-boot; use the default family (rockchip-rk3588) u-boot. See config/sources/families/rockchip-rk3588.conf
 function post_family_config__vendor_uboot_mekotronics() {
-	display_alert "$BOARD" "Configuring Mekotronics R58 ($BOARD) u-boot" "info"
-
-	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	#declare -g BOOTBRANCH='branch:next-dev' # disabled, using specific commit below to avoid breakage in the future
-	declare -g BOOTBRANCH="commit:609a77ef6e99c56aacd4b8d8f9c3056378f9c761" # specific commit in next-dev branch; tested to work
-
-	declare -g BOOTDIR="u-boot-meko-rk3588"             # do not share u-boot directory
-	declare -g BOOTPATCHDIR="legacy/u-boot-meko-rk3588" # Few patches in there; MAC address & defconfig
-
-	declare -g OVERLAY_PREFIX='rockchip-rk3588'
+	display_alert "$BOARD" "Configuring $BOARD vendor u-boot" "info"
 	declare -g BOOTDELAY=1 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
 }