From 02b490b7ba79396645e93b7b5bf8d78325cd21ed Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 6 Jul 2022 16:49:12 -0400 Subject: [PATCH 1/3] Blacklist nrf52840dongle-all-clusters - runst out of flash --- scripts/build/build/targets.py | 2 +- third_party/silabs/matter_support | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 46a44715d35b92..ac92a809ecd555 100644 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -418,7 +418,7 @@ def NrfTargets(): ] # Enable nrf52840dongle for all-clusters and lighting app only - yield target.Extend('nrf52840dongle-all-clusters', board=NrfBoard.NRF52840DONGLE, app=NrfApp.ALL_CLUSTERS) + yield target.Extend('nrf52840dongle-all-clusters', board=NrfBoard.NRF52840DONGLE, app=NrfApp.ALL_CLUSTERS).GlobBlacklist('Out of flash when linking') yield target.Extend('nrf52840dongle-all-clusters-minimal', board=NrfBoard.NRF52840DONGLE, app=NrfApp.ALL_CLUSTERS_MINIMAL) yield target.Extend('nrf52840dongle-light', board=NrfBoard.NRF52840DONGLE, app=NrfApp.LIGHT) diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index 30833b582a73f7..accc18a5a8812b 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit 30833b582a73f73737cbf3df2556184c3728555e +Subproject commit accc18a5a8812b6c67a1e9e77760cb3f2de18739 From 0f232eff856441f47fd49712caa6595a37868182 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 6 Jul 2022 16:58:29 -0400 Subject: [PATCH 2/3] Undo repo update --- third_party/silabs/matter_support | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support index accc18a5a8812b..30833b582a73f7 160000 --- a/third_party/silabs/matter_support +++ b/third_party/silabs/matter_support @@ -1 +1 @@ -Subproject commit accc18a5a8812b6c67a1e9e77760cb3f2de18739 +Subproject commit 30833b582a73f73737cbf3df2556184c3728555e From 55dd48cec6142492f322d9d724dc07a2b235c064 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 6 Jul 2022 17:02:12 -0400 Subject: [PATCH 3/3] Fix unit tests --- scripts/build/testdata/all_targets_except_host.txt | 2 +- scripts/build/testdata/glob_star_targets_except_host.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/build/testdata/all_targets_except_host.txt b/scripts/build/testdata/all_targets_except_host.txt index 4611cdeacd917b..082430b019ac39 100644 --- a/scripts/build/testdata/all_targets_except_host.txt +++ b/scripts/build/testdata/all_targets_except_host.txt @@ -214,7 +214,7 @@ nrf-nrf52840dk-lock nrf-nrf52840dk-pump nrf-nrf52840dk-pump-controller nrf-nrf52840dk-shell -nrf-nrf52840dongle-all-clusters +nrf-nrf52840dongle-all-clusters (NOGLOB: Out of flash when linking) nrf-nrf52840dongle-all-clusters-minimal nrf-nrf52840dongle-light nrf-nrf5340dk-all-clusters diff --git a/scripts/build/testdata/glob_star_targets_except_host.txt b/scripts/build/testdata/glob_star_targets_except_host.txt index 94dce9283947eb..e8bcb0bf1568d2 100644 --- a/scripts/build/testdata/glob_star_targets_except_host.txt +++ b/scripts/build/testdata/glob_star_targets_except_host.txt @@ -94,7 +94,6 @@ nrf-nrf52840dk-lock nrf-nrf52840dk-pump nrf-nrf52840dk-pump-controller nrf-nrf52840dk-shell -nrf-nrf52840dongle-all-clusters nrf-nrf52840dongle-all-clusters-minimal nrf-nrf52840dongle-light nrf-nrf5340dk-all-clusters