extension: add ksrc packaging

.github/CODEOWNERS

@@ -32,7 +32,7 @@ config/boards/bananapim2pro.conf		@igorpecovnik
 config/boards/bananapim2s.conf		@jeanrhum @pyavitz
 config/boards/bananapim2zero.csc		@mhawkins-consultant
 config/boards/bananapim3.csc		@AaronNGray
-config/boards/bananapim4berry.csc		@The-going
+config/boards/bananapim4berry.conf		@The-going
 config/boards/bananapim4zero.conf		@pyavitz
 config/boards/bananapim5.conf		@igorpecovnik
 config/boards/bananapim64.csc		@devdotnetorg
@@ -55,6 +55,7 @@ config/boards/helios4.conf		@Heisath
 config/boards/helios64.conf		@prahal
 config/boards/hinlink-h28k.csc		@sputnik2019
 config/boards/hinlink-ht2.csc		@hoochiwetech
+config/boards/imb3588.conf		@JackHuang021
 config/boards/indiedroid-nova.csc		@lanefu
 config/boards/inovato-quadra.conf		@NicoD-SBC
 config/boards/jethubj100.conf		@adeepn
@@ -121,7 +122,7 @@ config/boards/orangepizeroplus.csc		@schwar3kat
 config/boards/phytiumpi.conf		@chainsx
 config/boards/pine64.conf		@PanderMusubi
 config/boards/pinebook-pro.csc		@TRSx80 @ahoneybun
-config/boards/pocketbeagle2.csc		@Grippy98
+config/boards/pocketbeagle2.conf		@Grippy98
 config/boards/pocketchip-sd.csc		@TheSnowfield
 config/boards/qcom-robotics-rb5.conf		@FantasyGmm
 config/boards/qemu-uboot-arm64.csc		@rpardini
@@ -188,7 +189,7 @@ config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
-config/kernel/linux-rk35xx-*.config		@CodeChenL @ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+config/kernel/linux-rk35xx-*.config		@CodeChenL @ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @andyshrk @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
 config/kernel/linux-rockchip64-*.config		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @SuperKali @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @alexl83 @amazingfate @andyshrk @brentr @catalinii @clee @efectn @fridtjof @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @lanefu @linhz0hz @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @schwar3kat @sicXnull @tdleiyao @torte71 @utlark @vamzii
 config/kernel/linux-sm8250-*.config		@FantasyGmm @amazingfate
@@ -207,11 +208,11 @@ config/kernel/linux-wsl2-x86-*.config		@rpardini
 patch/atf/atf-arm64/		@PeterChrz @rpardini
 patch/atf/atf-bcm2711/		@PanderMusubi @teknoid
 patch/atf/atf-genio/		@HeyMeco
-patch/atf/atf-imx8m/		@schmiedelm
+patch/atf/atf-imx8/		@schmiedelm
 patch/atf/atf-k3-beagle/		@Grippy98
 patch/atf/atf-k3/		@Grippy98 @glneo
 patch/atf/atf-phytium-embedded/		@chainsx
-patch/atf/atf-rockchip64/		@ColorfulRhino @TRSx80 @ahoneybun @andyshrk @clee @joekhoobyar @paolosabatino @prahal
+patch/atf/atf-rockchip64/		@ColorfulRhino @SuperKali @TRSx80 @Tonymac32 @ahoneybun @andyshrk @clee @joekhoobyar @paolosabatino @prahal
 patch/atf/atf-sm8250/		@FantasyGmm @amazingfate
 patch/atf/atf-sm8550/		@FantasyGmm
 patch/atf/atf-spacemit/		@pyavitz
@@ -239,7 +240,7 @@ patch/kernel/archive/wsl2-arm64-*/		@rpardini
 patch/kernel/archive/wsl2-x86-*/		@rpardini
 patch/kernel/genio-1200-*/		@HeyMeco
 patch/kernel/phytium-embedded-*/		@chainsx
-patch/kernel/rk35xx-vendor-*/		@CodeChenL @ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
+patch/kernel/rk35xx-vendor-*/		@CodeChenL @ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @andyshrk @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 patch/kernel/starfive2-*/		@libiunc
 patch/kernel/sun55iw3-syterkit-*/		@chainsx
 patch/kernel/thead-*/		@chainsx
@@ -248,7 +249,7 @@ patch/u-boot/legacy/		@chainsx @joekhoobyar @juanlufont @lanefu
 patch/u-boot/legacy/u-boot-clearfog/		@Heisath
 patch/u-boot/legacy/u-boot-helios4/		@Heisath
 patch/u-boot/legacy/u-boot-khadas-edge2-rk3588/		@efectn
-patch/u-boot/legacy/u-boot-radxa-rk35xx/		@CodeChenL @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @tdleiyao @vamzii
+patch/u-boot/legacy/u-boot-radxa-rk35xx/		@CodeChenL @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @hqnicolas @krachlatte @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @tdleiyao @vamzii
 patch/u-boot/legacy/u-boot-spacemit-k1/		@pyavitz
 patch/u-boot/u-boot-beagle/		@Grippy98
 patch/u-boot/u-boot-k3-beagle/		@Grippy98
@@ -270,17 +271,17 @@ patch/u-boot/v2023.10/		@adeepn
 patch/u-boot/v2024.01/		@Tonymac32 @rpardini
 patch/u-boot/v2024.01/board_orangepi5/		@efectn
 patch/u-boot/v2024.04-rock5b-radxa/		@amazingfate @linhz0hz
-patch/u-boot/v2024.04/		@Tonymac32 @chraac @igorpecovnik @pyavitz @utlark
+patch/u-boot/v2024.04/		@Tonymac32 @chraac @pyavitz @utlark
 patch/u-boot/v2024.07-coolpi-cm5/		@andyshrk
 patch/u-boot/v2024.07/		@adeepn @igorpecovnik @monkaBlyat
 patch/u-boot/v2024.07/board_station-m1/		@150balbes
-patch/u-boot/v2024.10/		@HeyMeco @alexl83 @brentr @fridtjof
+patch/u-boot/v2024.10/		@HeyMeco @alexl83 @brentr @fridtjof @pyavitz
 patch/u-boot/v2024.10/board_bigtreetech-cb2/		@JohnTheCoolingFan
 patch/u-boot/v2025-sunxi/		@The-going
 patch/u-boot/v2025.01-rc3-coolpi-cm5/		@andyshrk
 patch/u-boot/v2025.01/		@ColorfulRhino @efectn @jeanrhum @joekhoobyar @paolosabatino @pyavitz @rpardini @torte71
 patch/u-boot/v2025.01/board_h96-tvbox-3566/		@hqnicolas
-patch/u-boot/v2025.04/		@IsMrX @NicoD-SBC @SuperKali @TheSnowfield @Tonymac32 @ZazaBR @amazingfate @andyshrk @catalinii @mlegenovic @rpardini @vamzii
+patch/u-boot/v2025.04/		@IsMrX @NicoD-SBC @SuperKali @TheSnowfield @Tonymac32 @ZazaBR @amazingfate @andyshrk @catalinii @igorpecovnik @mlegenovic @rpardini @vamzii
 sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/genio.conf		@HeyMeco
 sources/families/imx8m.conf		@schmiedelm
@@ -298,7 +299,7 @@ sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
 sources/families/rk35xx.conf		@CodeChenL @ZazaBR @amazingfate @andyshrk @catalinii @hoochiwetech @hqnicolas @krachlatte @mattx433 @sputnik2019 @tdleiyao @vamzii
-sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @chainsx @efectn @fridtjof @ginkage @lanefu @linhz0hz @mahdichi @monkaBlyat @prahal @rpardini @schwar3kat
+sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @JackHuang021 @SeeleVolleri @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @chainsx @efectn @fridtjof @ginkage @lanefu @linhz0hz @mahdichi @monkaBlyat @prahal @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
 sources/families/rockchip64.conf		@150balbes @JohnTheCoolingFan @TRSx80 @TheSnowfield @Tonymac32 @ahoneybun @andyshrk @brentr @clee @hqnicolas @igorpecovnik @joekhoobyar @mlegenovic @paolosabatino @prahal @redrathnure @rpardini @sicXnull @torte71 @utlark
 sources/families/sm8250.conf		@FantasyGmm @amazingfate

.github/workflows/pr-kernel-security-analysis.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@480f49412651059a414a6a5c96887abb1877de8a # v46.0.3
+        uses: tj-actions/changed-files@4140eb99d2cced9bfd78375c2088371853262f79 # v46.0.3
 
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/pr-lint-scripts.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@480f49412651059a414a6a5c96887abb1877de8a # v46.0.3
+        uses: tj-actions/changed-files@4140eb99d2cced9bfd78375c2088371853262f79 # v46.0.3
 
       - name: List all changed files
         run: |

.github/workflows/scorecard.yml

@@ -33,7 +33,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/[email protected].1
+        uses: ossf/[email protected].2
         with:
           results_file: results.sarif
           results_format: sarif

README.md

@@ -187,6 +187,7 @@ Function | Armbian | Yocto | Buildroot |
     ├── config-example.conf              User: example user config file
     ├── customize-image.sh               User: script will execute just before closing the image
     ├── atf                              User: ARM trusted firmware
+    ├── extensions                       User: Extend build system with specific functionality
     ├── kernel                           User: Linux kernel per kernel family
     ├── misc                             User: various
     └── u-boot                           User: universal boot loader patches

config/boards/bananapim4berry.csc → config/boards/bananapim4berry.conf

@@ -13,23 +13,14 @@ BOOT_LOGO="desktop"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 
-PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"
+PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools hostapd"
 
 function post_family_tweaks_bsp__bananapi_module_conf() {
 
 	mkdir -p "${destination}"/etc/modprobe.d/
-	display_alert "$BOARD" "Configuring rlt8821cu wifi module" "info"
+	display_alert "$BOARD" "Configuring rtl8821cu wifi module" "info"
 
-	cat <<-EOF > "${destination}"/etc/modprobe.d/8821cu.conf
-		# https://github.com/morrownr/8821cu-20210916/blob/main/8821cu.conf
-		#
-		# To see all options that are available:
-		#
-		# for f in /sys/module/8821cu/parameters/*;do echo "\$(basename \$f): \$(sudo cat \$f)";done
-		#
-		blacklist rtw88_8821cu
-		#
-		options 8821cu rtw_led_ctrl=2
-	EOF
+	cp -f "${SRC}"/packages/bsp/wifi-rtl8821cu/etc/modprobe.d/8821cu.conf \
+			"${destination}"/etc/modprobe.d/8821cu.conf
 
 }

config/boards/beaglebone-ai64.conf

@@ -16,3 +16,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
+OPTEE_ARGS=""
+OPTEE_PLATFORM="k3-j721e"

config/boards/beagleplay.conf

@@ -15,3 +15,5 @@ KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
+OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1"
+OPTEE_PLATFORM="k3-am62x"

config/boards/beagley-ai.csc

@@ -13,6 +13,8 @@ KERNEL_TARGET="current"
 KERNEL_TEST_TARGET="current"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
+OPTEE_ARGS=""
+OPTEE_PLATFORM="k3-am62x"
 
 # Use these branches until BeagleY-AI goes upstream
 function post_family_config_branch_current__beagley_ai_use_beagle_kernel_uboot() {

config/boards/cainiao-cniot-core.csc

@@ -0,0 +1,90 @@
+# Amlogic A311D 2GB RAM 16GB eMMC GBE USB3 RTL8822CS WiFi/BT
+BOARD_NAME="CAINIAO CNIoT-CORE"
+BOARDFAMILY="meson-g12b"
+BOARD_MAINTAINER=""
+BOOTCONFIG="cainiao-cniot-core_defconfig"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+MODULES_BLACKLIST="simpledrm" # SimpleDRM conflicts with Panfrost on the CAINIAO CNIoT-CORE
+FULL_DESKTOP="yes"
+SERIALCON="ttyAML0"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="amlogic/meson-g12b-a311d-cainiao-cniot-core.dtb"
+# playback via HDMI: aplay -D plughw:CNIoTCORE,0 /usr/share/sounds/alsa/Front_Center.wav
+# playback via internal speaker: aplay -D plughw:CNIoTCORE,1 /usr/share/sounds/alsa/Front_Center.wav
+ASOUND_STATE="asound.state.cainiao-cniot-core"
+
+BOOTBRANCH_BOARD="tag:v2025.04"
+BOOTPATCHDIR="v2025.04" # This has a patch that adds support for CAINIAO CNIoT-CORE.
+
+function post_family_config__use_repacked_fip() {
+	declare -g UBOOT_TARGET_MAP="u-boot.bin"
+	unset write_uboot_platform
+
+	function write_uboot_platform() {
+		dd if="$1/u-boot.bin" of="$2" bs=512 seek=1 conv=fsync 2>&1
+	}
+}
+
+function fetch_sources_tools__get_vendor_fip_and_gxlimg_source() {
+	fetch_from_repo "https://github.com/retro98boy/cainiao-cniot-core-linux.git" "cainiao-cniot-core-linux" "commit:30273c25aeabf75f609cff2c4fa7264335c295a8"
+	fetch_from_repo "https://github.com/repk/gxlimg.git" "gxlimg" "commit:0d0e5ba9cf396d1338067e8dc37a8bcd2e6874f1"
+}
+
+function build_host_tools__install_gxlimg() {
+	# Compile and install only if git commit hash changed
+	cd "${SRC}/cache/sources/gxlimg" || exit
+	# need to check if /usr/local/bin/gxlimg to detect new Docker containers with old cached sources
+	if [[ ! -f .commit_id || $(git rev-parse @ 2> /dev/null) != $(< .commit_id) || ! -f /usr/local/bin/gxlimg ]]; then
+		display_alert "Compiling" "gxlimg" "info"
+		run_host_command_logged make distclean
+		run_host_command_logged make
+		install -Dm0755 gxlimg /usr/local/bin/gxlimg
+		git rev-parse @ 2> /dev/null > .commit_id
+	fi
+}
+
+function post_uboot_custom_postprocess__repack_vendor_fip_with_mainline_uboot() {
+	display_alert "${BOARD}" "Repacking vendor FIP with mainline u-boot.bin" "info"
+
+	BLOBS_DIR="${SRC}/cache/sources/cainiao-cniot-core-linux"
+	EXTRACT_DIR="${BLOBS_DIR}/extract"
+	AML_ENCRYPT="${SRC}/cache/sources/amlogic-boot-fip/khadas-vim3/aml_encrypt_g12b"
+
+	if [ ! -f "$AML_ENCRYPT" ]; then
+		display_alert "${BOARD}" "amlogic-boot-fip/khadas-vim3/aml_encrypt_g12b not exist" "err"
+		exit 1
+	fi
+
+	mv u-boot.bin raw-u-boot.bin
+	rm -f "${EXTRACT_DIR}/bl33.enc"
+	# The current version of gxlimg has a problem with the handling of bl3x,
+	# which may cause the produced fip to fail to boot.
+	# see https://github.com/repk/gxlimg/issues/19
+	# run_host_command_logged gxlimg -t bl3x -s raw-u-boot.bin "${EXTRACT_DIR}/bl33.enc"
+	run_host_x86_binary_logged "$AML_ENCRYPT" --bl3sig \
+		--input raw-u-boot.bin \
+		--output "${EXTRACT_DIR}/bl33.enc" \
+		--level v3 --type bl33
+	run_host_command_logged gxlimg \
+		-t fip \
+		--bl2 "${EXTRACT_DIR}/bl2.sign" \
+		--ddrfw "${EXTRACT_DIR}/ddr4_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/ddr4_2d.fw" \
+		--ddrfw "${EXTRACT_DIR}/ddr3_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/piei.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr4_1d.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr4_2d.fw" \
+		--ddrfw "${EXTRACT_DIR}/diag_lpddr4.fw" \
+		--ddrfw "${EXTRACT_DIR}/aml_ddr.fw" \
+		--ddrfw "${EXTRACT_DIR}/lpddr3_1d.fw" \
+		--bl30 "${EXTRACT_DIR}/bl30.enc" \
+		--bl31 "${EXTRACT_DIR}/bl31.enc" \
+		--bl33 "${EXTRACT_DIR}/bl33.enc" \
+		--rev v3 u-boot.bin
+
+	if [ ! -s u-boot.bin ]; then
+		display_alert "${BOARD}" "FIP repack produced empty u-boot.bin" "err"
+		exit 1
+	fi
+}

config/boards/coolpi-genbook.csc

@@ -5,7 +5,7 @@ BOARD_MAINTAINER="andyshrk"
 BOARD_FIRMWARE_INSTALL="-full"
 BOOT_SOC="rk3588"
 BOOTCONFIG="coolpi-cm5-genbook-rk3588_defconfig"
-KERNEL_TARGET="edge"
+KERNEL_TARGET="edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-coolpi-cm5-genbook.dtb"
@@ -15,13 +15,13 @@ BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
 
 # Mainline U-Boot
-function post_family_config_branch_edge__coolpi-genbook_use_mainline_uboot() {
+function post_family_config__coolpi-genbook_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
 
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # Mainline U-Boot
 	unset BOOTBRANCH
 	declare -g BOOTPATCHDIR="v2025.01-rc3-coolpi-cm5"
-	declare -g BOOTBRANCH_BOARD="tag:v2025.01"
+	declare -g BOOTBRANCH_BOARD="tag:v2025.04"
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
 

config/boards/gateway-gz80x.conf

@@ -5,8 +5,8 @@ BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="amper_gateway_am-gz80x_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-BOOTBRANCH_BOARD="tag:v2025.01"
-BOOTPATCHDIR="v2025.01"
+BOOTBRANCH_BOARD="tag:v2024.10"
+BOOTPATCHDIR="v2024.10"
 BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"

config/boards/helios4.conf

@@ -13,4 +13,5 @@ KERNEL_TEST_TARGET="current"
 
 function post_family_config__helios4_extra_packages() {
 	add_packages_to_image "fancontrol"
+	add_packages_to_image "ethtool"
 }

config/boards/imb3588.conf

@@ -0,0 +1,14 @@
+# Rockchip RK3588 SoC with 4/8/16GB RAM, 16GBB/32GB/64GB/128GB EMMC, m.2 SATA, USB3, USB2, 2xGbE, WIFI6, BT5.1, LCDS, MIPI, eDP, HDMI
+BOARD_NAME="IMB3588"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="JackHuang021"
+BOOTCONFIG="imb3588_defconfig"
+BOOT_SOC="rk3588"
+KERNEL_TARGET="vendor"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-yx-imb3588.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"

config/boards/khadas-edge2.conf

@@ -33,7 +33,7 @@ function post_family_config__uboot_kedge2() {
 	display_alert "$BOARD" "Configuring ($BOARD) u-boot" "info"
 
 	declare -g BOOTSOURCE='https://github.com/khadas/u-boot.git'
-	declare -g BOOTBRANCH='branch:khadas-edges-v2017.09'
+	declare -g BOOTBRANCH="commit:df276095a29a02f8e7ce4f451770c06486106594"
 	declare -g BOOTPATCHDIR="legacy/u-boot-khadas-edge2-rk3588"
 	declare -g BOOTCONFIG="khadas-edge2-rk3588s_defconfig"
 	declare -g SRC_EXTLINUX="yes" # For now, use extlinux. Thanks Monka

config/boards/khadas-vim3.conf

@@ -12,7 +12,7 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-khadas-vim3.dtb" # there is also a s922x dtb, but vim3 is a311d only
 ASOUND_STATE="asound.state.khadas-vim3"
 
-BOOTBRANCH_BOARD="tag:v2025.04-rc5"
+BOOTBRANCH_BOARD="tag:v2025.04"
 BOOTPATCHDIR="v2025.04" # this has 'board_khadas-vim3' which has a patch to boot USB/NVMe/SCSI first
 
 declare -g KHADAS_OOWOW_BOARD_ID="VIM3" # for use with EXT=output-image-oowow

config/boards/mixtile-blade3.csc

@@ -12,8 +12,13 @@ declare -g UEFI_EDK2_BOARD_ID="blade3" # This _only_ used for uefi-edk2-rk3588 e
 
 # 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 $BOARD vendor u-boot" "info"
+	display_alert "$BOARD" "Configuring $BOARD vendor u-boot (using Radxa's older next-dev-v2024.03)" "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
+
+	# Override the stuff from rockchip-rk3588 family; Meko's have a patch for stable MAC address that breaks with Radxa's next-dev-v2024.10+
+	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
+	declare -g BOOTBRANCH='branch:next-dev-v2024.03' # NOT next-dev-v2024.10
+	declare -g BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
 }
 
 function post_family_config_branch_edge__different_dtb_for_edge() {