From 9132ca6d4605aa1a0cf5d014d846da42d42df261 Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Wed, 20 Jul 2022 16:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0buildroot/rockchip/kernel/u-b?=
 =?UTF-8?q?oot/ubuntu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8c50c87dabb1a81066ffffd92d39600669e71432
---
 rk356x_linux/rk356x_linux_dev.xml                     | 10 +++++-----
 rk356x_linux/rk356x_linux_release_v1.1.3_20210805.xml |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index da83825..dae6370 100644
--- a/rk356x_linux/rk356x_linux_dev.xml
+++ b/rk356x_linux/rk356x_linux_dev.xml
@@ -7,13 +7,13 @@
   
   <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="buildroot" revision="c2f0d6ffd0f4cdd99ce093a6c66c13ae2a1ee714" upstream="rk356x">
+  <project dest-branch="master" name="buildroot" revision="edfb5620fb0ebf9ff09eb579ce4021ede87174c9" 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="c1b0f182d28ae9a4ef4eb4dabc26ec93d565438a" upstream="rk356x"/>
   <project dest-branch="master" name="debian" revision="ba62ecc14350318d830281e45ea3858222cf7ffa" upstream="master"/>
-  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="ddd6a1226da9e23cf694d2ff576a48bfb26d271f" upstream="master">
+  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="badd1f7dfe76a408f5bf36732ed401bc574f9658" 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"/>
@@ -23,7 +23,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="693cbb56de7cc899fe29ae086f4733721d88c505" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="7757585f772651dbd789b65c9984ad8bff77f592" upstream="stable-4.19-rk356x"/>
   <project dest-branch="master" name="libmali" path="external/libmali" remote="rk-github" revision="968a49083754f4c63ae02c4c54f866cb8c83d661" 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" revision="693720fd192d443ffc6dfab16f1ea359e09dcac6" upstream="develop"/>
@@ -47,6 +47,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="61d783c822f28d026d6e46bc0769e169992c3dbe" upstream="next-dev"/>
-  <project dest-branch="master" name="ubuntu" revision="da882c69247767c43f0c7d9323b67f0381e32e27" upstream="ubuntu18.04"/>
+  <project dest-branch="next-dev" name="u-boot" revision="7c62151d07b1dbec5b40744b2dfcd41ef1903a27" upstream="next-dev"/>
+  <project dest-branch="master" name="ubuntu" revision="83ada511a4318e2c109a806a22fd3d403d0c18e9" upstream="ubuntu18.04"/>
 </manifest>
diff --git a/rk356x_linux/rk356x_linux_release_v1.1.3_20210805.xml b/rk356x_linux/rk356x_linux_release_v1.1.3_20210805.xml
index ffb460d..ce7ec18 100644
--- a/rk356x_linux/rk356x_linux_release_v1.1.3_20210805.xml
+++ b/rk356x_linux/rk356x_linux_release_v1.1.3_20210805.xml
@@ -9,7 +9,7 @@
 
   <project dest-branch="rk33/mid/8.1/develop" name="android/RKNPUTool" path="external/RKNPUTools" revision="b8c0e77c1a5c8e886c3ebf3483557e8755485e6e" upstream="rk33/mid/8.1/develop"/>
   <project dest-branch="develop-next" name="android/rk/platform/system/rk_tee_user" path="external/security/rk_tee_user" revision="3f953515576dab722325a5cb10b551adb52c77b4" upstream="develop-next"/>
-  <project dest-branch="next-dev" name="android/rk/u-boot" path="u-boot" revision="ee008497bf7dd8c2b4e5b29d197016de4fe5b7b6" upstream="next-dev"/>
+  <project dest-branch="next-dev" name="android/rk/u-boot" path="u-boot" revision="7c62151d07b1dbec5b40744b2dfcd41ef1903a27" upstream="next-dev"/>
   <project dest-branch="master" name="linux/app-new/LibIPCProtocol" path="app/libIPCProtocol" revision="45cdd16d137929a06ad6231eca4d17eed5a967d6" upstream="master"/>
   <project dest-branch="master" name="linux/app-new/mediaserver" path="app/mediaserver" revision="18cf53291d0f12ec228505cc85b7ac88b58f107c" upstream="master"/>
   <project dest-branch="master" name="linux/app-new/qfm" path="app/qfm" revision="7e94be4d1ce41e395909da8b963ad46c65ca285f" upstream="master"/>
@@ -33,12 +33,12 @@
   <project dest-branch="master" name="linux/app/web-new/ipcweb-ng" path="app/ipcweb-ng" revision="ca9ad4f24bb46568dbbb80ac216a6e2b5f872d23" upstream="master"/>
   <project dest-branch="master" name="linux/bsp/external/bluetooth_bsa" path="external/bluetooth_bsa" revision="51b1afeefd0984dc1965379513a2931e85d281fa" upstream="master"/>
   <project dest-branch="master" name="linux/bsp/external/broadcom_bsa" path="external/broadcom_bsa" revision="46234ce7a904794754bba79cb7c9f26d39605311" upstream="master"/>
-  <project dest-branch="rockchip/2018.02-rc3" name="linux/buildroot" path="buildroot" revision="3763e545453d5955fcc35b4d99e253274cf17ebc" upstream="rockchip/2018.02-rc3">
+  <project dest-branch="rockchip/2018.02-rc3" name="linux/buildroot" path="buildroot" revision="edfb5620fb0ebf9ff09eb579ce4021ede87174c9" upstream="rockchip/2018.02-rc3">
     <linkfile dest="Makefile" src="build/Makefile"/>
     <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
   </project>
   <project dest-branch="master" name="linux/debian" path="debian" revision="master"/>
-  <project dest-branch="master" name="linux/device/rockchip" path="device/rockchip" revision="e17953575a9ca8774b0c8724beb896fde7f3ef2c" upstream="master">
+  <project dest-branch="master" name="linux/device/rockchip" path="device/rockchip" revision="badd1f7dfe76a408f5bf36732ed401bc574f9658" 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"/>
@@ -89,7 +89,7 @@
     <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="stable-4.19-rk356x" name="rk/kernel" path="kernel" revision="8cf5c599ca72adf9082a1a59f33f21f3552f88bc" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="rk/kernel" path="kernel" revision="7757585f772651dbd789b65c9984ad8bff77f592" upstream="stable-4.19-rk356x"/>
   <project dest-branch="develop" name="rk/mpp" path="external/mpp" revision="49f29006a3c728bb3570279b7b5407ec29e09f6d" upstream="develop"/>
   <project dest-branch="master" name="rk/prebuilts/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="2edfa6dde1f73c5b3c6de980e3450443e35c0a0f" upstream="master"/>
   <project dest-branch="master" name="rk/prebuilts/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"/>