Merge branch 'main' into optimize_rk3588-kernel-configs

armbian · Jun 9, 2024 · e8717fe · e8717fe
2 parents ceb23f8 + 6a42d50
commit e8717fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/config/boards/nanopc-cm3588-nas.csc b/config/boards/nanopc-cm3588-nas.csc
@@ -42,11 +42,11 @@ function post_family_tweaks__nanopccm3588nas_udev_naming_network_interfaces() {
 function post_family_config_branch_edge__nanopccm3588nas_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
 
-	declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"                       # override the default for the board/family
+	declare -g BOOTCONFIG="nanopc-t6-rk3588_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/Kwiboo/u-boot-rockchip.git" # We ❤️ Kwiboo's tree
 	declare -g BOOTBRANCH="branch:rk3xxx-2024.04"                         # commit:31522fe7b3c7733313e1c5eb4e340487f6000196 as of 2024-04-01
-	declare -g BOOTPATCHDIR="v2024.04-cm3588nas"                       # empty; defconfig changes are done in hook below
+	declare -g BOOTPATCHDIR="v2024.04/board_${BOARD}"                           # empty; defconfig changes are done in hook below
 	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

diff --git a/config/boards/orangepi5.conf b/config/boards/orangepi5.conf
@@ -121,7 +121,7 @@ function post_family_config__orangepi5_use_vendor_uboot() {
 		BOOTSOURCE="https://github.com/u-boot/u-boot.git"
 		BOOTBRANCH="commit:2f0282922b2c458eea7f85c500a948a587437b63"
 		BOOTDIR="u-boot-${BOARD}"
-		BOOTPATCHDIR="v2024.01-orangepi5"
+		BOOTPATCHDIR="v2024.01/board_${BOARD}"
 	else
 		BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
 		BOOTBRANCH='branch:v2017.09-rk3588'

diff --git a/...2024.01-orangepi5/0010-Fix-SPI-Boot.patch → ...1/board_orangepi5/0010-Fix-SPI-Boot.patch b/...2024.01-orangepi5/0010-Fix-SPI-Boot.patch → ...1/board_orangepi5/0010-Fix-SPI-Boot.patch