diff --git a/examples/chef/efr32/.gn b/examples/chef/efr32/.gn index 291da0198d8cc8..0ff42d50e06ef0 100644 --- 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 index 291da0198d8cc8..0ff42d50e06ef0 100644 --- 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 index 291da0198d8cc8..0ff42d50e06ef0 100644 --- 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 index 291da0198d8cc8..0ff42d50e06ef0 100644 --- 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 index 291da0198d8cc8..0ff42d50e06ef0 100644 --- 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 index 486a3e7b3b355d..b150b8df71253e 100755 --- a/scripts/checkout_submodules.py +++ b/scripts/checkout_submodules.py @@ -74,7 +74,7 @@ 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}') @@ -82,6 +82,7 @@ def checkout_modules(modules: list, shallow: bool, force: bool) -> None: 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 index 2c4e61509ee369..7bb85d530fae5c 100644 --- 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 index c233760b419d55..0b1cbd5ad614be 160000 --- a/third_party/cyw30739_sdk/repos/30739A0 +++ b/third_party/cyw30739_sdk/repos/30739A0 @@ -1 +1 @@ -Subproject commit c233760b419d556632430380e3645fad1766ca22 +Subproject commit 0b1cbd5ad614be9b315f3bd4e1b8512df2c4502f diff --git a/third_party/openthread/ot-ifx b/third_party/openthread/ot-ifx index 64bc0568bbb713..2ee7240000f9bc 160000 --- a/third_party/openthread/ot-ifx +++ b/third_party/openthread/ot-ifx @@ -1 +1 @@ -Subproject commit 64bc0568bbb7136244f2ae5e58ae074b64392e9b +Subproject commit 2ee7240000f9bc6a876f3f4b31f02ca82dca5f43 diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index a7801b3fa49327..c9d65e0111fb77 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit a7801b3fa493270b6832061ec9997eca3767ba67 +Subproject commit c9d65e0111fb7708d41f86bc999bb22de43b5915 diff --git a/third_party/ti_simplelink_sdk/repo_cc32xx b/third_party/ti_simplelink_sdk/repo_cc32xx index e5fbefba9c3c3a..13532baa294744 160000 --- a/third_party/ti_simplelink_sdk/repo_cc32xx +++ b/third_party/ti_simplelink_sdk/repo_cc32xx @@ -1 +1 @@ -Subproject commit e5fbefba9c3c3afa9c2c967b713c77e282d560fe +Subproject commit 13532baa2947440ced2f2abefd6a57b478f5100d