From 2be72a95e9af62acadc12e6f0b587eb40b27dabb Mon Sep 17 00:00:00 2001
From: Weiwen Chen <cww@rock-chips.com>
Date: Tue, 24 Aug 2021 20:07:17 +0800
Subject: [PATCH] rv1126/rv1109: update version to V2.2.0

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ib1b3551883b3930914bd2eb058ad91659edf027d
---
 .../rv1126_rv1109_linux_v2.0.0_20210430.xml   |  2 +-
 .../rv1126_rv1109_linux_v2.1.0_20210512.xml   |  2 +-
 .../rv1126_rv1109_linux_v2.1.1_20210524.xml   |  2 +-
 .../rv1126_rv1109_linux_v2.2.0_20210825.xml   | 96 +++++++++++++++++++
 rv1126_rv1109_linux_release.xml               |  2 +-
 5 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 rv1126_rv1109_linux/rv1126_rv1109_linux_v2.2.0_20210825.xml

diff --git a/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.0.0_20210430.xml b/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.0.0_20210430.xml
index dc0efb8..fba6299 100644
--- a/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.0.0_20210430.xml
+++ b/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.0.0_20210430.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="../../" name="rk" review="https://10.10.10.29"/>
+  <remote fetch="ssh://git@www.rockchip.com.cn/linux/" name="rk"/>
   
   <default remote="rk" sync-j="4"/>
   
diff --git a/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.0_20210512.xml b/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.0_20210512.xml
index e967ae7..381cd2f 100644
--- a/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.0_20210512.xml
+++ b/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.0_20210512.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="../../" name="rk" review="https://10.10.10.29"/>
+  <remote fetch="ssh://git@www.rockchip.com.cn/linux/" name="rk"/>
   
   <default remote="rk" sync-j="4"/>
   
diff --git a/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.1_20210524.xml b/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.1_20210524.xml
index 7e2b934..0fca525 100644
--- a/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.1_20210524.xml
+++ b/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.1_20210524.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remote fetch="../../" name="rk" review="https://10.10.10.29"/>
+  <remote fetch="ssh://git@www.rockchip.com.cn/linux/" name="rk"/>
   
   <default remote="rk" sync-j="4"/>
   
diff --git a/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.2.0_20210825.xml b/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.2.0_20210825.xml
new file mode 100644
index 0000000..08ef279
--- /dev/null
+++ b/rv1126_rv1109_linux/rv1126_rv1109_linux_v2.2.0_20210825.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <remote fetch="ssh://git@www.rockchip.com.cn/linux/" name="rk"/>
+  
+  <default remote="rk" sync-j="4"/>
+  
+  <project name="android/rk/platform/system/rk_tee_user" path="external/security/rk_tee_user" revision="3f953515576dab722325a5cb10b551adb52c77b4" upstream="develop-next"/>
+  <project name="android/rk/u-boot" path="u-boot" revision="dac93f83704b40b68ba21a704af7b37fa085bf64" upstream="next-dev"/>
+  <project name="linux/app-new/LibIPCProtocol" path="app/libIPCProtocol" revision="45cdd16d137929a06ad6231eca4d17eed5a967d6" upstream="master"/>
+  <project name="linux/app-new/mediaserver" path="app/mediaserver" revision="00dd2b263eba7b58b0810255f7f471a6de6b5d94" upstream="master"/>
+  <project name="linux/app-new/qfm" path="app/qfm" revision="7e94be4d1ce41e395909da8b963ad46c65ca285f" upstream="master"/>
+  <project name="linux/app/CameraFactoryTestServer" path="app/CameraFactoryTestServer" revision="4bf562db7718264772ed9c52e1afc54ccebc8356" upstream="master"/>
+  <project name="linux/app/QFacialGate" path="app/QFacialGate" revision="87f2c3643b41ed70e9551e0039edc8369dbe626a" upstream="master"/>
+  <project name="linux/app/QLauncher" path="app/QLauncher" revision="a17ceb273aaa6f5c9aaf9f570d4ee56e28135c9d" upstream="develop"/>
+  <project name="linux/app/aiserver" path="app/aiserver" revision="7eed014b42ce4571165f9a13645996892a3a631e" upstream="master"/>
+  <project name="linux/app/camera" path="app/camera" revision="44a961358dcf912504a951e7caf60c7d55ed999a" upstream="master"/>
+  <project name="linux/app/dbserver" path="app/dbserver" revision="ed4479a42b462a0f23e39fe77e2decc009fc0938" upstream="master"/>
+  <project name="linux/app/dbtool" path="app/dbtool" revision="1e74ed454eacd45d59a333d694261bf73ffc1b18" upstream="master"/>
+  <project name="linux/app/ipc-daemon" path="app/ipc-daemon" revision="30b8dc6f23c4623324bcd051659ef8b45018a8c2" upstream="master"/>
+  <project name="linux/app/libgdbus" path="app/libgdbus" revision="79370be32dde657abf1128c90c72b93e75d814ed" upstream="master"/>
+  <project name="linux/app/librkdb" path="app/librkdb" revision="72fd398899e791dcf0a02b484a9be404063ed94e" upstream="master"/>
+  <project name="linux/app/minigui_demo" path="app/minigui_demo" revision="4e0eaf998640e0538792619e0d2f8641c5896f69" upstream="master"/>
+  <project name="linux/app/multivideoplayer" path="app/multivideoplayer" revision="5d566e0b2ab416c251b54d59d6237e7164c7e270" upstream="master"/>
+  <project name="linux/app/network_manager" path="app/netserver" revision="2c696348c2e4dd2eb278efd38370255e752eb4d7" upstream="master"/>
+  <project name="linux/app/qcamera" path="app/qcamera" revision="1cf0d51ba5448151cf93cd4446a153de245274c1" upstream="master"/>
+  <project name="linux/app/qplayer" path="app/qplayer" revision="0121646c9fe2335eef9a963071d07b797a17487e" upstream="master"/>
+  <project name="linux/app/rkaiq_tool_server" path="app/rkaiq_tool_server" revision="d702dc17181c4fe30b82db5a3c456f123c0650c2" upstream="socket"/>
+  <project name="linux/app/settings" path="app/qsetting" revision="20862b44029127524d9336ddd7664207fb500e74" upstream="develop"/>
+  <project name="linux/app/smart_display_service" path="app/smart_display_service" revision="4dbf0071b20f1f3c95595a5e2a550505da94ed11" upstream="master"/>
+  <project name="linux/app/startup_app_ipc" path="app/startup_app_ipc" revision="9ab2893bd39ef11855c956cc0198726c93c39746" upstream="master"/>
+  <project name="linux/app/storage_manager" path="app/storage_manager" revision="213aded5fbf9dc2fd05c0fd529aa3da55a6fea93" upstream="master"/>
+  <project name="linux/app/web-new/ipcweb-backend" path="app/ipcweb-backend" revision="1885a61babe060c16a84c172712146d4206361df" upstream="master"/>
+  <project name="linux/app/web-new/ipcweb-ng" path="app/ipcweb-ng" revision="ca9ad4f24bb46568dbbb80ac216a6e2b5f872d23" upstream="master"/>
+  <project name="linux/bsp/docs" path="docs" revision="03a4cf6e1e70b4075654ff738f43a6ad0dbb3e5f" upstream="master"/>
+  <project name="linux/bsp/external/bluetooth_bsa" path="external/bluetooth_bsa" revision="51b1afeefd0984dc1965379513a2931e85d281fa" upstream="master"/>
+  <project name="linux/bsp/external/broadcom_bsa" path="external/broadcom_bsa" revision="46234ce7a904794754bba79cb7c9f26d39605311" upstream="master"/>
+  <project name="linux/bsp/internal_doc" path="docs/.Socs" revision="0ed910eaa128b6ec3874f9a441156d45fc81e0b8" upstream="master">
+    <linkfile dest="docs/RV1126_RV1109" src="RV1126_RV1109"/>
+  </project>
+  <project name="linux/bsp/rkadk" path="external/rkadk" revision="d45c464655f9b04b9a9faf81e1ecef58ae14b045" upstream="master"/>
+  <project name="linux/bsp/rkmedia" path="external/rkmedia" revision="8e3993408da058ae7d169288f8ea988d0f4a4cb1" upstream="master"/>
+  <project name="linux/buildroot" path="buildroot" revision="a2aeae1c4741c37ecd23edfac867d666e6ed7118" upstream="rockchip/2018.02-rc3">
+    <linkfile dest="Makefile" src="build/Makefile"/>
+    <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
+  </project>
+  <project name="linux/device/rockchip" path="device/rockchip" revision="1fab1866d8aed5b3d619b51cb1c4c5ac5d7cb046" 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"/>
+    <linkfile dest="prebuilts/gcc/linux-x86/arm/Cross-compile-tools-readme.txt" src="rv1126_rv1109/Cross-compile-tools-readme.txt"/>
+    <linkfile dest="device/rockchip/.target_product" src="rv1126_rv1109"/>
+  </project>
+  <project name="linux/external/CallFunIpc" path="external/CallFunIpc" revision="b23fcde9739d9bdcc3c477caa0a845355825711f" upstream="master"/>
+  <project name="linux/external/alsa-config" path="external/alsa-config" revision="1b88e694695ef2edfc5bc320a2f1b0935ca76a29" upstream="master"/>
+  <project name="linux/external/app" path="external/app" revision="3a06ebb791eb8bc6d2b41876f895d121be987f41" upstream="master"/>
+  <project name="linux/external/avb" path="external/avb" revision="64b5ea0130d7440084796f6a23d7cd91fac988b8" upstream="master"/>
+  <project name="linux/external/ble_wificonfig" path="external/ble_wificonfig" revision="3b56e0e268634216df1f992d944bb30158e86786" upstream="master"/>
+  <project name="linux/external/camera_engine_rkaiq" path="external/camera_engine_rkaiq" revision="bb36f10e0225f8b0e6596734fb28a80dad9b2e4e" upstream="master"/>
+  <project name="linux/external/common_algorithm" path="external/common_algorithm" revision="c0e48be28b4f1660bcbd7bb521de67662461d0cc" upstream="master"/>
+  <project name="linux/external/deviceio_release" path="external/deviceio_release" revision="4ba88e8ac3eebb6c3b3933e85898ebebd48b2a13" upstream="master"/>
+  <project name="linux/external/eq_drc_process" path="external/eq_drc_process" revision="6fe472aa76ed71922742863c8f94222dab3dbf3c" upstream="master"/>
+  <project name="linux/external/isp2-ipc" path="external/isp2-ipc" revision="832a468fbdee27db24e657fdc8d5b52b41feefe5" upstream="master"/>
+  <project name="linux/external/minigui" path="external/minigui" revision="56dfcf3f4d2978cabe7684ca64073ebdfaae73b6" upstream="master"/>
+  <project name="linux/external/minilogger" path="external/minilogger" revision="5f0fa4698d5305d8653c2352bfcf1d9aa57064a4" upstream="master"/>
+  <project name="linux/external/pcba_adb_test" path="external/pcba_adb_test" revision="0a1ca61f27007e8374d21f3af167ee5e02923f19" upstream="master"/>
+  <project name="linux/external/rk_pcba_test" path="external/rk_pcba_test" revision="36e07775f017df15a8f20e62f52cb59e1ed3ae10" upstream="master"/>
+  <project name="linux/external/rkfacial" path="external/rkfacial" revision="1f24c840d02792f5f5fd08d98459b27eb7dc34a2" upstream="master"/>
+  <project name="linux/external/rknpu" path="external/rknpu" revision="0f1ccf08967da89352edd792f2d42f9c5080a3d0" upstream="master"/>
+  <project name="linux/external/rkscript" path="external/rkscript" revision="b5c838e25eb564c1fa8e4df6874d32b6dcd8725f" upstream="master"/>
+  <project name="linux/external/rktoolkit" path="external/rktoolkit" revision="77fb41f99185a6f9dc2c9c69e099f417d8ae905d" upstream="master"/>
+  <project name="linux/external/rkupdate" path="external/rkupdate" revision="1e014c0295f960a23b5b351c0bb3e1c6903d0bf6" upstream="master"/>
+  <project name="linux/external/rkwifibt" path="external/rkwifibt" revision="f83da6e1c39488001ca13daf3b8c8ae48571f837" upstream="master"/>
+  <project name="linux/external/rtc_demo" path="external/rtc_demo" revision="01ea9377beae66a544191ff5dbd920f19ba4614c" upstream="master"/>
+  <project name="linux/external/uac_app" path="external/uac_app" revision="e82c9f701474a55882999c13882a9da8206571dd" upstream="master"/>
+  <project name="linux/external/uvc_app" path="external/uvc_app" revision="3288aa612391323e53fd0acecd63513e17af5b9b" upstream="develop-4.19"/>
+  <project name="linux/external/wifiAutoSetup" path="external/wifiAutoSetup" revision="872e84394896e12989c1745f4af536b567d02de7" upstream="master"/>
+  <project name="linux/gstreamer-rockchip" path="external/gstreamer-rockchip" revision="2f459ec8fee0fb6a4eb9b29b14c1400813ef1be4" upstream="master"/>
+  <project name="linux/linux-rga" path="external/linux-rga" revision="9b744c310600ed20501e0cbf0f487bef24f39787" upstream="im2d"/>
+  <project name="linux/recovery" path="external/recovery" revision="e0add196959a53b188292228d973d5200e2e54ce" upstream="develop"/>
+  <project name="linux/security/bin" path="external/security/bin" revision="f59085ce658bd69678b68fd4840fb86937678125" upstream="master"/>
+  <project name="linux/tools" path="tools" revision="68915ede35173c315c711c34f3bd341e8624a3e5" upstream="master">
+    <linkfile dest="tools/windows/RKDevTool/RKDevTool_Release/config.cfg" src="windows/RKDevTool/RKDevTool_Release/rv1126_rv1109-config.cfg"/>
+    <linkfile dest="tools/windows/RKDevTool/rockdev/package-file" src="windows/RKDevTool/rockdev/rv1126_rv1109-package-file"/>
+    <linkfile dest="tools/windows/RKDevTool/rockdev/mkupdate.bat" src="windows/RKDevTool/rockdev/rv1126_rv1109-mkupdate.bat"/>
+    <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/mkupdate.sh" src="linux/Linux_Pack_Firmware/rockdev/rv1126_rv1109-mkupdate.sh"/>
+    <linkfile dest="tools/linux/Linux_Pack_Firmware/rockdev/package-file" src="linux/Linux_Pack_Firmware/rockdev/rv1126_rv1109-package-file"/>
+  </project>
+  <project name="rk/kernel" path="kernel" revision="c9bb08ff071205895a161c37a312bbc9ed377591" upstream="stable-4.19-rv1126"/>
+  <project name="rk/mpp" path="external/mpp" revision="49f29006a3c728bb3570279b7b5407ec29e09f6d" upstream="develop"/>
+  <project name="rk/prebuilts/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf" path="prebuilts/gcc/linux-x86/arm/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf" revision="27edb819ca803f5da253ccbd4134d6337a7310d1" upstream="master"/>
+  <project name="rk/prebuilts/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf" path="prebuilts/gcc/linux-x86/arm/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf" revision="dd4df7dff4f1df65d78939a958b760a79e3650a1" upstream="master"/>
+  <project name="rk/rkbin" path="rkbin" revision="0ee3e16ca4e3d134d736529ce97b46683a9f090f" upstream="master"/>
+  <project name="rk/rknn-toolkit" path="external/rknn-toolkit" revision="4b8425805418e05faed5cafedb8ab7768a48c8dc" upstream="master"/>
+  <project name="rk/rockface" path="external/rockface" revision="c15e36566c5bf07e1f8449e9087d73533b4ff420" upstream="master"/>
+  <project name="rk/rockx" path="external/rockx" revision="3742f4c1888b21318a1dc6d7268779545ddfd549" upstream="master"/>
+</manifest>
diff --git a/rv1126_rv1109_linux_release.xml b/rv1126_rv1109_linux_release.xml
index 4425dac..a6bed16 120000
--- a/rv1126_rv1109_linux_release.xml
+++ b/rv1126_rv1109_linux_release.xml
@@ -1 +1 @@
-rv1126_rv1109_linux/rv1126_rv1109_linux_v2.1.1_20210524.xml
\ No newline at end of file
+rv1126_rv1109_linux/rv1126_rv1109_linux_v2.2.0_20210825.xml
\ No newline at end of file