[mynewt-core] branch master updated: syscfg: Fix invalid restriction definition

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 9df7226  syscfg: Fix invalid restriction definition
9df7226 is described below

commit 9df72268724110a0996157ca4cf1a1003ee3e450
Author: Jerzy Kasenberg <je...@apache.org>
AuthorDate: Wed Oct 20 22:34:36 2021 +0200

    syscfg: Fix invalid restriction definition
    
    Syntax was incorrect so checks were not performed.
---
 hw/mcu/nordic/nrf5340_net/syscfg.yml    | 2 +-
 hw/mcu/nxp/kinetis/syscfg.yml           | 2 +-
 sys/console/full/tcp_console/syscfg.yml | 2 +-
 test/spiflash_stress_test/syscfg.yml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/mcu/nordic/nrf5340_net/syscfg.yml b/hw/mcu/nordic/nrf5340_net/syscfg.yml
index 8cd8c50..73b9c22 100644
--- a/hw/mcu/nordic/nrf5340_net/syscfg.yml
+++ b/hw/mcu/nordic/nrf5340_net/syscfg.yml
@@ -31,7 +31,7 @@ syscfg.defs:
             packages for network and application core that do have
             some differences depending on which core they are build for.
         value: 1
-        restriction: MCU_APP_CORE==0
+        restrictions: !MCU_APP_CORE
     MCU_FLASH_MIN_WRITE_SIZE:
         description: >
             Specifies the required alignment for internal flash writes.
diff --git a/hw/mcu/nxp/kinetis/syscfg.yml b/hw/mcu/nxp/kinetis/syscfg.yml
index baf9a60..7b186c8 100644
--- a/hw/mcu/nxp/kinetis/syscfg.yml
+++ b/hw/mcu/nxp/kinetis/syscfg.yml
@@ -22,7 +22,7 @@ syscfg.defs:
             Specifies the required alignment for internal flash writes.
             Used internally by the newt tool.
         value:
-        restriction: $notnull
+        restrictions: $notnull
 
     TRNG:
         description: 'Enable True Random Number Generator (RNGA)'
diff --git a/sys/console/full/tcp_console/syscfg.yml b/sys/console/full/tcp_console/syscfg.yml
index 07773c2..1e4e4e6 100644
--- a/sys/console/full/tcp_console/syscfg.yml
+++ b/sys/console/full/tcp_console/syscfg.yml
@@ -20,4 +20,4 @@ syscfg.defs:
     TCP_CONSOLE_PORT:
         description: 'Set console TCP port'
         value: 4444
-        restriction: $notnull
+        restrictions: $notnull
diff --git a/test/spiflash_stress_test/syscfg.yml b/test/spiflash_stress_test/syscfg.yml
index c3ac7e6..07f8582 100644
--- a/test/spiflash_stress_test/syscfg.yml
+++ b/test/spiflash_stress_test/syscfg.yml
@@ -19,7 +19,7 @@
 syscfg.defs:
     SPIFLASH_STRESS_TEST_FLASH_AREA_ID:
         description: 'Flash area ID to use for stress testing'
-        restriction: !null
+        restrictions: $notnull
         value:
     SPIFLASH_STRESS_TEST_STACK_SIZE:
         description: 'Stack size for flash stressing tasks'