From d600dcc12eab0f64a9c1bc6aa5391ccf68204dc5 Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Wed, 19 Apr 2023 15:09:43 +0800
Subject: [PATCH 1/8] =?UTF-8?q?rk356x=20=E6=9B=B4=E6=96=B0debian/device/ke?=
 =?UTF-8?q?rnel/rkbin/tools/uboot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1082a567c2f611a38695147a1998cf75cdba4c6c
---
 rk356x_linux/rk356x_linux_dev.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index ddb9932..6934f56 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -14,8 +14,8 @@
     <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
   </project>
   <project dest-branch="rk356x" name="camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="67e59a503756c5c01c83bcf35a825615c7bfdf36" upstream="rk356x"/>
-  <project dest-branch="master" name="debian" revision="80be9e9e2515a4a263ce0aca9738b3154c5d3bfa" upstream="master"/>
-  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="96020125991e88b6fb0d1b555f59dd5ae7c92b24" upstream="master">
+  <project dest-branch="debian10" name="debian" revision="708a24fe8eb993192756344cd034354056429153" upstream="master"/>
+  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="1bdb034914928ad1c51144a7d5926a994d12c196" upstream="master">
     <linkfile dest="mkfirmware.sh" src="common/mkfirmware.sh"/>
     <linkfile dest="build.sh" src="common/build.sh"/>
     <linkfile dest="rkflash.sh" src="common/rkflash.sh"/>
@@ -25,7 +25,7 @@
   <project dest-branch="master" name="gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" revision="427f5439bf87835ff3b20746acc8aaafba7d4f53" upstream="master"/>
   <project dest-branch="master" name="gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" revision="f96f76d6be89a6e28d4dac1f233f9aca9921f69b" upstream="master"/>
   <project name="gstreamer-rockchip" path="external/gstreamer-rockchip" remote="rk-github" revision="9db260682e11ff6d5ca70f22e3a9e980a5f6ecd1" upstream="master"/>
-  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="8cc3e1300fb62bfcd7691ea21ef1d2086fc6790b" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="327a4c875ed64b99592bcdcd3293955554d1ba73" upstream="stable-4.19-rk356x"/>
   <project dest-branch="master" name="libmali" path="external/libmali" revision="74d74912a708da0eeb55029b9ae953206a734dd6" upstream="master"/>
   <project dest-branch="im2d" name="linux-rga" path="external/linux-rga" remote="rk-github" revision="1e2f0dbb838de3512a8a29143196d7b5e460e1ca" upstream="im2d"/>
   <project dest-branch="develop" name="mpp" path="external/mpp" remote="rk-github" revision="9ffb11ca0ad1ec1c08d673af5020c5efd0006a42" upstream="develop"/>
@@ -34,19 +34,19 @@
   <project dest-branch="master" name="qfm" path="app/qfm" remote="rk-github" revision="7e94be4d1ce41e395909da8b963ad46c65ca285f" upstream="master"/>
   <project dest-branch="master" name="qplayer" path="app/qplayer" remote="rk-github" revision="0121646c9fe2335eef9a963071d07b797a17487e" upstream="master"/>
   <project dest-branch="develop" name="recovery" path="external/recovery" remote="rk-github" revision="69eb9ffe14c08e144205b096d91176c88fbfa345" upstream="develop"/>
-  <project dest-branch="master" name="rkbin" revision="e1c4ccc157d3c334f5340762a2e2a5560b05846e" upstream="master"/>
+  <project dest-branch="master" name="rkbin" revision="1f4778f3145971f8a2f84ad7ac46832fbde58768" upstream="master"/>
   <project dest-branch="master" name="rknpu2" path="external/rknpu2" remote="rk-github" revision="c0303684992ded83acb3c9e153d8920172dffd64" upstream="master"/>
   <project dest-branch="master" name="rkscript" path="external/rkscript" remote="rk-github" revision="6c1303d90b979ccd30ebea43d4f942e5aa6f8860" upstream="master"/>
   <project dest-branch="master" name="rktoolkit" path="external/rktoolkit" remote="rk-github" revision="77fb41f99185a6f9dc2c9c69e099f417d8ae905d" upstream="master"/>
   <project dest-branch="master" name="rkupdate" path="external/rkupdate" remote="rk-github" revision="534d8750105c2649e24648b40551fa1304f5eeab" upstream="master"/>
   <project dest-branch="master" name="rkwifibt" path="external/rkwifibt" revision="175e30a3aa42946044468b8f15dea1e09fade517" upstream="master"/>
   <project dest-branch="develop" name="settings" path="app/qsetting" revision="7719da2d42787bac1a6fe075f2ddf6157cd5d678" upstream="develop"/>
-  <project dest-branch="master" name="tools" revision="1809a6c9a4112bf5d8fcbdb0e5077d051ee501c0" upstream="master">
+  <project dest-branch="master" name="tools" revision="e8adb3e955688312a9d4d240da2bdca965c57a44" upstream="master">
     <linkfile dest="tools/windows/RKDevTool/RKDevTool_Release/config.cfg" src="windows/RKDevTool/RKDevTool_Release/rk356x-config.cfg"/>
     <linkfile dest="tools/windows/RKDevTool/rockdev/package-file" src="windows/RKDevTool/rockdev/rk356x-package-file"/>
     <linkfile dest="tools/windows/RKDevTool/rockdev/mkupdate.bat" src="windows/RKDevTool/rockdev/rk356x-mkupdate.bat"/>
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/mkupdate.sh" src="linux/Linux_Pack_Firmware/rockdev/rk356x-mkupdate.sh"/>
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/package-file" src="linux/Linux_Pack_Firmware/rockdev/rk356x-package-file"/>
   </project>
-  <project dest-branch="next-dev" name="u-boot" revision="36052bc85bcae290bfd68b2677b06277a09520bf" upstream="next-dev"/>
+  <project dest-branch="next-dev" name="u-boot" revision="ca2fcac8aad9b96713cef0182370c5879a95f8fe" upstream="next-dev"/>
 </manifest>

From 891c32b84766029457430d44193ca24b6665427a Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Wed, 19 Apr 2023 15:49:57 +0800
Subject: [PATCH 2/8] =?UTF-8?q?rk356x=20=E4=BF=AE=E5=A4=8Ddebian=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I34cf0600e27a481bfddd1d52fe9f70b6e6cb5742
---
 rk356x_linux/rk356x_linux_dev.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index 6934f56..30fbec6 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -14,7 +14,7 @@
     <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
   </project>
   <project dest-branch="rk356x" name="camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="67e59a503756c5c01c83bcf35a825615c7bfdf36" upstream="rk356x"/>
-  <project dest-branch="debian10" name="debian" revision="708a24fe8eb993192756344cd034354056429153" upstream="master"/>
+  <project dest-branch="debian10" name="debian" revision="708a24fe8eb993192756344cd034354056429153" upstream="debian10"/>
   <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="1bdb034914928ad1c51144a7d5926a994d12c196" upstream="master">
     <linkfile dest="mkfirmware.sh" src="common/mkfirmware.sh"/>
     <linkfile dest="build.sh" src="common/build.sh"/>

From 6dfc619c19d2e5219acadd2d64a02f631761ee60 Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Fri, 28 Apr 2023 16:40:04 +0800
Subject: [PATCH 3/8] =?UTF-8?q?rk356x=20=E6=9B=B4=E6=96=B0device/kernelu-b?=
 =?UTF-8?q?oot=20=E6=B7=BB=E5=8A=A0ubuntu/lubancat-bin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I9c0b3f814fb2cf2d353b3efd868c40dff760ec85
---
 rk356x_linux/rk356x_linux_dev.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index 30fbec6..eba67fb 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -15,7 +15,7 @@
   </project>
   <project dest-branch="rk356x" name="camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="67e59a503756c5c01c83bcf35a825615c7bfdf36" upstream="rk356x"/>
   <project dest-branch="debian10" name="debian" revision="708a24fe8eb993192756344cd034354056429153" upstream="debian10"/>
-  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="1bdb034914928ad1c51144a7d5926a994d12c196" upstream="master">
+  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="dd8e3b6b9ac83b60dc1675384b423f3316175774" upstream="master">
     <linkfile dest="mkfirmware.sh" src="common/mkfirmware.sh"/>
     <linkfile dest="build.sh" src="common/build.sh"/>
     <linkfile dest="rkflash.sh" src="common/rkflash.sh"/>
@@ -25,9 +25,10 @@
   <project dest-branch="master" name="gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" revision="427f5439bf87835ff3b20746acc8aaafba7d4f53" upstream="master"/>
   <project dest-branch="master" name="gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" revision="f96f76d6be89a6e28d4dac1f233f9aca9921f69b" upstream="master"/>
   <project name="gstreamer-rockchip" path="external/gstreamer-rockchip" remote="rk-github" revision="9db260682e11ff6d5ca70f22e3a9e980a5f6ecd1" upstream="master"/>
-  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="327a4c875ed64b99592bcdcd3293955554d1ba73" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="9b2f3f42fbf72b7906ce40c0469ce9a86ebbceb7" upstream="stable-4.19-rk356x"/>
   <project dest-branch="master" name="libmali" path="external/libmali" revision="74d74912a708da0eeb55029b9ae953206a734dd6" upstream="master"/>
   <project dest-branch="im2d" name="linux-rga" path="external/linux-rga" remote="rk-github" revision="1e2f0dbb838de3512a8a29143196d7b5e460e1ca" upstream="im2d"/>
+  <project dest-branch="rk356x" name="lubancat-bin" revision="7ee295087b9b4b183c9f03cf56edaa9b928e5e1b" upstream="rk356x"/>
   <project dest-branch="develop" name="mpp" path="external/mpp" remote="rk-github" revision="9ffb11ca0ad1ec1c08d673af5020c5efd0006a42" upstream="develop"/>
   <project dest-branch="master" name="multivideoplayer" path="app/multivideoplayer" remote="rk-github" revision="5d566e0b2ab416c251b54d59d6237e7164c7e270" upstream="master"/>
   <project dest-branch="master" name="qcamera" path="app/qcamera" remote="rk-github" revision="3a74b34724828075bcb9f51b704e0c50e7dadaec" upstream="master"/>
@@ -48,5 +49,6 @@
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/mkupdate.sh" src="linux/Linux_Pack_Firmware/rockdev/rk356x-mkupdate.sh"/>
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/package-file" src="linux/Linux_Pack_Firmware/rockdev/rk356x-package-file"/>
   </project>
-  <project dest-branch="next-dev" name="u-boot" revision="ca2fcac8aad9b96713cef0182370c5879a95f8fe" upstream="next-dev"/>
+  <project dest-branch="next-dev" name="u-boot" revision="8aefdf71e3abf1d93cfa329121237744cacd7f38" upstream="next-dev"/>
+  <project dest-branch="ubuntu20.04" name="ubuntu" revision="1fc516b4d058123b4d42b80343bf2ebe1b2b14db" upstream="ubuntu20.04"/>
 </manifest>

From d2d2eb41034ffbefccfc51d9a5bf7ac1e08525ca Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Thu, 4 May 2023 10:50:49 +0800
Subject: [PATCH 4/8] =?UTF-8?q?rk356x=20=E6=9B=B4=E6=96=B0uboot/kernel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I3004632aec8be4f77a36b71fb4c562988c917a1b
---
 rk356x_linux/rk356x_linux_dev.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index eba67fb..5d3d9e6 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -25,7 +25,7 @@
   <project dest-branch="master" name="gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" revision="427f5439bf87835ff3b20746acc8aaafba7d4f53" upstream="master"/>
   <project dest-branch="master" name="gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" revision="f96f76d6be89a6e28d4dac1f233f9aca9921f69b" upstream="master"/>
   <project name="gstreamer-rockchip" path="external/gstreamer-rockchip" remote="rk-github" revision="9db260682e11ff6d5ca70f22e3a9e980a5f6ecd1" upstream="master"/>
-  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="9b2f3f42fbf72b7906ce40c0469ce9a86ebbceb7" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="2e17e311b50fc25806d2c8acd2ea5186f9c1afbc" upstream="stable-4.19-rk356x"/>
   <project dest-branch="master" name="libmali" path="external/libmali" revision="74d74912a708da0eeb55029b9ae953206a734dd6" upstream="master"/>
   <project dest-branch="im2d" name="linux-rga" path="external/linux-rga" remote="rk-github" revision="1e2f0dbb838de3512a8a29143196d7b5e460e1ca" upstream="im2d"/>
   <project dest-branch="rk356x" name="lubancat-bin" revision="7ee295087b9b4b183c9f03cf56edaa9b928e5e1b" upstream="rk356x"/>
@@ -49,6 +49,6 @@
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/mkupdate.sh" src="linux/Linux_Pack_Firmware/rockdev/rk356x-mkupdate.sh"/>
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/package-file" src="linux/Linux_Pack_Firmware/rockdev/rk356x-package-file"/>
   </project>
-  <project dest-branch="next-dev" name="u-boot" revision="8aefdf71e3abf1d93cfa329121237744cacd7f38" upstream="next-dev"/>
+  <project dest-branch="next-dev" name="u-boot" revision="dba3c59ad0b38168745911c842edcba0f89f3926" upstream="next-dev"/>
   <project dest-branch="ubuntu20.04" name="ubuntu" revision="1fc516b4d058123b4d42b80343bf2ebe1b2b14db" upstream="ubuntu20.04"/>
 </manifest>

From 4d0bf29b1a1fbdd8a16c2b4c492f34df93b8ddb8 Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Wed, 28 Jun 2023 09:33:02 +0800
Subject: [PATCH 5/8] =?UTF-8?q?rk356x=20=E6=9B=B4=E6=96=B0kernel/debian/ub?=
 =?UTF-8?q?untu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic75d75a973e98250867bd01e7c5b5221015769ac
---
 rk356x_linux/rk356x_linux_dev.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index 5d3d9e6..88107ec 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -14,7 +14,7 @@
     <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
   </project>
   <project dest-branch="rk356x" name="camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="67e59a503756c5c01c83bcf35a825615c7bfdf36" upstream="rk356x"/>
-  <project dest-branch="debian10" name="debian" revision="708a24fe8eb993192756344cd034354056429153" upstream="debian10"/>
+  <project dest-branch="debian10" name="debian" revision="9e29061654c8658dc71fce2a125fea507096d8f2" upstream="debian10"/>
   <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="dd8e3b6b9ac83b60dc1675384b423f3316175774" upstream="master">
     <linkfile dest="mkfirmware.sh" src="common/mkfirmware.sh"/>
     <linkfile dest="build.sh" src="common/build.sh"/>
@@ -25,7 +25,7 @@
   <project dest-branch="master" name="gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" revision="427f5439bf87835ff3b20746acc8aaafba7d4f53" upstream="master"/>
   <project dest-branch="master" name="gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" revision="f96f76d6be89a6e28d4dac1f233f9aca9921f69b" upstream="master"/>
   <project name="gstreamer-rockchip" path="external/gstreamer-rockchip" remote="rk-github" revision="9db260682e11ff6d5ca70f22e3a9e980a5f6ecd1" upstream="master"/>
-  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="2e17e311b50fc25806d2c8acd2ea5186f9c1afbc" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="7865b023960ae192a619d5f5fb2b2ecee959e387" upstream="stable-4.19-rk356x"/>
   <project dest-branch="master" name="libmali" path="external/libmali" revision="74d74912a708da0eeb55029b9ae953206a734dd6" upstream="master"/>
   <project dest-branch="im2d" name="linux-rga" path="external/linux-rga" remote="rk-github" revision="1e2f0dbb838de3512a8a29143196d7b5e460e1ca" upstream="im2d"/>
   <project dest-branch="rk356x" name="lubancat-bin" revision="7ee295087b9b4b183c9f03cf56edaa9b928e5e1b" upstream="rk356x"/>
@@ -50,5 +50,5 @@
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/package-file" src="linux/Linux_Pack_Firmware/rockdev/rk356x-package-file"/>
   </project>
   <project dest-branch="next-dev" name="u-boot" revision="dba3c59ad0b38168745911c842edcba0f89f3926" upstream="next-dev"/>
-  <project dest-branch="ubuntu20.04" name="ubuntu" revision="1fc516b4d058123b4d42b80343bf2ebe1b2b14db" upstream="ubuntu20.04"/>
+  <project dest-branch="ubuntu20.04" name="ubuntu" revision="392e73e975fbc8b076311195a03df189049904a0" upstream="ubuntu20.04"/>
 </manifest>

From 7067039a1fb2765819aea2c0c0a59572c73e772f Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Tue, 11 Jul 2023 16:41:22 +0800
Subject: [PATCH 6/8] =?UTF-8?q?rk356x=20=E6=9B=B4=E6=96=B0debian/device/ke?=
 =?UTF-8?q?rnel/ubuntu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic0e216b3c4e3fa31552f2e817ce9ca1517c83b86
---
 rk356x_linux/rk356x_linux_dev.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index 88107ec..723d7f1 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -14,8 +14,8 @@
     <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
   </project>
   <project dest-branch="rk356x" name="camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="67e59a503756c5c01c83bcf35a825615c7bfdf36" upstream="rk356x"/>
-  <project dest-branch="debian10" name="debian" revision="9e29061654c8658dc71fce2a125fea507096d8f2" upstream="debian10"/>
-  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="dd8e3b6b9ac83b60dc1675384b423f3316175774" upstream="master">
+  <project dest-branch="debian10" name="debian" revision="8c3f2bea28451e0a3c2e9c8e01e9fcfa5cf2a6fe" upstream="debian10"/>
+  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="8bda0a1ce4eba7aac15c1ac89e94ccf64fc75e94" upstream="master">
     <linkfile dest="mkfirmware.sh" src="common/mkfirmware.sh"/>
     <linkfile dest="build.sh" src="common/build.sh"/>
     <linkfile dest="rkflash.sh" src="common/rkflash.sh"/>
@@ -25,7 +25,7 @@
   <project dest-branch="master" name="gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" revision="427f5439bf87835ff3b20746acc8aaafba7d4f53" upstream="master"/>
   <project dest-branch="master" name="gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" revision="f96f76d6be89a6e28d4dac1f233f9aca9921f69b" upstream="master"/>
   <project name="gstreamer-rockchip" path="external/gstreamer-rockchip" remote="rk-github" revision="9db260682e11ff6d5ca70f22e3a9e980a5f6ecd1" upstream="master"/>
-  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="7865b023960ae192a619d5f5fb2b2ecee959e387" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="6b67afb6b7d43e26fc7f8d56621ff593719c14ba" upstream="stable-4.19-rk356x"/>
   <project dest-branch="master" name="libmali" path="external/libmali" revision="74d74912a708da0eeb55029b9ae953206a734dd6" upstream="master"/>
   <project dest-branch="im2d" name="linux-rga" path="external/linux-rga" remote="rk-github" revision="1e2f0dbb838de3512a8a29143196d7b5e460e1ca" upstream="im2d"/>
   <project dest-branch="rk356x" name="lubancat-bin" revision="7ee295087b9b4b183c9f03cf56edaa9b928e5e1b" upstream="rk356x"/>
@@ -50,5 +50,5 @@
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/package-file" src="linux/Linux_Pack_Firmware/rockdev/rk356x-package-file"/>
   </project>
   <project dest-branch="next-dev" name="u-boot" revision="dba3c59ad0b38168745911c842edcba0f89f3926" upstream="next-dev"/>
-  <project dest-branch="ubuntu20.04" name="ubuntu" revision="392e73e975fbc8b076311195a03df189049904a0" upstream="ubuntu20.04"/>
+  <project dest-branch="ubuntu20.04" name="ubuntu" revision="257306e66e3723bb41c90451da6dad5f532aae58" upstream="ubuntu20.04"/>
 </manifest>

From 3c3d88a782b92f0a9ec004d8f218964c8d258e9e Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Tue, 11 Jul 2023 16:56:50 +0800
Subject: [PATCH 7/8] =?UTF-8?q?rk356x=20=E6=9B=B4=E6=96=B0debian/ubuntu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I4d2738fb90b5a5d62cd1166344d73887522eec5d
---
 rk356x_linux/rk356x_linux_dev.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index 723d7f1..a594a0e 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -14,7 +14,7 @@
     <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
   </project>
   <project dest-branch="rk356x" name="camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="67e59a503756c5c01c83bcf35a825615c7bfdf36" upstream="rk356x"/>
-  <project dest-branch="debian10" name="debian" revision="8c3f2bea28451e0a3c2e9c8e01e9fcfa5cf2a6fe" upstream="debian10"/>
+  <project dest-branch="debian10" name="debian" revision="6098a8f117738f88d149230a217527122a186b97" upstream="debian10"/>
   <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="8bda0a1ce4eba7aac15c1ac89e94ccf64fc75e94" upstream="master">
     <linkfile dest="mkfirmware.sh" src="common/mkfirmware.sh"/>
     <linkfile dest="build.sh" src="common/build.sh"/>
@@ -50,5 +50,5 @@
     <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/package-file" src="linux/Linux_Pack_Firmware/rockdev/rk356x-package-file"/>
   </project>
   <project dest-branch="next-dev" name="u-boot" revision="dba3c59ad0b38168745911c842edcba0f89f3926" upstream="next-dev"/>
-  <project dest-branch="ubuntu20.04" name="ubuntu" revision="257306e66e3723bb41c90451da6dad5f532aae58" upstream="ubuntu20.04"/>
+  <project dest-branch="ubuntu20.04" name="ubuntu" revision="6d9bffb8ab7e47e21e7c8ec3c8253e0fb061aed3" upstream="ubuntu20.04"/>
 </manifest>

From cdc7a47d6f0fcc46c667a63be22babec8de0d695 Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Wed, 12 Jul 2023 10:17:55 +0800
Subject: [PATCH 8/8] =?UTF-8?q?rk356x=20=E6=95=B4=E7=90=86Buildroot?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=93=E5=BA=93=EF=BC=8C=E7=B2=BE=E7=AE=80?=
 =?UTF-8?q?SDK=E9=BB=98=E8=AE=A4=E7=A7=BB=E9=99=A4Buildroot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I5d62b842fea5a7949fd02695be332da702efaae7
---
 include/rk356x_buildroot.xml      | 27 +++++++++++++++++++++++++++
 rk356x_linux/rk356x_linux_dev.xml | 29 ++++-------------------------
 2 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100755 include/rk356x_buildroot.xml

diff --git a/include/rk356x_buildroot.xml b/include/rk356x_buildroot.xml
new file mode 100755
index 0000000..cf623cd
--- /dev/null
+++ b/include/rk356x_buildroot.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <project dest-branch="develop" name="QLauncher" path="app/QLauncher" remote="rk-github" revision="a17ceb273aaa6f5c9aaf9f570d4ee56e28135c9d" upstream="develop"/>
+  <project dest-branch="master" name="alsa-config" path="external/alsa-config" remote="rk-github" revision="1e0c4b5382b84ed629b1ca9e40c814103b92ee93" upstream="master"/>
+  <project dest-branch="master" name="bluetooth_bsa" path="external/bluetooth_bsa" remote="rk-github" revision="51b1afeefd0984dc1965379513a2931e85d281fa" upstream="master"/>
+  <project dest-branch="rk356x" name="buildroot" revision="81a26cf5545d3b37015cf346a2e08007b8f89769" upstream="rk356x">
+    <linkfile dest="Makefile" src="build/Makefile"/>
+    <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
+  </project>
+  <project dest-branch="rk356x" name="camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="67e59a503756c5c01c83bcf35a825615c7bfdf36" upstream="rk356x"/>
+  <project dest-branch="master" name="deviceio_release" path="external/deviceio_release" remote="rk-github" revision="187439b6c9ed867c5a28d8b39cb2ecf19ba9dae6" upstream="master"/>
+  <project name="gstreamer-rockchip" path="external/gstreamer-rockchip" remote="rk-github" revision="9db260682e11ff6d5ca70f22e3a9e980a5f6ecd1" upstream="master"/>
+  <project dest-branch="master" name="libmali" path="external/libmali" revision="74d74912a708da0eeb55029b9ae953206a734dd6" upstream="master"/>
+  <project dest-branch="im2d" name="linux-rga" path="external/linux-rga" remote="rk-github" revision="1e2f0dbb838de3512a8a29143196d7b5e460e1ca" upstream="im2d"/>
+  <project dest-branch="develop" name="mpp" path="external/mpp" remote="rk-github" revision="9ffb11ca0ad1ec1c08d673af5020c5efd0006a42" upstream="develop"/>
+  <project dest-branch="master" name="multivideoplayer" path="app/multivideoplayer" remote="rk-github" revision="5d566e0b2ab416c251b54d59d6237e7164c7e270" upstream="master"/>
+  <project dest-branch="master" name="qcamera" path="app/qcamera" remote="rk-github" revision="3a74b34724828075bcb9f51b704e0c50e7dadaec" upstream="master"/>
+  <project dest-branch="master" name="qfm" path="app/qfm" remote="rk-github" revision="7e94be4d1ce41e395909da8b963ad46c65ca285f" upstream="master"/>
+  <project dest-branch="master" name="qplayer" path="app/qplayer" remote="rk-github" revision="0121646c9fe2335eef9a963071d07b797a17487e" upstream="master"/>
+  <project dest-branch="develop" name="recovery" path="external/recovery" remote="rk-github" revision="69eb9ffe14c08e144205b096d91176c88fbfa345" upstream="develop"/>
+  <project dest-branch="master" name="rknpu2" path="external/rknpu2" remote="rk-github" revision="c0303684992ded83acb3c9e153d8920172dffd64" upstream="master"/>
+  <project dest-branch="master" name="rkscript" path="external/rkscript" remote="rk-github" revision="6c1303d90b979ccd30ebea43d4f942e5aa6f8860" upstream="master"/>
+  <project dest-branch="master" name="rktoolkit" path="external/rktoolkit" remote="rk-github" revision="77fb41f99185a6f9dc2c9c69e099f417d8ae905d" upstream="master"/>
+  <project dest-branch="master" name="rkupdate" path="external/rkupdate" remote="rk-github" revision="534d8750105c2649e24648b40551fa1304f5eeab" upstream="master"/>
+  <project dest-branch="master" name="rkwifibt" path="external/rkwifibt" revision="175e30a3aa42946044468b8f15dea1e09fade517" upstream="master"/>
+  <project dest-branch="develop" name="settings" path="app/qsetting" revision="7719da2d42787bac1a6fe075f2ddf6157cd5d678" upstream="develop"/>
+</manifest>
diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index a594a0e..13af8e3 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -5,15 +5,10 @@
   <remote fetch="https://github.com/Caesar-github/" name="rk-github"/>
   
   <default remote="origin" sync-j="4"/>
-  
-  <project dest-branch="develop" name="QLauncher" path="app/QLauncher" remote="rk-github" revision="a17ceb273aaa6f5c9aaf9f570d4ee56e28135c9d" upstream="develop"/>
-  <project dest-branch="master" name="alsa-config" path="external/alsa-config" remote="rk-github" revision="1e0c4b5382b84ed629b1ca9e40c814103b92ee93" upstream="master"/>
-  <project dest-branch="master" name="bluetooth_bsa" path="external/bluetooth_bsa" remote="rk-github" revision="51b1afeefd0984dc1965379513a2931e85d281fa" upstream="master"/>
-  <project dest-branch="rk356x" name="buildroot" revision="81a26cf5545d3b37015cf346a2e08007b8f89769" upstream="rk356x">
-    <linkfile dest="Makefile" src="build/Makefile"/>
-    <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
-  </project>
-  <project dest-branch="rk356x" name="camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="67e59a503756c5c01c83bcf35a825615c7bfdf36" upstream="rk356x"/>
+
+  <!-- <include name="include/rk356x_buildroot.xml" /> -->
+  <!-- 如果需要构建Buildroot或recovery分区，打开rk356x_buildroot.xml -->
+
   <project dest-branch="debian10" name="debian" revision="6098a8f117738f88d149230a217527122a186b97" upstream="debian10"/>
   <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="8bda0a1ce4eba7aac15c1ac89e94ccf64fc75e94" upstream="master">
     <linkfile dest="mkfirmware.sh" src="common/mkfirmware.sh"/>
@@ -21,27 +16,11 @@
     <linkfile dest="rkflash.sh" src="common/rkflash.sh"/>
     <linkfile dest="device/rockchip/.target_product" src="rk356x"/>
   </project>
-  <project dest-branch="master" name="deviceio_release" path="external/deviceio_release" remote="rk-github" revision="187439b6c9ed867c5a28d8b39cb2ecf19ba9dae6" upstream="master"/>
   <project dest-branch="master" name="gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-buildroot-9.3.0-2020.03-x86_64_aarch64-rockchip-linux-gnu" revision="427f5439bf87835ff3b20746acc8aaafba7d4f53" upstream="master"/>
   <project dest-branch="master" name="gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" path="prebuilts/gcc/linux-x86/aarch64/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu" revision="f96f76d6be89a6e28d4dac1f233f9aca9921f69b" upstream="master"/>
-  <project name="gstreamer-rockchip" path="external/gstreamer-rockchip" remote="rk-github" revision="9db260682e11ff6d5ca70f22e3a9e980a5f6ecd1" upstream="master"/>
   <project dest-branch="stable-4.19-rk356x" name="kernel" revision="6b67afb6b7d43e26fc7f8d56621ff593719c14ba" upstream="stable-4.19-rk356x"/>
-  <project dest-branch="master" name="libmali" path="external/libmali" revision="74d74912a708da0eeb55029b9ae953206a734dd6" upstream="master"/>
-  <project dest-branch="im2d" name="linux-rga" path="external/linux-rga" remote="rk-github" revision="1e2f0dbb838de3512a8a29143196d7b5e460e1ca" upstream="im2d"/>
   <project dest-branch="rk356x" name="lubancat-bin" revision="7ee295087b9b4b183c9f03cf56edaa9b928e5e1b" upstream="rk356x"/>
-  <project dest-branch="develop" name="mpp" path="external/mpp" remote="rk-github" revision="9ffb11ca0ad1ec1c08d673af5020c5efd0006a42" upstream="develop"/>
-  <project dest-branch="master" name="multivideoplayer" path="app/multivideoplayer" remote="rk-github" revision="5d566e0b2ab416c251b54d59d6237e7164c7e270" upstream="master"/>
-  <project dest-branch="master" name="qcamera" path="app/qcamera" remote="rk-github" revision="3a74b34724828075bcb9f51b704e0c50e7dadaec" upstream="master"/>
-  <project dest-branch="master" name="qfm" path="app/qfm" remote="rk-github" revision="7e94be4d1ce41e395909da8b963ad46c65ca285f" upstream="master"/>
-  <project dest-branch="master" name="qplayer" path="app/qplayer" remote="rk-github" revision="0121646c9fe2335eef9a963071d07b797a17487e" upstream="master"/>
-  <project dest-branch="develop" name="recovery" path="external/recovery" remote="rk-github" revision="69eb9ffe14c08e144205b096d91176c88fbfa345" upstream="develop"/>
   <project dest-branch="master" name="rkbin" revision="1f4778f3145971f8a2f84ad7ac46832fbde58768" upstream="master"/>
-  <project dest-branch="master" name="rknpu2" path="external/rknpu2" remote="rk-github" revision="c0303684992ded83acb3c9e153d8920172dffd64" upstream="master"/>
-  <project dest-branch="master" name="rkscript" path="external/rkscript" remote="rk-github" revision="6c1303d90b979ccd30ebea43d4f942e5aa6f8860" upstream="master"/>
-  <project dest-branch="master" name="rktoolkit" path="external/rktoolkit" remote="rk-github" revision="77fb41f99185a6f9dc2c9c69e099f417d8ae905d" upstream="master"/>
-  <project dest-branch="master" name="rkupdate" path="external/rkupdate" remote="rk-github" revision="534d8750105c2649e24648b40551fa1304f5eeab" upstream="master"/>
-  <project dest-branch="master" name="rkwifibt" path="external/rkwifibt" revision="175e30a3aa42946044468b8f15dea1e09fade517" upstream="master"/>
-  <project dest-branch="develop" name="settings" path="app/qsetting" revision="7719da2d42787bac1a6fe075f2ddf6157cd5d678" upstream="develop"/>
   <project dest-branch="master" name="tools" revision="e8adb3e955688312a9d4d240da2bdca965c57a44" upstream="master">
     <linkfile dest="tools/windows/RKDevTool/RKDevTool_Release/config.cfg" src="windows/RKDevTool/RKDevTool_Release/rk356x-config.cfg"/>
     <linkfile dest="tools/windows/RKDevTool/rockdev/package-file" src="windows/RKDevTool/rockdev/rk356x-package-file"/>