rebase and fix conflict

project-chip · Aug 16, 2022 · 0d180e9 · 0d180e9
1 parent 3bfc7f2
commit 0d180e9
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 12 deletions.
diff --git a/examples/chef/efr32/.gn b/examples/chef/efr32/.gn
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
 
 # The location of the build configuration file.
 buildconfig = "${build_root}/config/BUILDCONFIG.gn"

diff --git a/examples/light-switch-app/efr32/.gn b/examples/light-switch-app/efr32/.gn
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
 
 # The location of the build configuration file.
 buildconfig = "${build_root}/config/BUILDCONFIG.gn"

diff --git a/examples/lighting-app/efr32/.gn b/examples/lighting-app/efr32/.gn
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
 
 # The location of the build configuration file.
 buildconfig = "${build_root}/config/BUILDCONFIG.gn"

diff --git a/examples/lock-app/efr32/.gn b/examples/lock-app/efr32/.gn
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
 
 # The location of the build configuration file.
 buildconfig = "${build_root}/config/BUILDCONFIG.gn"

diff --git a/examples/window-app/efr32/.gn b/examples/window-app/efr32/.gn
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
 
 # The location of the build configuration file.
 buildconfig = "${build_root}/config/BUILDCONFIG.gn"

diff --git a/scripts/checkout_submodules.py b/scripts/checkout_submodules.py
@@ -74,14 +74,15 @@ def make_chip_root_safe_directory() -> None:
     subprocess.check_call(['git', 'config', '--global', '--add', 'safe.directory', CHIP_ROOT])
 
 
-def checkout_modules(modules: list, shallow: bool, force: bool) -> None:
+def checkout_modules(modules: list, shallow: bool, force: bool, recursive: bool) -> None:
     names = [module.name.replace('submodule "', '').replace('"', '') for module in modules]
     names = ', '.join(names)
     logging.info(f'Checking out: {names}')
 
     cmd = ['git', '-C', CHIP_ROOT, 'submodule', 'update', '--init']
     cmd += ['--depth', '1'] if shallow else []
     cmd += ['--force'] if force else []
+    cmd += ['--recursive'] if recursive else []
     cmd += [module.path for module in modules]
 
     subprocess.check_call(cmd)
@@ -109,6 +110,7 @@ def main():
     parser.add_argument('--force', action='store_true', help='Perform action despite of warnings')
     parser.add_argument('--deinit-unmatched', action='store_true',
                         help='Deinitialize submodules for non-matching platforms')
+    parser.add_argument('--recursive', action='store_true', help='Recursive init of the listed submodules')
     args = parser.parse_args()
 
     modules = list(load_module_info())
@@ -117,7 +119,7 @@ def main():
     unmatched_modules = [m for m in modules if not module_matches_platforms(m, selected_platforms)]
 
     make_chip_root_safe_directory()
-    checkout_modules(selected_modules, args.shallow, args.force)
+    checkout_modules(selected_modules, args.shallow, args.force, args.recursive)
 
     if args.deinit_unmatched:
         deinit_modules(unmatched_modules, args.force)

diff --git a/src/test_driver/efr32/.gn b/src/test_driver/efr32/.gn
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
 
 # The location of the build configuration file.
 buildconfig = "${build_root}/config/BUILDCONFIG.gn"

diff --git a/third_party/cyw30739_sdk/repos/30739A0 b/third_party/cyw30739_sdk/repos/30739A0
diff --git a/third_party/openthread/ot-ifx b/third_party/openthread/ot-ifx
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
diff --git a/third_party/ti_simplelink_sdk/repo_cc32xx b/third_party/ti_simplelink_sdk/repo_cc32xx
+1 −1		COMPONENT_30739A0/internal/30739A0/configdef30739A0.hdf
+2 −2		COMPONENT_30739A0/internal/30739A0/patches_CYW930739M2EVB_01/firmware_resource_usage.inc
+813 −813		COMPONENT_30739A0/internal/30739A0/patches_CYW930739M2EVB_01/patch.cgs
+ −		COMPONENT_30739A0/internal/30739A0/patches_CYW930739M2EVB_01/patch.elf
+3 −3		COMPONENT_30739A0/internal/30739A0/patches_CYW930739M2EVB_01/patch.lst
+60 −60		COMPONENT_30739A0/internal/30739A0/patches_CYW930739M2EVB_01/patch.sym
+1 −1		COMPONENT_30739A0/internal/30739A0/patches_CYW930739M2EVB_01/version.txt
+5 −0		script/build
+1 −1		third_party/infineon/platform/cyw30739/30739a0
+30 −1		third_party/infineon/platform/cyw30739/scripts/ChipLoad.pl
+30 −1		third_party/infineon/platform/cyw30739/scripts/READELF.pm
+30 −1		third_party/infineon/platform/cyw30739/scripts/bt_gen_lib_installer.bash
+30 −1		third_party/infineon/platform/cyw30739/scripts/bt_post_build.bash
+30 −1		third_party/infineon/platform/cyw30739/scripts/bt_pre_build.bash
+30 −1		third_party/infineon/platform/cyw30739/scripts/bt_program.bash
+30 −1		third_party/infineon/platform/cyw30739/scripts/wiced-bdaddr.pl
+30 −1		third_party/infineon/platform/cyw30739/scripts/wiced-gen-cgs.pl
+30 −1		third_party/infineon/platform/cyw30739/scripts/wiced-gen-ld.pl
+30 −1		third_party/infineon/platform/cyw30739/scripts/wiced-gen-lib-installer.pl
+30 −1		third_party/infineon/platform/cyw30739/scripts/wiced-gen-ss-cgs.pl
+ −		docs/Matter over WiFi usage notes.pdf
+341 −222		examples/rtos/common/ifmod/lwip_if.c
+103 −0		examples/rtos/common/ifmod/lwip_if.h
+1 −1		examples/rtos/common/ifmod/wifi_if.c
+0 −3		examples/rtos/common/ifmod/wifi_if.h