Merge branch 'main' of https://github.com/shenmintao/build

.github/CODEOWNERS

@@ -30,7 +30,7 @@ config/boards/bananapim2s.conf		@jeanrhum @pyavitz
 config/boards/bananapim2zero.csc		@mhawkins-consultant
 config/boards/bananapim3.csc		@AaronNGray
 config/boards/bananapim4zero.conf		@pyavitz
-config/boards/bananapim5.conf		@bretmlw
+config/boards/bananapim5.conf		@igorpecovnik
 config/boards/bananapim64.csc		@devdotnetorg
 config/boards/bananapim7.conf		@amazingfate
 config/boards/bigtreetech-cb1.conf		@JohnTheCoolingFan
@@ -90,7 +90,7 @@ config/boards/odroidhc4.conf		@igorpecovnik
 config/boards/odroidm1.conf		@rpardini
 config/boards/odroidn2.conf		@NicoD-SBC
 config/boards/odroidxu4.conf		@joekhoobyar
-config/boards/olimex-teres-a64.conf		@Kreyren
+config/boards/olimex-teres-a64.csc		@Kreyren
 config/boards/onecloud.conf		@hzyitc
 config/boards/oneplus-kebab.conf		@amazingfate
 config/boards/orangepi4-lts.conf		@paolosabatino
@@ -100,10 +100,10 @@ config/boards/orangepi5.conf		@efectn
 config/boards/orangepione.conf		@StephenGraf
 config/boards/orangepipc.csc		@lbmendes
 config/boards/orangepipcplus.csc		@Janmcha
-config/boards/orangepizero2.wip		@AGM1968 @krachlatte
+config/boards/orangepizero2.csc		@AGM1968 @krachlatte
 config/boards/orangepizero2w.csc		@chraac
 config/boards/orangepizero3.csc		@alexl83 @chraac
-config/boards/orangepizeroplus.conf		@schwar3kat
+config/boards/orangepizeroplus.csc		@schwar3kat
 config/boards/phytiumpi.conf		@chainsx
 config/boards/pine64.conf		@PanderMusubi
 config/boards/pinebook-pro.csc		@TRSx80 @ahoneybun
@@ -141,7 +141,7 @@ config/boards/sk-tda4vm.conf		@glneo
 config/boards/station-m1.csc		@150balbes
 config/boards/station-m3.csc		@chainsx
 config/boards/sweet-potato.conf		@Tonymac32
-config/boards/thinkpad-x13s.wip		@PeterChrz @rpardini
+config/boards/thinkpad-x13s.conf		@PeterChrz @rpardini
 config/boards/tinkerboard.conf		@paolosabatino
 config/boards/tritium-h3.conf		@Tonymac32
 config/boards/tritium-h5.conf		@Tonymac32
@@ -152,15 +152,15 @@ config/boards/wsl2-x86.csc		@rpardini
 config/boards/x96-mate.tvb		@Ressetkk
 config/boards/x96q.tvb		@sicXnull
 config/boards/xiaomi-elish.conf		@amazingfate
-config/boards/xiaomi-umi.conf		@FantasyGmm
+config/boards/xiaomi-umi.eos		@FantasyGmm
 config/boards/youyeetoo-r1-v3.csc		@SuperKali
 config/kernel/linux-arm64-*.config		@FantasyGmm
 config/kernel/linux-bcm2711-*.config		@PanderMusubi @teknoid
 config/kernel/linux-imx8m-*.config		@schmiedelm
 config/kernel/linux-k3-*.config		@glneo
 config/kernel/linux-meson-*.config		@hzyitc
 config/kernel/linux-meson-s4t7-*.config		@adeepn @rpardini @viraniac
-config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+config/kernel/linux-meson64-*.config		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 config/kernel/linux-mvebu-*.config		@Heisath
 config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
@@ -184,7 +184,7 @@ patch/kernel/bcm2711-*/		@PanderMusubi @teknoid
 patch/kernel/imx8m-*/		@schmiedelm
 patch/kernel/k3-*/		@glneo
 patch/kernel/meson-*/		@hzyitc
-patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+patch/kernel/meson64-*/		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 patch/kernel/mvebu-*/		@Heisath
 patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/phytium-embedded-*/		@chainsx
@@ -202,7 +202,7 @@ sources/families/imx8m.conf		@schmiedelm
 sources/families/k3.conf		@glneo
 sources/families/meson-s4t7.conf		@adeepn @rpardini @viraniac
 sources/families/meson.conf		@hzyitc
-sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
+sources/families/meson64.conf		@NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
 sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx

config/boards/bananapim5.conf

@@ -1,7 +1,7 @@
 # Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI
 BOARD_NAME="Banana Pi M5"
 BOARDFAMILY="meson-sm1"
-BOARD_MAINTAINER="bretmlw"
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="bananapi-m5_defconfig"
 BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m5.dtb"
 KERNEL_TARGET="current,edge"

config/boards/coolpi-genbook.csc

@@ -0,0 +1,36 @@
+# Rockchip RK3588 SoC octa core 4-16GB SoC eMMC USB3 NVME
+BOARD_NAME="CoolPi GenBook"
+BOARDFAMILY="rockchip-rk3588"
+BOARD_MAINTAINER="Andyshrk"
+BOARD_FIRMWARE_INSTALL="-full"
+BOOT_SOC="rk3588"
+BOOTCONFIG="coolpi-cm5-genbook-rk3588_defconfig"
+KERNEL_TARGET="edge"
+FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"
+BOOT_FDT_FILE="rockchip/rk3588-coolpi-cm5-genbook.dtb"
+BOOT_SCENARIO="spl-blobs"
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"
+IMAGE_PARTITION_TABLE="gpt"
+
+# Mainline U-Boot
+function post_family_config_branch_edge__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
+	unset BOOTPATCHDIR
+	declare -g BOOTBRANCH_BOARD="tag:v2025.01-rc3"
+	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
+	}
+}

config/boards/retroidpocket-rp5.csc

@@ -1,6 +1,6 @@
 # Retroid Pocket RP5 Configuration
 declare -g BOARD_NAME="Retroid Pocket RP5"
-declare -g BOARD_MAINTAINER="tjstyle"
+declare -g BOARD_MAINTAINER=""
 declare -g BOARDFAMILY="sm8250"
 declare -g KERNEL_TARGET="current"
 declare -g EXTRAWIFI="no"

config/boards/retroidpocket-rpmini.csc

@@ -1,6 +1,6 @@
 # Retroid Pocket RPMini Configuration
 declare -g BOARD_NAME="Retroid Pocket RPMini"
-declare -g BOARD_MAINTAINER="tjstyle"
+declare -g BOARD_MAINTAINER=""
 declare -g BOARDFAMILY="sm8250"
 declare -g KERNEL_TARGET="current"
 declare -g EXTRAWIFI="no"

config/boards/rock-s0.conf

@@ -3,7 +3,7 @@
 
 BOARD_NAME="Rock S0"
 BOARDFAMILY=rockchip64
-BOARD_MAINTAINER=brentr
+BOARD_MAINTAINER="brentr"
 
 BOOTCONFIG=rock-s0-rk3308_defconfig
 BOOT_FDT_FILE=rockchip/rk3308-rock-s0.dtb

config/boards/rockpi-s.conf

@@ -3,7 +3,7 @@
 
 BOARD_NAME="Rockpi S"
 BOARDFAMILY=rockchip64
-BOARD_MAINTAINER=brentr
+BOARD_MAINTAINER="brentr"
 
 BOOTCONFIG=rock-pi-s-rk3308_defconfig
 BOOT_FDT_FILE=rockchip/rk3308-rock-pi-s.dtb

requirements.txt

@@ -5,7 +5,7 @@
 # Always use a fixed version, this is important for correct hashing.
 # Dependabot will keep these versions up to date.
 
-setuptools == 75.3.0   # for building Python packages
+setuptools == 75.6.0   # for building Python packages
 pyelftools == 0.31     # for building U-Boot
 unidiff == 0.7.5       # for parsing unified diff
 GitPython == 3.1.43    # for manipulating git repos