Merge branch 'main' into fix-orangepi3b-audio-download-button

armbian · Feb 7, 2025 · c6373a5 · c6373a5
2 parents 401f15b + 955de26
commit c6373a5
Show file tree

Hide file tree

Showing 22 changed files with 137 additions and 423 deletions.
diff --git a/config/boards/bananapicm4io.conf b/config/boards/bananapicm4io.conf
@@ -10,8 +10,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-bananapi-cm4-cm4io.dtb"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 
 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then

diff --git a/config/boards/bananapim2s.conf b/config/boards/bananapim2s.conf
@@ -10,8 +10,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-bananapi-m2s.dtb"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 
 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then

diff --git a/config/boards/gateway-gz80x.conf b/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:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7"

diff --git a/config/sources/families/imx8m.conf b/config/sources/families/imx8m.conf
@@ -24,6 +24,7 @@ case $BOARD in
 		ATFBRANCH="branch:TQM-lf_v2.10"
 		BOOTSOURCE='https://github.com/tq-systems/u-boot-tqmaxx.git' # u-boot mainlining is hard and has low-priority
 		BOOTBRANCH='branch:TQMa8-v2020.04_imx_5.4.70_2.3.0'
+		BOOTBRANCH='commit:673acba389cfe6c9e8639e8009fc9403492f5061'
 		BOOTPATCHDIR="u-boot-tqma" # could be removed when distro boot patches are integrated
 		;;
 esac

diff --git a/...23.07.02/board_bananapicm4io/0001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch b/...23.07.02/board_bananapicm4io/0001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch
diff --git a/.../v2023.07.02/board_bananapicm4io/0002-HACK-include-configs-meson64-boot-target-nvme.patch b/.../v2023.07.02/board_bananapicm4io/0002-HACK-include-configs-meson64-boot-target-nvme.patch
diff --git a/...23.07.02/board_bananapicm4io/0003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch b/...23.07.02/board_bananapicm4io/0003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch
diff --git a/...h/u-boot/v2023.07.02/board_bananapim2s/0001-U-Boot-v2023.07.02-Bananapi-M2S-Support.patch b/...h/u-boot/v2023.07.02/board_bananapim2s/0001-U-Boot-v2023.07.02-Bananapi-M2S-Support.patch
diff --git a/patch/u-boot/v2024.01/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch b/patch/u-boot/v2024.01/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch
diff --git a/patch/u-boot/v2024.01/board_bananapim2s/001-bananapi-m2s-support-fixup.patch b/patch/u-boot/v2024.01/board_bananapim2s/001-bananapi-m2s-support-fixup.patch
diff --git a/.../v2024.07/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch b/.../v2024.07/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch
diff --git a/.../v2024.07/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch b/.../v2024.07/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch