adjust archtecture tmp1

Signed-off-by: 林万顷 <wanqing.lin@bekencorp.com>

wifi_iot/config.json

@@ -56,7 +56,7 @@
         ]
       }
     ],
-    "vendor_adapter_dir": "//device/bk_corp/bk7231/bk7231_adapter",
+    "vendor_adapter_dir": "//device/bk_corp/bk7231",
     "third_party_dir": "//device/bk_corp/bk7231/bk7231_sdk/third_party",
     "product_adapter_dir": "//vendor/beken/wifi_iot/hals",
     "ohos_product_type":"",

wifi_iot/hals/utils/sys_param/BUILD.gn

@@ -3,6 +3,6 @@ static_library("hal_sysparam") {
   include_dirs = [
     "//base/startup/syspara_lite/hals",
     "//utils/native/lite/include",
-    "//device/bk_corp/bk7231/bk7231_sdk/ohos/hilink/include",
+    "//foundation/hilink/include",
   ]
 }

wifi_iot/hals/utils/token/BUILD.gn

@@ -17,7 +17,7 @@ static_library("hal_token_static") {
   include_dirs = [
     "//base/startup/syspara_lite/hals",
     "//utils/native/lite/include",
-    "//device/bk_corp/bk7231/bk7231_sdk/ohos/hilink/include",
+    "//foundation/hilink/include",
   ]
   deps = []
 }

wifi_iot/patch.yml

@@ -1,12 +1,12 @@
 . :
-- vendor/beken/wifi_iot/patches/base.patch
-- vendor/beken/wifi_iot/patches/build.patch
-- vendor/beken/wifi_iot/patches/foundation.patch
-- vendor/beken/wifi_iot/patches/kernel.patch
-- vendor/beken/wifi_iot/patches/test.patch
-- vendor/beken/wifi_iot/patches/utils.patch
 - vendor/beken/wifi_iot/patches/bounds_checking_function.patch
 - vendor/beken/wifi_iot/patches/cmsis.patch
 - vendor/beken/wifi_iot/patches/mbedtls.patch
 - vendor/beken/wifi_iot/patches/musl.patch
 - vendor/beken/wifi_iot/patches/cJSON.patch
+- vendor/beken/wifi_iot/patches/base.patch
+- vendor/beken/wifi_iot/patches/build.patch
+- vendor/beken/wifi_iot/patches/foundation.patch
+- vendor/beken/wifi_iot/patches/test.patch
+- vendor/beken/wifi_iot/patches/utils.patch
+- vendor/beken/wifi_iot/patches/kernel.patch

wifi_iot/patches/bounds_checking_function.patch

@@ -1,5 +1,12 @@
+diff --git a/third_party/bounds_checking_function/.gitignore b/third_party/bounds_checking_function/.gitignore
+deleted file mode 100644
+index 5761abcf..00000000
+--- a/third_party/bounds_checking_function/.gitignore
++++ /dev/null
+@@ -1 +0,0 @@
+-*.o
 diff --git a/third_party/bounds_checking_function/BUILD.gn b/third_party/bounds_checking_function/BUILD.gn
-index 09f527b1c..8dc638bff 100755
+index 09f527b1..8dc638bf 100755
 --- a/third_party/bounds_checking_function/BUILD.gn
 +++ b/third_party/bounds_checking_function/BUILD.gn
 @@ -65,10 +65,13 @@ libsec_sources = [

wifi_iot/patches/build.patch

@@ -1,6 +1,6 @@
 diff --git a/build/lite/components/beken.json b/build/lite/components/beken.json
 new file mode 100755
-index 000000000..f3beb3892
+index 00000000..ed16902e
 --- /dev/null
 +++ b/build/lite/components/beken.json
 @@ -0,0 +1,46 @@
@@ -11,10 +11,10 @@ index 000000000..f3beb3892
 +      "description": "my ohos entry.",
 +      "optional": "true",
 +      "dirs": [
-+        "//device/bk_corp/bk7231/bk7231_sdk/ohos"
++        "//device/bk_corp/bk7231/bk7231_sdk/ohos_entry"
 +      ],
 +      "targets": [
-+        "//device/bk_corp/bk7231/bk7231_sdk/ohos:ohos_entry"
++        "//device/bk_corp/bk7231/bk7231_sdk/ohos_entry:ohos_entry"
 +      ],
 +      "rom": "",
 +      "ram": "",
@@ -51,7 +51,7 @@ index 000000000..f3beb3892
 +  ]
 +}
 diff --git a/build/lite/components/security.json b/build/lite/components/security.json
-index af049a1cf..3bc6c2644 100755
+index af049a1c..3bc6c264 100755
 --- a/build/lite/components/security.json
 +++ b/build/lite/components/security.json
 @@ -68,6 +68,7 @@

wifi_iot/patches/cJSON.patch

@@ -1,5 +1,274 @@
+diff --git a/third_party/cJSON/.editorconfig b/third_party/cJSON/.editorconfig
+deleted file mode 100644
+index befb2c20..00000000
+--- a/third_party/cJSON/.editorconfig
++++ /dev/null
+@@ -1,23 +0,0 @@
+-root = true
+-
+-
+-[*]
+-indent_style = space
+-indent_size = 4
+-end_of_line = lf
+-charset = utf-8
+-trim_trailing_whitespace = true
+-insert_final_newline = true
+-
+-[Makefile]
+-indent_style = tab
+-indent_size = unset
+-
+-# ignore external repositories and test inputs
+-[tests/{unity,json-patch-tests,inputs}/*]
+-indent_style = unset
+-indent_size = unset
+-end_of_line = unset
+-charset = unset
+-trim_trailing_whitespace = unset
+-insert_final_newline = unset
+diff --git a/third_party/cJSON/.gitattributes b/third_party/cJSON/.gitattributes
+deleted file mode 100644
+index 7491fcc7..00000000
+--- a/third_party/cJSON/.gitattributes
++++ /dev/null
+@@ -1,8 +0,0 @@
+-*  					text=auto
+-/tests/inputs/*	text eol=lf
+-
+-.gitattributes          export-ignore
+-.gitignore              export-ignore
+-.github                 export-ignore
+-.editorconfig           export-ignore
+-.travis.yml             export-ignore
+diff --git a/third_party/cJSON/.github/CONTRIBUTING.md b/third_party/cJSON/.github/CONTRIBUTING.md
+deleted file mode 100644
+index 83d2e599..00000000
+--- a/third_party/cJSON/.github/CONTRIBUTING.md
++++ /dev/null
+@@ -1,54 +0,0 @@
+-Contribution Guidelines
+-=======================
+-
+-Contributions to cJSON are welcome. If you find a bug or want to improve cJSON in another way, pull requests are appreciated.
+-
+-For bigger changes, in order to avoid wasted effort, please open an issue to discuss the technical details before creating a pull request.
+-
+-The further sections explain the process in more detail and provides some guidelines on how contributions should look like.
+-
+-Branches
+---------
+-There are two branches to be aware of, the `master` and the `develop` branch. The `master` branch is reserved for the latest release, so only make pull requests to the `master` branch for small bug- or security fixes (these are usually just a few lines). In all other cases, please make a pull request to the `develop` branch.
+-
+-Coding Style
+-------------
+-The coding style has been discussed in [#24](https://github.com/DaveGamble/cJSON/issues/24). The basics are:
+-
+-* Use 4 spaces for indentation
+-* No oneliners (conditions, loops, variable declarations ...)
+-* Always use parenthesis for control structures
+-* Don't implicitly rely on operator precedence, use round brackets in expressions. e.g. `(a > b) && (c < d)` instead of `a>b && c<d`
+-* opening curly braces start in the next line
+-* use spaces around operators
+-* lines should not have trailing whitespace
+-* use spaces between function parameters
+-* use pronouncable variable names, not just a combination of letters
+-
+-Example:
+-
+-```c
+-/* calculate the new length of the string in a printbuffer and update the offset */
+-static void update_offset(printbuffer * const buffer)
+-{
+-    const unsigned char *buffer_pointer = NULL;
+-    if ((buffer == NULL) || (buffer->buffer == NULL))
+-    {
+-        return;
+-    }
+-    buffer_pointer = buffer->buffer + buffer->offset;
+-
+-    buffer->offset += strlen((const char*)buffer_pointer);
+-}
+-```
+-
+-Unit Tests
+-----------
+-cJSON uses the [Unity](https://github.com/ThrowTheSwitch/Unity) library for unit tests. The tests are located in the `tests` directory. In order to add a new test, either add it to one of the existing files (if it fits) or add a new C file for the test. That new file has to be added to the list of tests in `tests/CMakeLists.txt`.
+-
+-All new features have to be covered by unit tests.
+-
+-Other Notes
+------------
+-* Internal functions are to be declared static.
+-* Wrap the return type of external function in the `CJSON_PUBLIC` macro.
+diff --git a/third_party/cJSON/.github/workflows/CI.yml b/third_party/cJSON/.github/workflows/CI.yml
+deleted file mode 100644
+index dc9d17c6..00000000
+--- a/third_party/cJSON/.github/workflows/CI.yml
++++ /dev/null
+@@ -1,102 +0,0 @@
+-name: CI
+-
+-on:
+-  push:
+-    branches: [ master ]
+-    paths-ignore:
+-      - '**.md'
+-      - 'LICENSE'
+-  pull_request:
+-    types: [opened, synchronize]
+-    paths-ignore:
+-      - '**.md'
+-      - 'LICENSE'
+-
+-jobs:
+-  linux:
+-    runs-on: ubuntu-latest
+-    if: "!contains(github.event.head_commit.message, 'ci skip')"
+-    strategy:
+-      fail-fast: false
+-      matrix:
+-        mem_check:
+-          - ENABLE_VALGRIND
+-          - ENABLE_SANITIZERS
+-          - NONE_MEM_CHECK
+-        compiler:
+-          - GCC
+-          - CLANG
+-    steps:
+-    - uses: actions/checkout@v2
+-    - name: install build dependencies
+-      run: |
+-        sudo apt-get update
+-        sudo apt-get install clang-8 valgrind
+-    - name: build and test
+-      shell: bash
+-      run: |
+-          if [ "${{ matrix.mem_check }}" == "ENABLE_VALGRIND" ]; then
+-            EVENT_CMAKE_OPTIONS="-DENABLE_CJSON_UTILS=ON -DENABLE_VALGRIND=ON -DENABLE_SAFE_STACK=ON -DENABLE_SANITIZERS=OFF"
+-          elif [ "${{ matrix.mem_check }}" == "ENABLE_SANITIZERS" ]; then
+-            EVENT_CMAKE_OPTIONS="-DENABLE_CJSON_UTILS=ON -DENABLE_VALGRIND=OFF -DENABLE_SAFE_STACK=OFF -DENABLE_SANITIZERS=ON"
+-          else
+-            EVENT_CMAKE_OPTIONS="-DENABLE_CJSON_UTILS=ON -DENABLE_VALGRIND=OFF -DENABLE_SAFE_STACK=OFF -DENABLE_SANITIZERS=OFF"
+-          fi
+-          if [ "${{ matrix.compiler }}" == "GCC" ]; then
+-            export CC=gcc
+-          else
+-            export CC=clang
+-          fi
+-          #run build and test
+-          JOBS=20
+-          export CTEST_PARALLEL_LEVEL=$JOBS
+-          export CTEST_OUTPUT_ON_FAILURE=1
+-          mkdir -p build
+-          cd build
+-          echo [cmake]: cmake .. $EVENT_CMAKE_OPTIONS
+-          cmake .. $EVENT_CMAKE_OPTIONS || (rm -rf * && cmake .. $EVENT_CMAKE_OPTIONS)
+-          cmake --build .
+-          make
+-          make test
+-          
+-  macos:
+-    runs-on: macos-latest
+-    if: "!contains(github.event.head_commit.message, 'ci skip')"
+-    strategy:
+-      fail-fast: false
+-      matrix:
+-        mem_check:
+-          - ENABLE_VALGRIND
+-          - ENABLE_SANITIZERS
+-          - NONE_MEM_CHECK
+-        compiler:
+-          - GCC
+-          - CLANG
+-    steps:
+-    - uses: actions/checkout@v2
+-    - name: build and test
+-      shell: bash
+-      run: |
+-          if [ "${{ matrix.mem_check }}" == "ENABLE_VALGRIND" ]; then
+-            EVENT_CMAKE_OPTIONS="-DENABLE_CJSON_UTILS=ON -DENABLE_VALGRIND=ON -DENABLE_SAFE_STACK=ON -DENABLE_SANITIZERS=OFF"
+-          elif [ "${{ matrix.mem_check }}" == "ENABLE_SANITIZERS" ]; then
+-            EVENT_CMAKE_OPTIONS="-DENABLE_CJSON_UTILS=ON -DENABLE_VALGRIND=OFF -DENABLE_SAFE_STACK=OFF -DENABLE_SANITIZERS=ON"
+-          else
+-            EVENT_CMAKE_OPTIONS="-DENABLE_CJSON_UTILS=ON -DENABLE_VALGRIND=OFF -DENABLE_SAFE_STACK=OFF -DENABLE_SANITIZERS=OFF"
+-          fi
+-          if [ "${{ matrix.compiler }}" == "GCC" ]; then
+-            export CC=gcc
+-          else
+-            export CC=clang
+-          fi
+-          #run build and test
+-          JOBS=20
+-          export CTEST_PARALLEL_LEVEL=$JOBS
+-          export CTEST_OUTPUT_ON_FAILURE=1
+-          mkdir -p build
+-          cd build
+-          echo [cmake]: cmake .. $EVENT_CMAKE_OPTIONS
+-          cmake .. $EVENT_CMAKE_OPTIONS || (rm -rf * && cmake .. $EVENT_CMAKE_OPTIONS)
+-          cmake --build .
+-          make
+-          make test
+diff --git a/third_party/cJSON/.gitignore b/third_party/cJSON/.gitignore
+deleted file mode 100644
+index 58edf92c..00000000
+--- a/third_party/cJSON/.gitignore
++++ /dev/null
+@@ -1,18 +0,0 @@
+-.svn
+-test
+-*.o
+-*.a
+-*.so
+-*.swp
+-*.patch
+-tags
+-*.dylib
+-build/
+-cJSON_test
+-cJSON_test_utils
+-libcjson.so.*
+-libcjson_utils.so.*
+-*.orig
+-.vscode
+-.idea
+-cmake-build-debug
+diff --git a/third_party/cJSON/.travis.yml b/third_party/cJSON/.travis.yml
+deleted file mode 100644
+index e7ff744e..00000000
+--- a/third_party/cJSON/.travis.yml
++++ /dev/null
+@@ -1,28 +0,0 @@
+-dist: trusty
+-sudo: false
+-language: c
+-env:
+-  matrix:
+-    - VALGRIND=On SANITIZERS=Off
+-    - VALGRIND=Off SANITIZERS=Off
+-    - VALGRIND=Off SANITIZERS=On
+-compiler:
+-  - gcc
+-  - clang
+-addons:
+-  apt:
+-    packages:
+-      - valgrind
+-      - libasan0
+-      - lib32asan0
+-      # currently not supported on travis:
+-      # - libasan1
+-      # - libasan2
+-      # - libubsan0
+-      - llvm
+-script:
+-  - mkdir build
+-  - cd build
+-  - cmake .. -DENABLE_CJSON_UTILS=On -DENABLE_VALGRIND="${VALGRIND}" -DENABLE_SAFE_STACK="${VALGRIND}" -DENABLE_SANITIZERS="${SANITIZERS}"
+-  - make
+-  - make test CTEST_OUTPUT_ON_FAILURE=On
 diff --git a/third_party/cJSON/Makefile b/third_party/cJSON/Makefile
-index b14323059..3f0db43b4 100644
+index b1432305..3f0db43b 100644
 --- a/third_party/cJSON/Makefile
 +++ b/third_party/cJSON/Makefile
 @@ -24,14 +24,17 @@ INSTALL_LIBRARY_PATH = $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)

wifi_iot/patches/cmsis.patch

@@ -1,6 +1,6 @@
 diff --git a/third_party/cmsis/CMSIS/Core/Include/cachel1_armv7.h b/third_party/cmsis/CMSIS/Core/Include/cachel1_armv7.h
-new file mode 100755
-index 000000000..d2c3e2291
+new file mode 100644
+index 00000000..d2c3e229
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/cachel1_armv7.h
 @@ -0,0 +1,411 @@
@@ -416,8 +416,8 @@ index 000000000..d2c3e2291
 +
 +#endif /* ARM_CACHEL1_ARMV7_H */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/cmsis_armcc.h b/third_party/cmsis/CMSIS/Core/Include/cmsis_armcc.h
-new file mode 100755
-index 000000000..237ff6ec3
+new file mode 100644
+index 00000000..237ff6ec
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/cmsis_armcc.h
 @@ -0,0 +1,885 @@
@@ -1307,8 +1307,8 @@ index 000000000..237ff6ec3
 +
 +#endif /* __CMSIS_ARMCC_H */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/cmsis_armclang.h b/third_party/cmsis/CMSIS/Core/Include/cmsis_armclang.h
-new file mode 100755
-index 000000000..90de9dbf8
+new file mode 100644
+index 00000000..90de9dbf
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/cmsis_armclang.h
 @@ -0,0 +1,1467 @@
@@ -2780,8 +2780,8 @@ index 000000000..90de9dbf8
 +
 +#endif /* __CMSIS_ARMCLANG_H */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/cmsis_armclang_ltm.h b/third_party/cmsis/CMSIS/Core/Include/cmsis_armclang_ltm.h
-new file mode 100755
-index 000000000..0e5c7349d
+new file mode 100644
+index 00000000..0e5c7349
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/cmsis_armclang_ltm.h
 @@ -0,0 +1,1893 @@
@@ -4679,8 +4679,8 @@ index 000000000..0e5c7349d
 +
 +#endif /* __CMSIS_ARMCLANG_H */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/cmsis_compiler.h b/third_party/cmsis/CMSIS/Core/Include/cmsis_compiler.h
-new file mode 100755
-index 000000000..adbf296f1
+new file mode 100644
+index 00000000..adbf296f
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/cmsis_compiler.h
 @@ -0,0 +1,283 @@
@@ -4968,8 +4968,8 @@ index 000000000..adbf296f1
 +#endif /* __CMSIS_COMPILER_H */
 +
 diff --git a/third_party/cmsis/CMSIS/Core/Include/cmsis_gcc.h b/third_party/cmsis/CMSIS/Core/Include/cmsis_gcc.h
-new file mode 100755
-index 000000000..a2778f58e
+new file mode 100644
+index 00000000..a2778f58
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/cmsis_gcc.h
 @@ -0,0 +1,2177 @@
@@ -7151,8 +7151,8 @@ index 000000000..a2778f58e
 +
 +#endif /* __CMSIS_GCC_H */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/cmsis_iccarm.h b/third_party/cmsis/CMSIS/Core/Include/cmsis_iccarm.h
-new file mode 100755
-index 000000000..7eeffca5c
+new file mode 100644
+index 00000000..7eeffca5
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/cmsis_iccarm.h
 @@ -0,0 +1,968 @@
@@ -8125,8 +8125,8 @@ index 000000000..7eeffca5c
 +
 +#endif /* __CMSIS_ICCARM_H__ */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/cmsis_version.h b/third_party/cmsis/CMSIS/Core/Include/cmsis_version.h
-new file mode 100755
-index 000000000..2f048e455
+new file mode 100644
+index 00000000..2f048e45
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/cmsis_version.h
 @@ -0,0 +1,39 @@
@@ -8170,8 +8170,8 @@ index 000000000..2f048e455
 +                                   __CM_CMSIS_VERSION_SUB           )       /*!< CMSIS Core(M) version number */
 +#endif
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_armv81mml.h b/third_party/cmsis/CMSIS/Core/Include/core_armv81mml.h
-new file mode 100755
-index 000000000..1ad19e215
+new file mode 100644
+index 00000000..1ad19e21
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_armv81mml.h
 @@ -0,0 +1,4191 @@
@@ -12367,8 +12367,8 @@ index 000000000..1ad19e215
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_armv8mbl.h b/third_party/cmsis/CMSIS/Core/Include/core_armv8mbl.h
-new file mode 100755
-index 000000000..932d3d188
+new file mode 100644
+index 00000000..932d3d18
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_armv8mbl.h
 @@ -0,0 +1,2222 @@
@@ -14595,8 +14595,8 @@ index 000000000..932d3d188
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_armv8mml.h b/third_party/cmsis/CMSIS/Core/Include/core_armv8mml.h
-new file mode 100755
-index 000000000..71f000bca
+new file mode 100644
+index 00000000..71f000bc
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_armv8mml.h
 @@ -0,0 +1,3196 @@
@@ -17797,8 +17797,8 @@ index 000000000..71f000bca
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm0.h b/third_party/cmsis/CMSIS/Core/Include/core_cm0.h
-new file mode 100755
-index 000000000..6441ff341
+new file mode 100644
+index 00000000..6441ff34
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm0.h
 @@ -0,0 +1,952 @@
@@ -18755,8 +18755,8 @@ index 000000000..6441ff341
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm0plus.h b/third_party/cmsis/CMSIS/Core/Include/core_cm0plus.h
-new file mode 100755
-index 000000000..4e7179a61
+new file mode 100644
+index 00000000..4e7179a6
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm0plus.h
 @@ -0,0 +1,1087 @@
@@ -19848,8 +19848,8 @@ index 000000000..4e7179a61
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm1.h b/third_party/cmsis/CMSIS/Core/Include/core_cm1.h
-new file mode 100755
-index 000000000..76b456974
+new file mode 100644
+index 00000000..76b45697
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm1.h
 @@ -0,0 +1,979 @@
@@ -20833,8 +20833,8 @@ index 000000000..76b456974
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm23.h b/third_party/cmsis/CMSIS/Core/Include/core_cm23.h
-new file mode 100755
-index 000000000..55fff9950
+new file mode 100644
+index 00000000..55fff995
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm23.h
 @@ -0,0 +1,2297 @@
@@ -23136,8 +23136,8 @@ index 000000000..55fff9950
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm3.h b/third_party/cmsis/CMSIS/Core/Include/core_cm3.h
-new file mode 100755
-index 000000000..24453a886
+new file mode 100644
+index 00000000..24453a88
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm3.h
 @@ -0,0 +1,1943 @@
@@ -25085,8 +25085,8 @@ index 000000000..24453a886
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm33.h b/third_party/cmsis/CMSIS/Core/Include/core_cm33.h
-new file mode 100755
-index 000000000..13359be3e
+new file mode 100644
+index 00000000..13359be3
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm33.h
 @@ -0,0 +1,3264 @@
@@ -28355,8 +28355,8 @@ index 000000000..13359be3e
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm35p.h b/third_party/cmsis/CMSIS/Core/Include/core_cm35p.h
-new file mode 100755
-index 000000000..6a5f6ad14
+new file mode 100644
+index 00000000..6a5f6ad1
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm35p.h
 @@ -0,0 +1,3264 @@
@@ -31625,8 +31625,8 @@ index 000000000..6a5f6ad14
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm4.h b/third_party/cmsis/CMSIS/Core/Include/core_cm4.h
-new file mode 100755
-index 000000000..4e0e88669
+new file mode 100644
+index 00000000..4e0e8866
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm4.h
 @@ -0,0 +1,2129 @@
@@ -33760,8 +33760,8 @@ index 000000000..4e0e88669
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm55.h b/third_party/cmsis/CMSIS/Core/Include/core_cm55.h
-new file mode 100755
-index 000000000..6efaa3f84
+new file mode 100644
+index 00000000..6efaa3f8
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm55.h
 @@ -0,0 +1,4215 @@
@@ -37981,8 +37981,8 @@ index 000000000..6efaa3f84
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_cm7.h b/third_party/cmsis/CMSIS/Core/Include/core_cm7.h
-new file mode 100755
-index 000000000..e1c31c275
+new file mode 100644
+index 00000000..e1c31c27
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_cm7.h
 @@ -0,0 +1,2362 @@
@@ -40349,8 +40349,8 @@ index 000000000..e1c31c275
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_sc000.h b/third_party/cmsis/CMSIS/Core/Include/core_sc000.h
-new file mode 100755
-index 000000000..dbc755fff
+new file mode 100644
+index 00000000..dbc755ff
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_sc000.h
 @@ -0,0 +1,1030 @@
@@ -41385,8 +41385,8 @@ index 000000000..dbc755fff
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/core_sc300.h b/third_party/cmsis/CMSIS/Core/Include/core_sc300.h
-new file mode 100755
-index 000000000..e8914ba60
+new file mode 100644
+index 00000000..e8914ba6
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/core_sc300.h
 @@ -0,0 +1,1917 @@
@@ -43308,8 +43308,8 @@ index 000000000..e8914ba60
 +
 +#endif /* __CMSIS_GENERIC */
 diff --git a/third_party/cmsis/CMSIS/Core/Include/mpu_armv7.h b/third_party/cmsis/CMSIS/Core/Include/mpu_armv7.h
-new file mode 100755
-index 000000000..791a8dae6
+new file mode 100644
+index 00000000..791a8dae
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/mpu_armv7.h
 @@ -0,0 +1,275 @@
@@ -43589,8 +43589,8 @@ index 000000000..791a8dae6
 +
 +#endif
 diff --git a/third_party/cmsis/CMSIS/Core/Include/mpu_armv8.h b/third_party/cmsis/CMSIS/Core/Include/mpu_armv8.h
-new file mode 100755
-index 000000000..ef44ad01d
+new file mode 100644
+index 00000000..ef44ad01
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/mpu_armv8.h
 @@ -0,0 +1,352 @@
@@ -43947,8 +43947,8 @@ index 000000000..ef44ad01d
 +#endif
 +
 diff --git a/third_party/cmsis/CMSIS/Core/Include/pmu_armv8.h b/third_party/cmsis/CMSIS/Core/Include/pmu_armv8.h
-new file mode 100755
-index 000000000..dbd39d20c
+new file mode 100644
+index 00000000..dbd39d20
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/pmu_armv8.h
 @@ -0,0 +1,337 @@
@@ -44290,8 +44290,8 @@ index 000000000..dbd39d20c
 +
 +#endif
 diff --git a/third_party/cmsis/CMSIS/Core/Include/tz_context.h b/third_party/cmsis/CMSIS/Core/Include/tz_context.h
-new file mode 100755
-index 000000000..0d09749f3
+new file mode 100644
+index 00000000..0d09749f
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/Core/Include/tz_context.h
 @@ -0,0 +1,70 @@
@@ -44366,8 +44366,8 @@ index 000000000..0d09749f3
 + 
 +#endif  // TZ_CONTEXT_H
 diff --git a/third_party/cmsis/CMSIS/RTOS2/Include/cmsis_os2.h b/third_party/cmsis/CMSIS/RTOS2/Include/cmsis_os2.h
-new file mode 100755
-index 000000000..e0b602c79
+new file mode 100644
+index 00000000..e0b602c7
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/RTOS2/Include/cmsis_os2.h
 @@ -0,0 +1,756 @@
@@ -45128,8 +45128,8 @@ index 000000000..e0b602c79
 + 
 +#endif  // CMSIS_OS2_H_
 diff --git a/third_party/cmsis/CMSIS/RTOS2/Include/os_tick.h b/third_party/cmsis/CMSIS/RTOS2/Include/os_tick.h
-new file mode 100755
-index 000000000..8f7cdf667
+new file mode 100644
+index 00000000..8f7cdf66
 --- /dev/null
 +++ b/third_party/cmsis/CMSIS/RTOS2/Include/os_tick.h
 @@ -0,0 +1,71 @@
@@ -45204,9 +45204,15 @@ index 000000000..8f7cdf667
 +uint32_t OS_Tick_GetOverflow (void);
 +
 +#endif  /* OS_TICK_H */
+diff --git a/third_party/cmsis/LICENSE.txt b/third_party/cmsis/LICENSE.txt
+old mode 100755
+new mode 100644
+diff --git a/third_party/cmsis/README.OpenSource b/third_party/cmsis/README.OpenSource
+old mode 100755
+new mode 100644
 diff --git a/third_party/cmsis/cmsis_os2.h b/third_party/cmsis/cmsis_os2.h
 deleted file mode 100755
-index d4e1436b3..000000000
+index d4e1436b..00000000
 --- a/third_party/cmsis/cmsis_os2.h
 +++ /dev/null
 @@ -1,1215 +0,0 @@

wifi_iot/patches/mbedtls.patch

@@ -1,5 +1,300 @@
+diff --git a/third_party/mbedtls/.github/issue_template.md b/third_party/mbedtls/.github/issue_template.md
+deleted file mode 100644
+index 7c313535..00000000
+--- a/third_party/mbedtls/.github/issue_template.md
++++ /dev/null
+@@ -1,41 +0,0 @@
+-Note: This is just a template, so feel free to use/remove the unnecessary things
+-
+-### Description
+-- Type: Bug | Enhancement\Feature Request | Question
+-- Priority: Blocker | Major | Minor
+-
+----------------------------------------------------------------
+-## Bug
+-
+-**OS**  
+-Mbed OS|linux|windows|
+-
+-**mbed TLS build:**  
+-Version: x.x.x or git commit id  
+-OS version: x.x.x  
+-Configuration: please attach config.h file where possible  
+-Compiler and options (if you used a pre-built binary, please indicate how you obtained it):  
+-Additional environment information:  
+-
+-**Peer device TLS stack and version**  
+-OpenSSL|GnuTls|Chrome|NSS(Firefox)|SecureChannel (IIS/Internet Explorer/Edge)|Other  
+-Version:  
+-
+-**Expected behavior**   
+-
+-**Actual behavior**  
+-
+-**Steps to reproduce**  
+-
+-----------------------------------------------------------------
+-## Enhancement\Feature Request
+-
+-**Justification - why does the library need this feature?**  
+-
+-**Suggested enhancement**  
+-
+------------------------------------------------------------------
+-
+-## Question
+-
+-**Please first check for answers in the [Mbed TLS knowledge Base](https://tls.mbed.org/kb), and preferably file an issue in the [Mbed TLS support forum](https://forums.mbed.com/c/mbed-tls)**  
+diff --git a/third_party/mbedtls/.github/pull_request_template.md b/third_party/mbedtls/.github/pull_request_template.md
+deleted file mode 100644
+index c5804436..00000000
+--- a/third_party/mbedtls/.github/pull_request_template.md
++++ /dev/null
+@@ -1,36 +0,0 @@
+-Notes:
+-* Pull requests cannot be accepted until the PR follows the [contributing guidelines](../CONTRIBUTING.md). In particular, each commit must have at least one `Signed-off-by:` line from the committer to certify that the contribution is made under the terms of the [Developer Certificate of Origin](../dco.txt).
+-* This is just a template, so feel free to use/remove the unnecessary things
+-## Description
+-A few sentences describing the overall goals of the pull request's commits.
+-
+-
+-## Status
+-**READY/IN DEVELOPMENT/HOLD**
+-
+-## Requires Backporting
+-When there is a bug fix, it should be backported to all maintained and supported branches.
+-Changes do not have to be backported if:
+-- This PR is a new feature\enhancement
+-- This PR contains changes in the API. If this is true, and there is a need for the fix to be backported, the fix should be handled differently in the legacy branch
+-
+-Yes | NO  
+-Which branch?
+-
+-## Migrations
+-If there is any API change, what's the incentive and logic for it.
+-
+-YES | NO
+-
+-## Additional comments
+-Any additional information that could be of interest
+-
+-## Todos
+-- [ ] Tests
+-- [ ] Documentation
+-- [ ] Changelog updated
+-- [ ] Backported
+-
+-
+-## Steps to test or reproduce
+-Outline the steps to test or reproduce the PR here.
+diff --git a/third_party/mbedtls/.gitignore b/third_party/mbedtls/.gitignore
+deleted file mode 100644
+index 789f57ee..00000000
+--- a/third_party/mbedtls/.gitignore
++++ /dev/null
+@@ -1,43 +0,0 @@
+-# Random seed file created by test scripts and sample programs
+-seedfile
+-
+-# CMake build artifacts:
+-CMakeCache.txt
+-CMakeFiles
+-CTestTestfile.cmake
+-cmake_install.cmake
+-Testing
+-# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those:
+-*.dir/
+-# MSVC files generated by CMake:
+-/*.sln
+-/*.vcxproj
+-/*.filters
+-
+-# Test coverage build artifacts:
+-Coverage
+-*.gcno
+-*.gcda
+-
+-# generated by scripts/memory.sh
+-massif-*
+-
+-# MSVC build artifacts:
+-*.exe
+-*.pdb
+-*.ilk
+-*.lib
+-
+-# Python build artifacts:
+-*.pyc
+-
+-# Generated documentation:
+-/apidoc
+-
+-# Editor navigation files:
+-/GPATH
+-/GRTAGS
+-/GSYMS
+-/GTAGS
+-/TAGS
+-/tags
+diff --git a/third_party/mbedtls/.globalrc b/third_party/mbedtls/.globalrc
+deleted file mode 100644
+index 01b2ea5a..00000000
+--- a/third_party/mbedtls/.globalrc
++++ /dev/null
+@@ -1,3 +0,0 @@
+-default:\
+-    :langmap=c\:.c.h.function:\
+-
+diff --git a/third_party/mbedtls/.pylintrc b/third_party/mbedtls/.pylintrc
+deleted file mode 100755
+index 08c114ad..00000000
+--- a/third_party/mbedtls/.pylintrc
++++ /dev/null
+@@ -1,72 +0,0 @@
+-[BASIC]
+-# We're ok with short funtion argument names.
+-# [invalid-name]
+-argument-rgx=[a-z_][a-z0-9_]*$
+-
+-# Allow filter and map.
+-# [bad-builtin]
+-bad-functions=input
+-
+-# We prefer docstrings, but we don't require them on all functions.
+-# Require them only on long functions (for some value of long).
+-# [missing-docstring]
+-docstring-min-length=10
+-
+-# Allow longer methods than the default.
+-# [invalid-name]
+-method-rgx=[a-z_][a-z0-9_]{2,35}$
+-
+-# Allow module names containing a dash (but no underscore or uppercase letter).
+-# They are whole programs, not meant to be included by another module.
+-# [invalid-name]
+-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|[a-z][-0-9a-z]+)$
+-
+-# Some functions don't need docstrings.
+-# [missing-docstring]
+-no-docstring-rgx=(run_)main$
+-
+-# We're ok with short local or global variable names.
+-# [invalid-name]
+-variable-rgx=[a-z_][a-z0-9_]*$
+-
+-[DESIGN]
+-# Allow more than the default 7 attributes.
+-# [too-many-instance-attributes]
+-max-attributes=15
+-
+-[FORMAT]
+-# Allow longer modules than the default recommended maximum.
+-# [too-many-lines]
+-max-module-lines=2000
+-
+-[MESSAGES CONTROL]
+-# * locally-disabled, locally-enabled: If we disable or enable a message
+-#   locally, it's by design. There's no need to clutter the Pylint output
+-#   with this information.
+-# * logging-format-interpolation: Pylint warns about things like
+-#   ``log.info('...'.format(...))``. It insists on ``log.info('...', ...)``.
+-#   This is of minor utility (mainly a performance gain when there are
+-#   many messages that use formatting and are below the log level).
+-#   Some versions of Pylint (including 1.8, which is the version on
+-#   Ubuntu 18.04) only recognize old-style format strings using '%',
+-#   and complain about something like ``log.info('{}', foo)`` with
+-#   logging-too-many-args (Pylint supports new-style formatting if
+-#   declared globally with logging_format_style under [LOGGING] but
+-#   this requires Pylint >=2.2).
+-# * no-else-return: Allow the perfectly reasonable idiom
+-#    if condition1:
+-#        return value1
+-#    else:
+-#        return value2
+-# * unnecessary-pass: If we take the trouble of adding a line with "pass",
+-#   it's because we think the code is clearer that way.
+-disable=locally-disabled,locally-enabled,logging-format-interpolation,no-else-return,unnecessary-pass
+-
+-[REPORTS]
+-# Don't diplay statistics. Just the facts.
+-reports=no
+-
+-[VARIABLES]
+-# Allow unused variables if their name starts with an underscore.
+-# [unused-argument]
+-dummy-variables-rgx=_.*
+diff --git a/third_party/mbedtls/.travis.yml b/third_party/mbedtls/.travis.yml
+deleted file mode 100755
+index 8789c444..00000000
+--- a/third_party/mbedtls/.travis.yml
++++ /dev/null
+@@ -1,64 +0,0 @@
+-language: c
+-compiler: gcc
+-sudo: false
+-cache: ccache
+-
+-jobs:
+-  include:
+-    - name: basic checks and reference configurations
+-      addons:
+-        apt:
+-          packages:
+-          - gnutls-bin
+-          - doxygen
+-          - graphviz
+-          - gcc-arm-none-eabi
+-          - libnewlib-arm-none-eabi
+-      language: python # Needed to get pip for Python 3
+-      python: 3.5 # version from Ubuntu 16.04
+-      install:
+-        - pip install pylint==2.4.4
+-      script:
+-        - tests/scripts/all.sh -k 'check_*'
+-        - tests/scripts/all.sh -k test_default_out_of_box
+-        - tests/scripts/test-ref-configs.pl
+-        - tests/scripts/all.sh -k build_arm_none_eabi_gcc_arm5vte build_arm_none_eabi_gcc_m0plus
+-
+-    - name: full configuration
+-      script:
+-        - tests/scripts/all.sh -k test_full_cmake_gcc_asan
+-
+-    - name: check compilation guards
+-      script:
+-        - tests/scripts/all.sh -k 'test_depends_*' 'build_key_exchanges'
+-
+-    - name: macOS
+-      os: osx
+-      compiler: clang
+-      script:
+-        - tests/scripts/all.sh -k test_default_out_of_box
+-
+-    - name: Windows
+-      os: windows
+-      script:
+-        - scripts/windows_msbuild.bat v141 # Visual Studio 2017
+-
+-after_failure:
+-- tests/scripts/travis-log-failure.sh
+-
+-env:
+-  global:
+-    - SEED=1
+-    - secure: "FrI5d2s+ckckC17T66c8jm2jV6i2DkBPU5nyWzwbedjmEBeocREfQLd/x8yKpPzLDz7ghOvr+/GQvsPPn0dVkGlNzm3Q+hGHc/ujnASuUtGrcuMM+0ALnJ3k4rFr9xEvjJeWb4SmhJO5UCAZYvTItW4k7+bj9L+R6lt3TzQbXzg="
+-
+-addons:
+-  apt:
+-    packages:
+-    - gnutls-bin
+-  coverity_scan:
+-    project:
+-      name: "ARMmbed/mbedtls"
+-    notification_email: support-mbedtls@arm.com
+-    build_command_prepend:
+-    build_command: make
+-    branch_pattern: coverity_scan
 diff --git a/third_party/mbedtls/BUILD.gn b/third_party/mbedtls/BUILD.gn
-index ae84926dd..ecb877265 100755
+index ae84926d..ecb87726 100755
 --- a/third_party/mbedtls/BUILD.gn
 +++ b/third_party/mbedtls/BUILD.gn
 @@ -86,6 +86,7 @@ mbedtls_sources += [
@@ -10,12 +305,9 @@ index ae84926dd..ecb877265 100755
  ]
  
  config("mbedtls_config") {
-diff --git a/third_party/mbedtls/include/.gitignore b/third_party/mbedtls/include/.gitignore
-old mode 100644
-new mode 100755
 diff --git a/third_party/mbedtls/include/arch/cc.h b/third_party/mbedtls/include/arch/cc.h
 new file mode 100755
-index 000000000..cf3e5091b
+index 00000000..cf3e5091
 --- /dev/null
 +++ b/third_party/mbedtls/include/arch/cc.h
 @@ -0,0 +1,110 @@
@@ -130,7 +422,7 @@ index 000000000..cf3e5091b
 +
 +
 diff --git a/third_party/mbedtls/include/mbedtls/config.h b/third_party/mbedtls/include/mbedtls/config.h
-index 4acbadc49..e8d921db8 100755
+index 4acbadc4..e8d921db 100755
 --- a/third_party/mbedtls/include/mbedtls/config.h
 +++ b/third_party/mbedtls/include/mbedtls/config.h
 @@ -1,822 +1,824 @@
@@ -6882,14 +7174,14 @@ index 4acbadc49..e8d921db8 100755
  #endif /* MBEDTLS_CONFIG_H */
 diff --git a/third_party/mbedtls/include/sys_config.h b/third_party/mbedtls/include/sys_config.h
 new file mode 100755
-index 000000000..1259c8495
+index 00000000..1259c849
 --- /dev/null
 +++ b/third_party/mbedtls/include/sys_config.h
 @@ -0,0 +1 @@
 +////
 \ No newline at end of file
 diff --git a/third_party/mbedtls/library/Makefile b/third_party/mbedtls/library/Makefile
-index 1e1b0358a..95813e0f7 100644
+index 1e1b0358..95813e0f 100644
 --- a/third_party/mbedtls/library/Makefile
 +++ b/third_party/mbedtls/library/Makefile
 @@ -6,6 +6,13 @@ WARNING_CFLAGS ?=  -Wall -W -Wdeclaration-after-statement
@@ -6936,18 +7228,71 @@ index 1e1b0358a..95813e0f7 100644
  clean:
  ifndef WINDOWS
  	rm -f *.o libmbed*
+diff --git a/third_party/mbedtls/library/lwip_adapter.h b/third_party/mbedtls/library/lwip_adapter.h
+new file mode 100755
+index 00000000..a193b982
+--- /dev/null
++++ b/third_party/mbedtls/library/lwip_adapter.h
+@@ -0,0 +1,47 @@
++/** @ingroup socket */
++#define accept(s,addr,addrlen)                    lwip_accept(s,addr,addrlen)
++/** @ingroup socket */
++#define bind(s,name,namelen)                      lwip_bind(s,name,namelen)
++/** @ingroup socket */
++#define shutdown(s,how)                           lwip_shutdown(s,how)
++/** @ingroup socket */
++#define getpeername(s,name,namelen)               lwip_getpeername(s,name,namelen)
++/** @ingroup socket */
++#define getsockname(s,name,namelen)               lwip_getsockname(s,name,namelen)
++/** @ingroup socket */
++#define setsockopt(s,level,optname,opval,optlen)  lwip_setsockopt(s,level,optname,opval,optlen)
++/** @ingroup socket */
++#define getsockopt(s,level,optname,opval,optlen)  lwip_getsockopt(s,level,optname,opval,optlen)
++/** @ingroup socket */
++#define closesocket(s)                            lwip_close(s)
++/** @ingroup socket */
++#define connect(s,name,namelen)                   lwip_connect(s,name,namelen)
++/** @ingroup socket */
++#define listen(s,backlog)                         lwip_listen(s,backlog)
++/** @ingroup socket */
++#define recv(s,mem,len,flags)                     lwip_recv(s,mem,len,flags)
++/** @ingroup socket */
++#define recvfrom(s,mem,len,flags,from,fromlen)    lwip_recvfrom(s,mem,len,flags,from,fromlen)
++/** @ingroup socket */
++#define send(s,dataptr,size,flags)                lwip_send(s,dataptr,size,flags)
++/** @ingroup socket */
++#define sendmsg(s,message,flags)                  lwip_sendmsg(s,message,flags)
++/** @ingroup socket */
++#define sendto(s,dataptr,size,flags,to,tolen)     lwip_sendto(s,dataptr,size,flags,to,tolen)
++/** @ingroup socket */
++#define socket(domain,type,protocol)              lwip_socket(domain,type,protocol)
++/** @ingroup socket */
++#define select(maxfdp1,readset,writeset,exceptset,timeout)     lwip_select(maxfdp1,readset,writeset,exceptset,timeout)
++/** @ingroup socket */
++#define ioctlsocket(s,cmd,argp)                   lwip_ioctl(s,cmd,argp)
++
++/** @ingroup netdbapi */
++#define gethostbyname(name) lwip_gethostbyname(name)
++/** @ingroup netdbapi */
++#define gethostbyname_r(name, ret, buf, buflen, result, h_errnop) \
++       lwip_gethostbyname_r(name, ret, buf, buflen, result, h_errnop)
++/** @ingroup netdbapi */
++#define freeaddrinfo(addrinfo) lwip_freeaddrinfo(addrinfo)
++/** @ingroup netdbapi */
++#define getaddrinfo(nodname, servname, hints, res) \
++       lwip_getaddrinfo(nodname, servname, hints, res)
 diff --git a/third_party/mbedtls/library/net_sockets.c b/third_party/mbedtls/library/net_sockets.c
-index 113040826..adeced171 100755
+index 11304082..3d39ad82 100755
 --- a/third_party/mbedtls/library/net_sockets.c
 +++ b/third_party/mbedtls/library/net_sockets.c
 @@ -47,6 +47,12 @@
  /* Enable definition of getaddrinfo() even when compiling with -std=c99. Must
   * be set before config.h, which pulls in glibc's features.h indirectly.
   * Harmless on other platforms. */
-+#define __DEFINED_struct_timeval
-+struct timeval{
-+	int tv_sec;
-+	int tv_usec;
++#define __DEFINED_struct_timeval
++struct timeval{
++	int tv_sec;
++	int tv_usec;
 +};
 +
  #define _POSIX_C_SOURCE 200112L
@@ -7121,7 +7466,7 @@ index 113040826..adeced171 100755
  }
  
 diff --git a/third_party/mbedtls/library/platform.c b/third_party/mbedtls/library/platform.c
-index c4c3fd332..a800d77da 100755
+index c4c3fd33..a800d77d 100755
 --- a/third_party/mbedtls/library/platform.c
 +++ b/third_party/mbedtls/library/platform.c
 @@ -49,6 +49,7 @@
@@ -7132,11 +7477,150 @@ index c4c3fd332..a800d77da 100755
  
  #if defined(MBEDTLS_PLATFORM_C)
  
+diff --git a/third_party/mbedtls/library/ssl_cli.c b/third_party/mbedtls/library/ssl_cli.c
+index bd7f2813..cb59e3c2 100755
+--- a/third_party/mbedtls/library/ssl_cli.c
++++ b/third_party/mbedtls/library/ssl_cli.c
+@@ -1058,7 +1058,6 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
+     if( ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM )
+         offer_compress = 0;
+ #endif
+-
+     if( offer_compress )
+     {
+         MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, compress len.: %d", 2 ) );
+@@ -1239,6 +1238,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
+ 
+     if( ( ret = mbedtls_ssl_write_handshake_msg( ssl ) ) != 0 )
+     {
++//		bk_printf("ssl_write_client_hello ret :%d\r\n",ret);
+         MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_write_handshake_msg", ret );
+         return( ret );
+     }
+@@ -3772,6 +3772,33 @@ static int ssl_parse_new_session_ticket( mbedtls_ssl_context *ssl )
+ }
+ #endif /* MBEDTLS_SSL_SESSION_TICKETS */
+ 
++static char *state_strs[] = {
++	"hello req",
++	"cli hello",
++	"server hello",
++	"server cert",
++	"server key ex",
++
++	"cert req",
++	"server hello done",
++	"cli cert",
++	"cli key ex",
++	"cert verify",
++
++	"cli change cipher",
++	"cli finish",
++	"server change cipher",
++	"server finish",
++	"flush",
++
++	"handshake wrapup",
++	"handshake over",
++	"server new ticket",
++	"server hello sent"
++	
++};
++    
++
+ /*
+  * SSL handshake -- client side -- single step
+  */
+@@ -3805,8 +3832,9 @@ int mbedtls_ssl_handshake_client_step( mbedtls_ssl_context *ssl )
+         ssl->state = MBEDTLS_SSL_SERVER_NEW_SESSION_TICKET;
+     }
+ #endif
++//	printf("mbedtls_ssl_handshake_client_step : cli state = %d {%s}\n", ssl->state, state_strs[ssl->state]);
+ 
+-    switch( ssl->state )
++	switch( ssl->state )
+     {
+         case MBEDTLS_SSL_HELLO_REQUEST:
+             ssl->state = MBEDTLS_SSL_CLIENT_HELLO;
+diff --git a/third_party/mbedtls/library/ssl_srv.c b/third_party/mbedtls/library/ssl_srv.c
+index 97b77845..0b88bfe2 100755
+--- a/third_party/mbedtls/library/ssl_srv.c
++++ b/third_party/mbedtls/library/ssl_srv.c
+@@ -4270,6 +4270,31 @@ static int ssl_write_new_session_ticket( mbedtls_ssl_context *ssl )
+     return( 0 );
+ }
+ #endif /* MBEDTLS_SSL_SESSION_TICKETS */
++static char *state_strs[] = {
++	"hello req",
++	"cli hello",
++	"server hello",
++	"server cert",
++	"server key ex",
++
++	"cert req",
++	"server hello done",
++	"cli cert",
++	"cli key ex",
++	"cert verify",
++
++	"cli change cipher",
++	"cli finish",
++	"server change cipher",
++	"server finish",
++	"flush",
++
++	"handshake wrapup",
++	"handshake over",
++	"server new ticket",
++	"server hello sent"
++	
++};
+ 
+ /*
+  * SSL handshake -- server side -- single step
+@@ -4294,6 +4319,7 @@ int mbedtls_ssl_handshake_server_step( mbedtls_ssl_context *ssl )
+             return( ret );
+     }
+ #endif /* MBEDTLS_SSL_PROTO_DTLS */
++//	printf("xxx : srv state = %d {%s}\n", ssl->state, state_strs[ssl->state]);
+ 
+     switch( ssl->state )
+     {
 diff --git a/third_party/mbedtls/library/ssl_tls.c b/third_party/mbedtls/library/ssl_tls.c
-index 2471600c9..7faa14348 100755
+index 2471600c..2912bb46 100755
 --- a/third_party/mbedtls/library/ssl_tls.c
 +++ b/third_party/mbedtls/library/ssl_tls.c
-@@ -2804,8 +2804,20 @@ int mbedtls_ssl_fetch_input( mbedtls_ssl_context *ssl, size_t nb_want )
+@@ -51,6 +51,7 @@
+  *  http://www.ietf.org/rfc/rfc2246.txt
+  *  http://www.ietf.org/rfc/rfc4346.txt
+  */
++extern void bk_printf(const char *fmt, ...);
+ 
+ #if !defined(MBEDTLS_CONFIG_FILE)
+ #include "mbedtls/config.h"
+@@ -2798,14 +2799,39 @@ int mbedtls_ssl_fetch_input( mbedtls_ssl_context *ssl, size_t nb_want )
+             {
+                 if( ssl->f_recv_timeout != NULL )
+                 {
+-                    ret = ssl->f_recv_timeout( ssl->p_bio,
+-                                               ssl->in_hdr + ssl->in_left, len,
+-                                               ssl->conf->read_timeout );
++                 //   ret = ssl->f_recv_timeout( ssl->p_bio,
++                   //                            ssl->in_hdr + ssl->in_left, len,
++                     //                          ssl->conf->read_timeout );
++                                               
++                        unsigned count = 0;
++        				     do
++        				     {
++        				       ret = ssl->f_recv( ssl->p_bio,
++        				       ssl->in_hdr + ssl->in_left, len );
++        
++        				      // bk_printf("mbedtls_ssl_fetch_input 2222 ret =%d\r\n",ret);
++        				       count++;
++        				       if(count>15000)
++        				        break;
++        					   //osDelay(10);
++        				     }while(ret == -0x4C);
                  }
                  else
                  {
@@ -7152,16 +7636,44 @@ index 2471600c9..7faa14348 100755
 +
 +				      // bk_printf("mbedtls_ssl_fetch_input ret =%d\r\n",ret);
 +				       count++;
-+				       if(count>50)
++				       if(count>15000)
 +				        break;
 +					   //osDelay(10);
 +				     }while(ret == -0x4C);
                  }
              }
  
+@@ -3284,7 +3310,7 @@ int mbedtls_ssl_write_handshake_msg( mbedtls_ssl_context *ssl )
+     const unsigned char hs_type = ssl->out_msg[0];
+ 
+     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write handshake message" ) );
+-
++//bk_printf("mbedtls_ssl_write_handshake_msg 1\r\n");
+     /*
+      * Sanity checks
+      */
+@@ -8189,8 +8215,9 @@ int mbedtls_ssl_handshake( mbedtls_ssl_context *ssl )
+     int ret = 0;
+ 
+     if( ssl == NULL || ssl->conf == NULL )
++    {
+         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
+-
++    }
+     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> handshake" ) );
+ 
+     while( ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER )
+@@ -8202,6 +8229,7 @@ int mbedtls_ssl_handshake( mbedtls_ssl_context *ssl )
+     }
+ 
+     MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= handshake" ) );
++    //bk_printf("mbedtls_ssl_handshake 2:%d\r\n",ret);
+ 
+     return( ret );
+ }
 diff --git a/third_party/mbedtls/port/src/tls_hardware.c b/third_party/mbedtls/port/src/tls_hardware.c
 new file mode 100755
-index 000000000..24f7bd316
+index 00000000..24f7bd31
 --- /dev/null
 +++ b/third_party/mbedtls/port/src/tls_hardware.c
 @@ -0,0 +1,62 @@

wifi_iot/patches/unity.patch

@@ -0,0 +1,15 @@
+diff --git a/third_party/unity/.editorconfig b/third_party/unity/.editorconfig
+old mode 100644
+new mode 100755
+diff --git a/third_party/unity/.gitattributes b/third_party/unity/.gitattributes
+old mode 100644
+new mode 100755
+diff --git a/third_party/unity/.gitignore b/third_party/unity/.gitignore
+old mode 100644
+new mode 100755
+diff --git a/third_party/unity/.travis.yml b/third_party/unity/.travis.yml
+old mode 100644
+new mode 100755
+diff --git a/third_party/unity/test/.rubocop.yml b/third_party/unity/test/.rubocop.yml
+old mode 100644
+new mode 100755

wifi_iot/patches/utils.patch

@@ -1,8 +1,8 @@
 diff --git a/utils/native/lite/hals/file/hal_file.h b/utils/native/lite/hals/file/hal_file.h
-index bfcf3a293..bee85378c 100755
+index bfcf3a29..bc5a94f7 100755
 --- a/utils/native/lite/hals/file/hal_file.h
 +++ b/utils/native/lite/hals/file/hal_file.h
-@@ -36,6 +36,13 @@ int HalFileStat(const char* path, unsigned int* fileSize);
+@@ -36,10 +36,17 @@ int HalFileStat(const char* path, unsigned int* fileSize);
  
  int HalFileSeek(int fd, int offset, unsigned int whence);
  
@@ -16,3 +16,9 @@ index bfcf3a293..bee85378c 100755
  #ifdef __cplusplus
  #if __cplusplus
  }
+ #endif
+ #endif /* __cplusplus */
+ 
+-#endif  // HAL_FILE_SYSTEM_API_H
+\ No newline at end of file
++#endif  // HAL_FILE_SYSTEM_API_H