From fa6972cdcd15ab17247b37e7585508cee861eb19 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 13 Aug 2020 07:34:27 -0400 Subject: [PATCH 1/4] boards: ODROID-GO: fix board identifier Using the esp32 identifier which is wrong. Probably a copy/paste error. Signed-off-by: Anas Nashif --- boards/xtensa/odroid_go/odroid_go.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/xtensa/odroid_go/odroid_go.yaml b/boards/xtensa/odroid_go/odroid_go.yaml index 45127d20eb51c..7b1c13c18f63b 100644 --- a/boards/xtensa/odroid_go/odroid_go.yaml +++ b/boards/xtensa/odroid_go/odroid_go.yaml @@ -1,4 +1,4 @@ -identifier: esp32 +identifier: odroid-go name: ODROID-GO type: mcu arch: xtensa From a49e0925b7e0ef42cdaa02c7a84373b486522fec Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 13 Aug 2020 07:45:58 -0400 Subject: [PATCH 2/4] boards: LPCXpresso55S69: remove duplicate identifier Use unique identifier for this configuration. cpu0 is already used. Signed-off-by: Anas Nashif --- boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml index 10d6b49ec594d..95217750e026d 100644 --- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml +++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: lpcxpresso55s69_cpu0 +identifier: lpcxpresso55s69_cpu1 name: NXP LPCXpresso55S69 type: mcu arch: arm From 02769184ea3e714f8cd94dae5ecdbb9e0de5253a Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 13 Aug 2020 07:46:45 -0400 Subject: [PATCH 3/4] sanitycheck: error on duplicate board identifier Error when we have duplicate identifiers in board definition files. Signed-off-by: Anas Nashif --- scripts/sanity_chk/sanitylib.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/sanity_chk/sanitylib.py b/scripts/sanity_chk/sanitylib.py index 20f2ae5cedbdc..21cbf88b5bfe6 100644 --- a/scripts/sanity_chk/sanitylib.py +++ b/scripts/sanity_chk/sanitylib.py @@ -2600,6 +2600,9 @@ def add_configurations(self): try: platform = Platform() platform.load(file) + if platform.name in [p.name for p in self.platforms]: + logger.error(f"Duplicate platform {platform.name} in {file}") + raise Exception(f"Duplicate platform identifier {platform.name} found") if platform.sanitycheck: self.platforms.append(platform) if platform.default: From e308c75d4430c64664aeb7b1079a26d823ea5fa2 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 15 Sep 2020 09:29:25 -0400 Subject: [PATCH 4/4] boards: lpcxpresso55s69_cpu1: disable sanitycheck This board is broken and is preventing us from fixing issues that allowed it to be merged skipping CI checks. Disabling the board from sanitycheck to avoid more boards with the same issue from happening again. Signed-off-by: Anas Nashif --- boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml index 95217750e026d..18b0dbaeaab86 100644 --- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml +++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu1.yaml @@ -10,6 +10,7 @@ type: mcu arch: arm ram: 64 flash: 256 +sanitycheck: false toolchain: - zephyr - gnuarmemb