mksklipad50: Switch to u-boot v2025.01

.github/CODEOWNERS

@@ -27,6 +27,7 @@ config/boards/ayn-odin2.csc		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
 config/boards/bananapif3.conf		@pyavitz
+config/boards/bananapim2plus.csc		@leggewie
 config/boards/bananapim2pro.conf		@igorpecovnik
 config/boards/bananapim2s.conf		@jeanrhum @pyavitz
 config/boards/bananapim2zero.csc		@mhawkins-consultant
@@ -36,6 +37,8 @@ config/boards/bananapim4zero.conf		@pyavitz
 config/boards/bananapim5.conf		@igorpecovnik
 config/boards/bananapim64.csc		@devdotnetorg
 config/boards/bananapim7.conf		@amazingfate
+config/boards/beaglebone-ai64.conf		@Grippy98
+config/boards/beagleplay.conf		@Grippy98
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
 config/boards/bigtreetech-cb2.conf		@JohnTheCoolingFan
 config/boards/cherryba-m1.csc		@IsMrX
@@ -118,6 +121,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/pocketchip-sd.csc		@TheSnowfield
 config/boards/qemu-uboot-arm64.csc		@rpardini
 config/boards/qemu-uboot-x86.csc		@rpardini
@@ -173,7 +177,8 @@ config/boards/youyeetoo-r1-v3.csc		@SuperKali
 config/boards/yy3568.csc		@hqnicolas
 config/kernel/linux-arm64-*.config		@FantasyGmm @PeterChrz @rpardini
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
-config/kernel/linux-k3-*.config		@glneo
+config/kernel/linux-k3-*.config		@Grippy98 @glneo
+config/kernel/linux-k3-beagle-*.config		@Grippy98
 config/kernel/linux-meson-*.config		@hzyitc @juanlufont
 config/kernel/linux-meson-s4t7-*.config		@adeepn @rpardini @viraniac
 config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
@@ -186,7 +191,7 @@ config/kernel/linux-rockchip64-*.config		@150balbes @ColorfulRhino @HeyMeco @Joh
 config/kernel/linux-sm8250-*.config		@FantasyGmm @amazingfate
 config/kernel/linux-spacemit-*.config		@pyavitz
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
-config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @mhawkins-consultant @sgjava @spendist
+config/kernel/linux-sunxi-*.config		@1ubuntuuser @AaronNGray @DylanHP @Janmcha @StephenGraf @TheSnowfield @Tonymac32 @janprunk @lbmendes @leggewie @mhawkins-consultant @sgjava @spendist
 config/kernel/linux-sunxi64-*.config		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @The-going @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @krachlatte @pyavitz @schwar3kat @sicXnull @spendist @teknoid
 config/kernel/linux-thead-*.config		@chainsx
 config/kernel/linux-tqma-*.config		@schmiedelm
@@ -197,7 +202,8 @@ config/kernel/linux-wsl2-x86-*.config		@rpardini
 patch/atf/atf-arm64/		@FantasyGmm @PeterChrz @rpardini
 patch/atf/atf-bcm2711/		@PanderMusubi @teknoid
 patch/atf/atf-imx8m/		@schmiedelm
-patch/atf/atf-k3/		@glneo
+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-sm8250/		@FantasyGmm @amazingfate
@@ -207,7 +213,8 @@ patch/atf/atf-sunxi64/		@AGM1968 @IsMrX @JohnTheCoolingFan @Kreyren @NicoD-SBC @
 patch/atf/atf-wsl2-arm64/		@rpardini
 patch/kernel/archive/bcm2711-*/		@PanderMusubi @teknoid
 patch/kernel/archive/imx8m-*/		@schmiedelm
-patch/kernel/archive/k3-*/		@glneo
+patch/kernel/archive/k3-*/		@Grippy98 @glneo
+patch/kernel/archive/k3-beagle-*/		@Grippy98
 patch/kernel/archive/meson-*/		@hzyitc @juanlufont
 patch/kernel/archive/meson-s4t7-*/		@adeepn @rpardini @viraniac
 patch/kernel/archive/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @jomadeto @monkaBlyat @pyavitz @rpardini @teknoid
@@ -217,7 +224,7 @@ patch/kernel/archive/rockchip-*/		@paolosabatino
 patch/kernel/archive/rockchip64-*/		@150balbes @ColorfulRhino @HeyMeco @JohnTheCoolingFan @Manouchehri @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
 patch/kernel/archive/sm8250-*/		@FantasyGmm @amazingfate
 patch/kernel/archive/spacemit-*/		@pyavitz
-patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @The-going @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
+patch/kernel/archive/sunxi-*/		@1ubuntuuser @AGM1968 @AaronNGray @DylanHP @IsMrX @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @The-going @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @pyavitz @schwar3kat @sgjava @sicXnull @spendist @teknoid
 patch/kernel/archive/uefi-arm64-*/		@PeterChrz @rpardini
 patch/kernel/archive/uefi-x86-*/		@davidandreoletti @rpardini
 patch/kernel/archive/wsl2-arm64-*/		@rpardini
@@ -234,14 +241,15 @@ 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-spacemit-k1/		@pyavitz
-patch/u-boot/u-boot-k3/		@glneo
+patch/u-boot/u-boot-k3-beagle/		@Grippy98
+patch/u-boot/u-boot-k3/		@Grippy98 @glneo
 patch/u-boot/u-boot-meson-s4t7/		@adeepn @rpardini @viraniac
 patch/u-boot/u-boot-qemu-arm64/		@rpardini
 patch/u-boot/u-boot-qemu-x86/		@rpardini
 patch/u-boot/u-boot-rockchip64-v2022.04/		@Manouchehri @TRSx80 @TheSnowfield @ahoneybun @paolosabatino
 patch/u-boot/u-boot-rockchip64/		@Tonymac32 @andyshrk @clee @igorpecovnik @paolosabatino @prahal @redrathnure @sicXnull @torte71
 patch/u-boot/u-boot-sunxi-crust/		@AGM1968 @Kreyren @NicoD-SBC @PanderMusubi @Tonymac32 @devdotnetorg @schwar3kat @spendist @teknoid
-patch/u-boot/u-boot-sunxi/		@1ubuntuuser @AGM1968 @DylanHP @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @mhawkins-consultant @schwar3kat @sgjava @sicXnull @spendist @teknoid
+patch/u-boot/u-boot-sunxi/		@1ubuntuuser @AGM1968 @DylanHP @Janmcha @JohnTheCoolingFan @Kreyren @NicoD-SBC @PanderMusubi @Ressetkk @StephenGraf @TheSnowfield @Tonymac32 @alexl83 @chraac @devdotnetorg @eliasbakken @janprunk @krachlatte @lbmendes @leggewie @mhawkins-consultant @schwar3kat @sgjava @sicXnull @spendist @teknoid
 patch/u-boot/u-boot-sunxi/board_bananapim3/		@AaronNGray
 patch/u-boot/u-boot-tqma/		@schmiedelm
 patch/u-boot/v2022.01/		@teknoid
@@ -267,7 +275,7 @@ patch/u-boot/v2025.04/		@SuperKali @Tonymac32
 sources/families/bcm2711.conf		@PanderMusubi @teknoid
 sources/families/imx8m.conf		@schmiedelm
 sources/families/jethub.conf		@adeepn
-sources/families/k3.conf		@glneo
+sources/families/k3.conf		@Grippy98 @glneo
 sources/families/meson-axg.conf		@pyavitz
 sources/families/meson-g12a.conf		@clee @engineer-80
 sources/families/meson-g12b.conf		@NicoD-SBC @Tonymac32 @jeanrhum @monkaBlyat @pyavitz @rpardini
@@ -294,7 +302,7 @@ sources/families/sun50iw9.conf		@AGM1968 @IsMrX @JohnTheCoolingFan @Ressetkk @al
 sources/families/sun55iw3-syterkit.conf		@chainsx
 sources/families/sun5i.conf		@TheSnowfield
 sources/families/sun7i.conf		@DylanHP @janprunk
-sources/families/sun8i.conf		@1ubuntuuser @AaronNGray @Janmcha @StephenGraf @Tonymac32 @lbmendes @mhawkins-consultant @sgjava @spendist
+sources/families/sun8i.conf		@1ubuntuuser @AaronNGray @Janmcha @StephenGraf @Tonymac32 @lbmendes @leggewie @mhawkins-consultant @sgjava @spendist
 sources/families/thead.conf		@chainsx
 sources/families/uefi-arm64.conf		@PeterChrz @rpardini
 sources/families/uefi-x86.conf		@davidandreoletti @rpardini

config/boards/bananapim2plus.csc

@@ -1,7 +1,7 @@
 # Allwinner H3 quad core 1Gb RAM SoC Wifi GBE
 BOARD_NAME="Banana Pi M2+"
 BOARDFAMILY="sun8i"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="leggewie"
 BOOTCONFIG="bananapi_m2_plus_h3_defconfig"
 DEFAULT_OVERLAYS="analog-codec"
 MODULES_CURRENT="g_serial"

config/boards/beaglebone-ai64.conf

@@ -0,0 +1,18 @@
+# BeagleBone® AI-64 dual core 4GB GBE USB3 OSPI DisplayPort HDMI
+
+BOARD_NAME="BeagleBone AI-64"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="Grippy98"
+BOOTCONFIG="j721e_beagleboneai64_a72_defconfig"
+BOOTFS_TYPE="fat"
+BOOT_FDT_FILE="ti/k3-j721e-beagleboneai64.dts"
+TIBOOT3_BOOTCONFIG="j721e_beagleboneai64_r5_defconfig"
+TIBOOT3_FILE="tiboot3-j721e-gp-evm.bin"
+SYSFW_FILE="sysfw-j721e-gp-evm.itb"
+TISPL_FILE="tispl.bin_unsigned"
+UBOOT_FILE="u-boot.img_unsigned"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+SERIALCON="ttyS2"
+ATF_BOARD="generic"

config/boards/beagleplay.conf

@@ -0,0 +1,17 @@
+# TI AM62 quad core 2GB DDR4 16GB eMMC 1xGBE 1xSPE HDMI
+
+BOARD_NAME="BeaglePlay"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="Grippy98"
+BOOTCONFIG="am62x_beagleplay_a53_defconfig"
+BOOTFS_TYPE="fat"
+BOOT_FDT_FILE="ti/k3-am625-beagleplay.dts"
+TIBOOT3_BOOTCONFIG="am62x_beagleplay_r5_defconfig"
+TIBOOT3_FILE="tiboot3-am62x-gp-evm.bin"
+TISPL_FILE="tispl.bin_unsigned"
+UBOOT_FILE="u-boot.img_unsigned"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+SERIALCON="ttyS2"
+ATF_BOARD="lite"

config/boards/mksklipad50.conf

@@ -10,3 +10,10 @@ BOOT_LOGO="desktop"
 MODULES="pinctrl-rk805 ads7846 spidev"
 BOOTFS_TYPE="fat"
 PACKAGE_LIST_BOARD="build-essential usb-modeswitch"
+
+BOOTBRANCH='tag:v2025.01'
+BOOTPATCHDIR='v2025.01'
+
+function post_family_config__uboot_config() {
+        BOOTDELAY=1 # Wait for UART
+}

config/boards/orangepi5-ultra.csc

@@ -0,0 +1,57 @@
+# Rockchip RK3588 octa core whatever fixme
+BOARD_NAME="Orange Pi 5 Ultra"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER=""
+BOOTCONFIG="orangepi-5-ultra-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
+BOOT_SOC="rk3588"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current,edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-orangepi-5-ultra.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+#enable_extension "bcmdhd"
+BCMDHD_TYPE="sdio"
+
+# for testing purpose only. needs adaption to mainline once this makes it into 6.15 or .16
+function post_family_config_branch_edge__orangepi5-ultra_use_custom_source() {
+	KERNEL_MAJOR_MINOR="6.14"   # Major and minor versions of this kernel.
+	KERNELSOURCE='https://github.com/jimmyhon/linux.git'
+	KERNELBRANCH='branch:integrate-6.15'
+	KERNELPATCHDIR='integrate-6.15'
+	EXTRAWIFI=no # due to absence of our own fixups 3rd party wifi drivers break
+}
+
+function post_family_tweaks__orangepi5ultra_naming_audios() {
+	display_alert "$BOARD" "Renaming orangepi5ultra audios" "info"
+
+	mkdir -p $SDCARD/etc/udev/rules.d/
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi0-sound", ENV{SOUND_DESCRIPTION}="HDMI0 Audio"' > $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-hdmi1-sound", ENV{SOUND_DESCRIPTION}="HDMI1 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+	echo 'SUBSYSTEM=="sound", ENV{ID_PATH}=="platform-es8388-sound", ENV{SOUND_DESCRIPTION}="ES8388 Audio"' >> $SDCARD/etc/udev/rules.d/90-naming-audios.rules
+
+	return 0
+}
+
+function post_family_tweaks_bsp__orangepi5ultra_bluetooth() {
+	display_alert "$BOARD" "Installing ap6611s-bluetooth.service" "info"
+
+	# Bluetooth on this board is handled by a Broadcom (AP6611S) chip and requires
+	# a custom brcm_patchram_plus binary, plus a systemd service to run it at boot time
+	install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
+	cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/ap6611s-bluetooth.service
+
+	# Reuse the service file, ttyS0 -> ttyS7; BCM4345C5.hcd -> SYN43711A0.hcd
+	sed -i 's/ttyS0/ttyS7/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
+	sed -i 's/BCM4345C5.hcd/SYN43711A0.hcd/g' $destination/lib/systemd/system/ap6611s-bluetooth.service
+	return 0
+}
+
+function post_family_tweaks__orangepi5ultra_enable_bluetooth_service() {
+	display_alert "$BOARD" "Enabling ap6611s-bluetooth.service" "info"
+	chroot_sdcard systemctl enable ap6611s-bluetooth.service
+	return 0
+}

config/boards/orangepi5.conf

@@ -14,12 +14,32 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 IMAGE_PARTITION_TABLE="gpt"
-KERNEL_UPGRADE_FREEZE="vendor-rk35xx@24.8.1"
 declare -g UEFI_EDK2_BOARD_ID="orangepi-5" # This _only_ used for uefi-edk2-rk3588 extension
 
-# @TODO: consider removing those, as the defaults in rockchip64_common have been bumped up
-DDR_BLOB='rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.15.bin'
-BL31_BLOB='rk35/rk3588_bl31_v1.44.elf'
+# Mainline U-Boot for current kernel
+function post_family_config_branch_current__orangepi5_use_mainline_uboot() {
+	display_alert "$BOARD" "Mainline U-Boot overrides for $BOARD - $BRANCH" "info"
+
+	declare -g BOOTCONFIG="orangepi-5-rk3588s_defconfig"         # override the default for the board/family
+	declare -g BOOTDELAY=1                                       # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ mainline U-Boot
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01"
+	declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
+	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
+
+	# 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
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
+
+
 
 declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS9 bcm43xx 1500000" # For the bluetooth-hciattach extension
 enable_extension "bluetooth-hciattach"                                       # Enable the bluetooth-hciattach extension

config/boards/pocketbeagle2.csc

@@ -0,0 +1,28 @@
+#Texas Instruments AM62 dual core 1GB USB2 DDR4
+
+BOARD_NAME="PocketBeagle 2"
+BOARDFAMILY="k3"
+BOARD_MAINTAINER="Grippy98"
+BOOTCONFIG="am6232_pocketbeagle2_a53_defconfig"
+BOOTFS_TYPE="fat"
+BOOT_FDT_FILE="k3-am6232-pocketbeagle2.dts"
+TIBOOT3_BOOTCONFIG="am6232_pocketbeagle2_r5_defconfig"
+TIBOOT3_FILE="tiboot3-am62x-hs-fs-evm.bin"
+DEFAULT_CONSOLE="serial"
+KERNEL_TARGET="edge"
+KERNEL_TEST_TARGET="edge"
+SERIALCON="ttyS2"
+ATF_BOARD="lite"
+
+#Until PB2 goes upstream, use this branch
+function post_family_config_branch_edge__pocketbeagle2_use_beagle_kernel_uboot() {
+	display_alert "$BOARD" " beagleboard (next branch) u-boot and kernel overrides for $BOARD / $BRANCH" "info"
+
+	declare -g KERNELSOURCE="https://github.com/beagleboard/linux" # BeagleBoard kernel
+	declare -g KERNEL_MAJOR_MINOR="6.12"
+	declare -g KERNELBRANCH="branch:v6.12.13-ti-arm64-r24"
+	declare -g LINUXFAMILY="k3-beagle" # Separate kernel package from the regular `k3` family
+
+	declare -g BOOTSOURCE="https://github.com/beagleboard/u-boot" # BeagleBoard u-boot
+	declare -g BOOTBRANCH="branch:v2025.01-pocketbeagle2"
+}

config/boards/rpi4b.conf

@@ -2,7 +2,7 @@
 declare -g BOARD_NAME="Raspberry Pi"
 declare -g BOARDFAMILY="bcm2711"
 declare -g BOARD_MAINTAINER="PanderMusubi teknoid"
-declare -g KERNEL_TARGET="current,edge"
+declare -g KERNEL_TARGET="legacy,current,edge"
 declare -g ASOUND_STATE="asound.state.rpi"
 declare -g KERNEL_TEST_TARGET="current"
 declare -g MODULES="i2c_dev"