diff --git a/rk356x_linux/rk356x_linux_dev.xml b/rk356x_linux/rk356x_linux_dev.xml
index 591adde..99478e1 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="8620bb18044917210656927d2c545361aa50e885" upstream="rk356x">
+  <project dest-branch="master" name="buildroot" revision="c2f0d6ffd0f4cdd99ce093a6c66c13ae2a1ee714" 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="66a5492b1299c369818c61771601e2aff12fc03b" upstream="master"/>
-  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="e3b1c6524d1c2dd5b048bc7584713933f6a4da5b" upstream="master">
+  <project dest-branch="master" name="debian" revision="3cabcbd402689d7b8c73473eeb2af1a551b97a66" upstream="master"/>
+  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="a08c51c92048e846f6ee2ed3166f7c4b260cd108" 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="1416399af9acfe7246320d12a3bd1b278ffbb91b" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="kernel" revision="42a6b06e3962fa88aeec59b5f838870f0f2ea629" 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"/>
@@ -39,6 +39,7 @@
   <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="0990c26eb4e5fe8cb8b3fa26782fc49e7c544d27" upstream="master"/>
   <project dest-branch="develop" name="settings" path="app/qsetting" revision="7719da2d42787bac1a6fe075f2ddf6157cd5d678" upstream="develop"/>
+  <project dest-branch="master" name="softapDemo" path="external/softapDemo" remote="rk-github" revision="4c7d1bd3d28df276d263f49324b022b44b3a1c85" upstream="master"/>
   <project dest-branch="master" name="tools" revision="130d4442db6aa9ff050e2e1038fc46bc143e88c8" 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"/>
@@ -47,5 +48,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="dde42ec6a2c0d2cdb20ef366963a0b673bac9a94" upstream="next-dev"/>
-  <project dest-branch="master" name="ubuntu" revision="52dee52d38c365ac16fb2e7439bdc66b5beccdbe" upstream="ubuntu18.04"/>
+  <project dest-branch="master" name="ubuntu" revision="a58d013059bff4c97210c14507aa043b636649fb" upstream="ubuntu18.04"/>
 </manifest>
diff --git a/rk356x_linux/rk356x_linux_dev_bk.xml b/rk356x_linux/rk356x_linux_dev_bk.xml
index 2ba1139..eb944ec 100644
--- a/rk356x_linux/rk356x_linux_dev_bk.xml
+++ b/rk356x_linux/rk356x_linux_dev_bk.xml
@@ -34,13 +34,13 @@
   <!-- <project remote="rk-github" dest-branch="master" name="ipcweb-ng" path="app/ipcweb-ng" revision="ca9ad4f24bb46568dbbb80ac216a6e2b5f872d23" upstream="master"/> -->
   <!-- <project remote="rk-github" dest-branch="master" name="bluetooth_bsa" path="external/bluetooth_bsa" revision="51b1afeefd0984dc1965379513a2931e85d281fa" upstream="master"/> -->
   <!-- <project remote="rk-github" dest-branch="master" name="broadcom_bsa" path="external/broadcom_bsa" revision="46234ce7a904794754bba79cb7c9f26d39605311" upstream="master"/> -->
-  <project dest-branch="master"  name="buildroot" path="buildroot" revision="8620bb18044917210656927d2c545361aa50e885" upstream="rk356x">
+  <project dest-branch="master"  name="buildroot" path="buildroot" revision="c2f0d6ffd0f4cdd99ce093a6c66c13ae2a1ee714" upstream="rk356x">
     <linkfile dest="Makefile" src="build/Makefile"/>
     <linkfile dest="envsetup.sh" src="build/envsetup.sh"/>
   </project>
-  <project dest-branch="master" name="debian" path="debian" revision="66a5492b1299c369818c61771601e2aff12fc03b" upstream="master"/>
-  <project dest-branch="master" name="ubuntu" path="ubuntu" revision="52dee52d38c365ac16fb2e7439bdc66b5beccdbe" upstream="ubuntu18.04"/>
-  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="e3b1c6524d1c2dd5b048bc7584713933f6a4da5b" upstream="master">
+  <project dest-branch="master" name="debian" path="debian" revision="3cabcbd402689d7b8c73473eeb2af1a551b97a66" upstream="master"/>
+  <project dest-branch="master" name="ubuntu" path="ubuntu" revision="a58d013059bff4c97210c14507aa043b636649fb" upstream="ubuntu18.04"/>
+  <project dest-branch="master" name="device_rockchip" path="device/rockchip" revision="a08c51c92048e846f6ee2ed3166f7c4b260cd108" 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"/>
@@ -92,7 +92,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="kernel" path="kernel" revision="1416399af9acfe7246320d12a3bd1b278ffbb91b" upstream="stable-4.19-rk356x"/>
+  <project dest-branch="stable-4.19-rk356x" name="kernel" path="kernel" revision="42a6b06e3962fa88aeec59b5f838870f0f2ea629" upstream="stable-4.19-rk356x"/>
   <project dest-branch="develop" name="mpp" path="external/mpp" revision="693720fd192d443ffc6dfab16f1ea359e09dcac6" upstream="develop"/>
   <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"/>