From f830276f7d4e038b837bf40be1e94b3834bc779c Mon Sep 17 00:00:00 2001
From: orangepi-xunlong <258384131@qq.com>
Date: Tue, 8 Feb 2022 11:47:52 +0800
Subject: [PATCH] Update for Orange Pi Zero2 B

---
 external/config/bootenv/sun50iw9-default.txt  |   4 ++--
 .../config/sources/families/sun50iw9.conf     |   1 +
 .../bin/dts/orangepizero2-b-u-boot.dts        |   1 +
 .../packages/pack-uboot/sun50iw9/bin/p1.dtbo  | Bin 4544 -> 4568 bytes
 .../sys_config/sys_config_orangepizero2-b.fex |   3 +++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/external/config/bootenv/sun50iw9-default.txt b/external/config/bootenv/sun50iw9-default.txt
index d8014dc55c33..049f09fac244 100644
--- a/external/config/bootenv/sun50iw9-default.txt
+++ b/external/config/bootenv/sun50iw9-default.txt
@@ -1,5 +1,5 @@
 verbosity=1
 console=both
 disp_mode=1080p60
-fb0_width=1280
-fb0_height=720
+fb0_width=1920
+fb0_height=1080
diff --git a/external/config/sources/families/sun50iw9.conf b/external/config/sources/families/sun50iw9.conf
index fe3f8b9f844d..08ca8f145f25 100755
--- a/external/config/sources/families/sun50iw9.conf
+++ b/external/config/sources/families/sun50iw9.conf
@@ -76,6 +76,7 @@ uboot_custom_postprocess()
 
 	if [[ ${BRANCH} == legacy ]]; then
 
+		rm dts/*.dts sys_config -r >/dev/null 2>&1
 		export PATH=${EXTER}/packages/pack-uboot/${BOARDFAMILY}/tools/:$PATH
 		cp ${EXTER}/packages/pack-uboot/${BOARDFAMILY}/bin/* . -r
 		cp sys_config/sys_config_${BOARD}.fex sys_config.fex
diff --git a/external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2-b-u-boot.dts b/external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2-b-u-boot.dts
index 8d1dc69cc8d4..9fc92caf1ea3 100755
--- a/external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2-b-u-boot.dts
+++ b/external/packages/pack-uboot/sun50iw9/bin/dts/orangepizero2-b-u-boot.dts
@@ -4448,6 +4448,7 @@
 			aldo1_vol = <0xf4f24>;
 			bldo1_vol = <0xf4948>;
 			bldo2_vol = <0xf4948>;
+			cldo1_vol = <0xf4948>;
 		};
 
 		card_boot {
diff --git a/external/packages/pack-uboot/sun50iw9/bin/p1.dtbo b/external/packages/pack-uboot/sun50iw9/bin/p1.dtbo
index de8c1dfa6888a11d4ab32b7575485eafeab099ab..dc9c6e11d291f84bb45b42493d42d52208d111a6 100644
GIT binary patch
delta 101
zcmX@0d_!5_0`I@K3=D!d7#J8V7#IXtCJKl%p4q5j$|5Xq;sH>Q8HibccoT#1Lx;@;
lEWS+4(&Y}553o&z(%ze=vnMgaIFqe8y`XIK&HFhSIRJ!>97F&B

delta 80
zcmcbid_Y;?0`I@K3=Dz?7#J8V7#R59OcW4j+_F)_lx1=+tKa6;EJ94oO#2lkA7Gn0
i`7OKC=Edwuj6jCK<hiU`lf5~EKx`%lvCZo_H8}t_P8v7>

diff --git a/external/packages/pack-uboot/sun50iw9/bin/sys_config/sys_config_orangepizero2-b.fex b/external/packages/pack-uboot/sun50iw9/bin/sys_config/sys_config_orangepizero2-b.fex
index c8db27fba2cd..58d2d4b88421 100755
--- a/external/packages/pack-uboot/sun50iw9/bin/sys_config/sys_config_orangepizero2-b.fex
+++ b/external/packages/pack-uboot/sun50iw9/bin/sys_config/sys_config_orangepizero2-b.fex
@@ -37,11 +37,13 @@ dragonboard_test= 0
 dcdc2_vol                  = 1001000
 aldo1_vol                  = 1001800
 dldo1_vol                  = 1003300
+cldo1_vol		   = 1001800
 
 [axp1530_power_sply]
 dcdc2_vol                  = 1001000
 aldo1_vol                  = 1001800
 dldo1_vol                  = 1003300
+cldo1_vol		   = 1001800
 
 [axp806_power_sply]
 dcdce_vol                  = 1003300
@@ -49,6 +51,7 @@ dcdce_vol                  = 1003300
 aldo1_vol		   = 1003300
 bldo1_vol		   = 1001800
 bldo2_vol		   = 1001800
+cldo1_vol		   = 1001800
 
 [card_boot]
 logical_start   = 40960