Orange Pi 3B: Edge: Switch to mainline dts

armbian · Sep 24, 2024 · 94f65ea · 94f65ea
1 parent 21a1628
commit 94f65ea
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 892 deletions.
diff --git a/config/boards/orangepi3b.csc b/config/boards/orangepi3b.csc
@@ -12,12 +12,6 @@ BOOT_SCENARIO="spl-blobs"
 BOOT_SUPPORT_SPI="yes"
 BOOT_SPI_RKSPI_LOADER="yes"
 
-function post_family_config_branch_edge__orangepi3b_use_patched_dtb() {
-	# orangepi 3b dtbs are coming to mainline in v6.11
-	# until then, v1.1 boards can continue to use patched dtb
-	BOOT_FDT_FILE="rockchip/rk3566-orangepi-3b.dtb"
-}
-
 # Override family config for this board; let's avoid conditionals in family config.
 function post_family_config__orangepi3b_use_mainline_uboot() {
 	display_alert "$BOARD" "mainline u-boot overrides" "info"

diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3566-orangepi-3b-sata.dts b/patch/kernel/archive/rockchip64-6.11/dt/rk3566-orangepi-3b-sata.dts