diff options
author | Andrew McRae <amcrae@google.com> | 2022-07-19 15:42:17 +1000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-20 02:38:03 +0000 |
commit | 0dea801e9a72f4eb7b34dded8aeca80bda584fd0 (patch) | |
tree | 25f81d8b37b780d3b3b64d4ee0626e2c96905a66 | |
parent | fba0a2092ae80395754ebb2a310024ce2e2eaaf5 (diff) | |
download | chrome-ec-0dea801e9a72f4eb7b34dded8aeca80bda584fd0.tar.gz |
nissa: Rearrange projects into sub-directories
Rearrange the projects into separate sub-directories
to improve clarity and separation.
BUG=none
TEST=zmake testall
BRANCH=none
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I14c3324760d195807f831bd72bdbc129fe76912b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3771363
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
-rw-r--r-- | zephyr/projects/nissa/BUILD.py | 88 | ||||
-rw-r--r-- | zephyr/projects/nissa/CMakeLists.txt | 44 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/generated.dts (renamed from zephyr/projects/nissa/craask_generated.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/keyboard.dts (renamed from zephyr/projects/nissa/craask_keyboard.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/motionsense.dts (renamed from zephyr/projects/nissa/craask_motionsense.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/overlay.dts (renamed from zephyr/projects/nissa/craask_overlay.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/power_signals.dts (renamed from zephyr/projects/nissa/craask_power_signals.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/prj.conf (renamed from zephyr/projects/nissa/prj_craask.conf) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/pwm_leds.dts (renamed from zephyr/projects/nissa/craask_pwm_leds.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/src/charger.c (renamed from zephyr/projects/nissa/src/craask/charger.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/src/keyboard.c (renamed from zephyr/projects/nissa/src/craask/keyboard.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/src/led.c (renamed from zephyr/projects/nissa/src/craask/led.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/craask/src/usbc.c (renamed from zephyr/projects/nissa/src/craask/usbc.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/generated.dts (renamed from zephyr/projects/nissa/joxer_generated.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/keyboard.dts (renamed from zephyr/projects/nissa/joxer_keyboard.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/motionsense.dts (renamed from zephyr/projects/nissa/joxer_motionsense.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/overlay.dts (renamed from zephyr/projects/nissa/joxer_overlay.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/power_signals.dts (renamed from zephyr/projects/nissa/joxer_power_signals.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/prj.conf (renamed from zephyr/projects/nissa/prj_joxer.conf) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/pwm_leds.dts (renamed from zephyr/projects/nissa/joxer_pwm_leds.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/src/charger.c (renamed from zephyr/projects/nissa/src/joxer/charger.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/src/fan.c (renamed from zephyr/projects/nissa/src/joxer/fan.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/src/keyboard.c (renamed from zephyr/projects/nissa/src/joxer/keyboard.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/joxer/src/usbc.c (renamed from zephyr/projects/nissa/src/joxer/usbc.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/generated.dts (renamed from zephyr/projects/nissa/nereid_generated.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/keyboard.dts (renamed from zephyr/projects/nissa/nereid_keyboard.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/motionsense.dts (renamed from zephyr/projects/nissa/nereid_motionsense.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/overlay.dts (renamed from zephyr/projects/nissa/nereid_overlay.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/power_signals.dts (renamed from zephyr/projects/nissa/nereid_power_signals.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/prj.conf (renamed from zephyr/projects/nissa/prj_nereid.conf) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/pwm_leds.dts (renamed from zephyr/projects/nissa/nereid_pwm_leds.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/src/charger.c (renamed from zephyr/projects/nissa/src/nereid/charger.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/src/keyboard.c (renamed from zephyr/projects/nissa/src/nereid/keyboard.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nereid/src/usbc.c (renamed from zephyr/projects/nissa/src/nereid/usbc.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/cbi.dts (renamed from zephyr/projects/nissa/nivviks_cbi.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/generated.dts (renamed from zephyr/projects/nissa/nivviks_generated.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/keyboard.dts (renamed from zephyr/projects/nissa/nivviks_keyboard.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/motionsense.dts (renamed from zephyr/projects/nissa/nivviks_motionsense.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/overlay.dts (renamed from zephyr/projects/nissa/nivviks_overlay.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/power_signals.dts (renamed from zephyr/projects/nissa/nivviks_power_signals.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/prj.conf (renamed from zephyr/projects/nissa/prj_nivviks.conf) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/pwm_leds.dts (renamed from zephyr/projects/nissa/nivviks_pwm_leds.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/src/charger.c (renamed from zephyr/projects/nissa/src/nivviks/charger.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/src/fan.c (renamed from zephyr/projects/nissa/src/nivviks/fan.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/src/form_factor.c (renamed from zephyr/projects/nissa/src/nivviks/form_factor.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/src/keyboard.c (renamed from zephyr/projects/nissa/src/nivviks/keyboard.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks/src/usbc.c (renamed from zephyr/projects/nissa/src/nivviks/usbc.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/generated.dts (renamed from zephyr/projects/nissa/pujjo_generated.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/keyboard.dts (renamed from zephyr/projects/nissa/pujjo_keyboard.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/motionsense.dts (renamed from zephyr/projects/nissa/pujjo_motionsense.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/overlay.dts (renamed from zephyr/projects/nissa/pujjo_overlay.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/power_signals.dts (renamed from zephyr/projects/nissa/pujjo_power_signals.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/prj.conf (renamed from zephyr/projects/nissa/prj_pujjo.conf) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/pwm_leds.dts (renamed from zephyr/projects/nissa/pujjo_pwm_leds.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/src/charger.c (renamed from zephyr/projects/nissa/src/pujjo/charger.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/src/fan.c (renamed from zephyr/projects/nissa/src/pujjo/fan.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/src/keyboard.c (renamed from zephyr/projects/nissa/src/pujjo/keyboard.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/pujjo/src/usbc.c (renamed from zephyr/projects/nissa/src/pujjo/usbc.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/generated.dts (renamed from zephyr/projects/nissa/xivu_generated.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/keyboard.dts (renamed from zephyr/projects/nissa/xivu_keyboard.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/led_pins.dts (renamed from zephyr/projects/nissa/xivu_led_pins.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/led_policy.dts (renamed from zephyr/projects/nissa/xivu_led_policy.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/motionsense.dts (renamed from zephyr/projects/nissa/xivu_motionsense.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/overlay.dts (renamed from zephyr/projects/nissa/xivu_overlay.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/power_signals.dts (renamed from zephyr/projects/nissa/xivu_power_signals.dts) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/prj.conf (renamed from zephyr/projects/nissa/prj_xivu.conf) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/src/charger.c (renamed from zephyr/projects/nissa/src/xivu/charger.c) | 0 | ||||
-rw-r--r-- | zephyr/projects/nissa/xivu/src/usbc.c (renamed from zephyr/projects/nissa/src/xivu/usbc.c) | 0 |
68 files changed, 63 insertions, 69 deletions
diff --git a/zephyr/projects/nissa/BUILD.py b/zephyr/projects/nissa/BUILD.py index 31ae0c2ee0..34e1ce9a74 100644 --- a/zephyr/projects/nissa/BUILD.py +++ b/zephyr/projects/nissa/BUILD.py @@ -11,7 +11,6 @@ def register_nissa_project( project_name, chip="it81302bx", extra_dts_overlays=(), - extra_kconfig_files=(), ): """Register a variant of nissa.""" register_func = register_binman_project @@ -21,8 +20,9 @@ def register_nissa_project( return register_func( project_name=project_name, zephyr_board=chip, - dts_overlays=["cbi.dts", *extra_dts_overlays], - kconfig_files=[here / "prj.conf", *extra_kconfig_files], + dts_overlays=["cbi.dts"] + + [here / project_name / filename for filename in extra_dts_overlays], + kconfig_files=[here / "prj.conf", here / project_name / "prj.conf"], ) @@ -30,84 +30,78 @@ nivviks = register_nissa_project( project_name="nivviks", chip="npcx9m3f", extra_dts_overlays=[ - here / "nivviks_generated.dts", - here / "nivviks_cbi.dts", - here / "nivviks_overlay.dts", - here / "nivviks_motionsense.dts", - here / "nivviks_keyboard.dts", - here / "nivviks_power_signals.dts", - here / "nivviks_pwm_leds.dts", + "generated.dts", + "cbi.dts", + "overlay.dts", + "motionsense.dts", + "keyboard.dts", + "power_signals.dts", + "pwm_leds.dts", ], - extra_kconfig_files=[here / "prj_nivviks.conf"], ) nereid = register_nissa_project( project_name="nereid", chip="it81302bx", extra_dts_overlays=[ - here / "nereid_generated.dts", - here / "nereid_overlay.dts", - here / "nereid_motionsense.dts", - here / "nereid_keyboard.dts", - here / "nereid_power_signals.dts", - here / "nereid_pwm_leds.dts", + "generated.dts", + "overlay.dts", + "motionsense.dts", + "keyboard.dts", + "power_signals.dts", + "pwm_leds.dts", ], - extra_kconfig_files=[here / "prj_nereid.conf"], ) craask = register_nissa_project( project_name="craask", chip="npcx9m3f", extra_dts_overlays=[ - here / "craask_generated.dts", - here / "craask_overlay.dts", - here / "craask_motionsense.dts", - here / "craask_keyboard.dts", - here / "craask_power_signals.dts", - here / "craask_pwm_leds.dts", + "generated.dts", + "overlay.dts", + "motionsense.dts", + "keyboard.dts", + "power_signals.dts", + "pwm_leds.dts", ], - extra_kconfig_files=[here / "prj_craask.conf"], ) pujjo = register_nissa_project( project_name="pujjo", chip="npcx9m3f", extra_dts_overlays=[ - here / "pujjo_generated.dts", - here / "pujjo_overlay.dts", - here / "pujjo_motionsense.dts", - here / "pujjo_keyboard.dts", - here / "pujjo_power_signals.dts", - here / "pujjo_pwm_leds.dts", + "generated.dts", + "overlay.dts", + "motionsense.dts", + "keyboard.dts", + "power_signals.dts", + "pwm_leds.dts", ], - extra_kconfig_files=[here / "prj_pujjo.conf"], ) xivu = register_nissa_project( project_name="xivu", chip="npcx9m3f", extra_dts_overlays=[ - here / "xivu_generated.dts", - here / "xivu_overlay.dts", - here / "xivu_motionsense.dts", - here / "xivu_keyboard.dts", - here / "xivu_power_signals.dts", - here / "xivu_led_pins.dts", - here / "xivu_led_policy.dts", + "generated.dts", + "overlay.dts", + "motionsense.dts", + "keyboard.dts", + "power_signals.dts", + "led_pins.dts", + "led_policy.dts", ], - extra_kconfig_files=[here / "prj_xivu.conf"], ) joxer = register_nissa_project( project_name="joxer", chip="it81302bx", extra_dts_overlays=[ - here / "joxer_generated.dts", - here / "joxer_overlay.dts", - here / "joxer_motionsense.dts", - here / "joxer_keyboard.dts", - here / "joxer_power_signals.dts", - here / "joxer_pwm_leds.dts", + "generated.dts", + "overlay.dts", + "motionsense.dts", + "keyboard.dts", + "power_signals.dts", + "pwm_leds.dts", ], - extra_kconfig_files=[here / "prj_joxer.conf"], ) diff --git a/zephyr/projects/nissa/CMakeLists.txt b/zephyr/projects/nissa/CMakeLists.txt index f63db78631..ee7ec0525e 100644 --- a/zephyr/projects/nissa/CMakeLists.txt +++ b/zephyr/projects/nissa/CMakeLists.txt @@ -15,53 +15,53 @@ if(DEFINED CONFIG_BOARD_NIVVIKS) project(nivviks) zephyr_library_sources( "src/led.c" - "src/nivviks/form_factor.c" - "src/nivviks/keyboard.c" + "nivviks/src/form_factor.c" + "nivviks/src/keyboard.c" ) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/nivviks/fan.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/nivviks/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/nivviks/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "nivviks/src/fan.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "nivviks/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "nivviks/src/charger.c") endif() if(DEFINED CONFIG_BOARD_NEREID) project(nereid) zephyr_library_sources( "src/led.c" - "src/nereid/keyboard.c" + "nereid/src/keyboard.c" ) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/nereid/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/nereid/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "nereid/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "nereid/src/charger.c") endif() if(DEFINED CONFIG_BOARD_CRAASK) zephyr_library_sources( - "src/craask/keyboard.c" - "src/craask/led.c" + "craask/src/keyboard.c" + "craask/src/led.c" ) project(craask) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/craask/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/craask/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "craask/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "craask/src/charger.c") endif() if(DEFINED CONFIG_BOARD_PUJJO) project(pujjo) zephyr_library_sources( "src/led.c" - "src/pujjo/keyboard.c" + "pujjo/src/keyboard.c" ) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/pujjo/fan.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/pujjo/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/pujjo/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "pujjo/src/fan.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "pujjo/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "pujjo/src/charger.c") endif() if(DEFINED CONFIG_BOARD_XIVU) project(xivu) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/xivu/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/xivu/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "xivu/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "xivu/src/charger.c") endif() if(DEFINED CONFIG_BOARD_JOXER) project(joxer) zephyr_library_sources( "src/led.c" - "src/joxer/keyboard.c" + "joxer/src/keyboard.c" ) - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "src/joxer/usbc.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "src/joxer/charger.c") - zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/joxer/fan.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC "joxer/src/usbc.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_CHARGER "joxer/src/charger.c") + zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "joxer/src/fan.c") endif() diff --git a/zephyr/projects/nissa/craask_generated.dts b/zephyr/projects/nissa/craask/generated.dts index bf463035d6..bf463035d6 100644 --- a/zephyr/projects/nissa/craask_generated.dts +++ b/zephyr/projects/nissa/craask/generated.dts diff --git a/zephyr/projects/nissa/craask_keyboard.dts b/zephyr/projects/nissa/craask/keyboard.dts index d3fd354b8f..d3fd354b8f 100644 --- a/zephyr/projects/nissa/craask_keyboard.dts +++ b/zephyr/projects/nissa/craask/keyboard.dts diff --git a/zephyr/projects/nissa/craask_motionsense.dts b/zephyr/projects/nissa/craask/motionsense.dts index 276fc14ff2..276fc14ff2 100644 --- a/zephyr/projects/nissa/craask_motionsense.dts +++ b/zephyr/projects/nissa/craask/motionsense.dts diff --git a/zephyr/projects/nissa/craask_overlay.dts b/zephyr/projects/nissa/craask/overlay.dts index 6a83ee70ad..6a83ee70ad 100644 --- a/zephyr/projects/nissa/craask_overlay.dts +++ b/zephyr/projects/nissa/craask/overlay.dts diff --git a/zephyr/projects/nissa/craask_power_signals.dts b/zephyr/projects/nissa/craask/power_signals.dts index 91876f0402..91876f0402 100644 --- a/zephyr/projects/nissa/craask_power_signals.dts +++ b/zephyr/projects/nissa/craask/power_signals.dts diff --git a/zephyr/projects/nissa/prj_craask.conf b/zephyr/projects/nissa/craask/prj.conf index bc0ac84307..bc0ac84307 100644 --- a/zephyr/projects/nissa/prj_craask.conf +++ b/zephyr/projects/nissa/craask/prj.conf diff --git a/zephyr/projects/nissa/craask_pwm_leds.dts b/zephyr/projects/nissa/craask/pwm_leds.dts index bf0b24f312..bf0b24f312 100644 --- a/zephyr/projects/nissa/craask_pwm_leds.dts +++ b/zephyr/projects/nissa/craask/pwm_leds.dts diff --git a/zephyr/projects/nissa/src/craask/charger.c b/zephyr/projects/nissa/craask/src/charger.c index 3fbbabec6b..3fbbabec6b 100644 --- a/zephyr/projects/nissa/src/craask/charger.c +++ b/zephyr/projects/nissa/craask/src/charger.c diff --git a/zephyr/projects/nissa/src/craask/keyboard.c b/zephyr/projects/nissa/craask/src/keyboard.c index 449e7b16b2..449e7b16b2 100644 --- a/zephyr/projects/nissa/src/craask/keyboard.c +++ b/zephyr/projects/nissa/craask/src/keyboard.c diff --git a/zephyr/projects/nissa/src/craask/led.c b/zephyr/projects/nissa/craask/src/led.c index fbe5c88218..fbe5c88218 100644 --- a/zephyr/projects/nissa/src/craask/led.c +++ b/zephyr/projects/nissa/craask/src/led.c diff --git a/zephyr/projects/nissa/src/craask/usbc.c b/zephyr/projects/nissa/craask/src/usbc.c index dcf613bd4b..dcf613bd4b 100644 --- a/zephyr/projects/nissa/src/craask/usbc.c +++ b/zephyr/projects/nissa/craask/src/usbc.c diff --git a/zephyr/projects/nissa/joxer_generated.dts b/zephyr/projects/nissa/joxer/generated.dts index 1042486420..1042486420 100644 --- a/zephyr/projects/nissa/joxer_generated.dts +++ b/zephyr/projects/nissa/joxer/generated.dts diff --git a/zephyr/projects/nissa/joxer_keyboard.dts b/zephyr/projects/nissa/joxer/keyboard.dts index b9e9c21707..b9e9c21707 100644 --- a/zephyr/projects/nissa/joxer_keyboard.dts +++ b/zephyr/projects/nissa/joxer/keyboard.dts diff --git a/zephyr/projects/nissa/joxer_motionsense.dts b/zephyr/projects/nissa/joxer/motionsense.dts index 3f589d132f..3f589d132f 100644 --- a/zephyr/projects/nissa/joxer_motionsense.dts +++ b/zephyr/projects/nissa/joxer/motionsense.dts diff --git a/zephyr/projects/nissa/joxer_overlay.dts b/zephyr/projects/nissa/joxer/overlay.dts index 39b871129d..39b871129d 100644 --- a/zephyr/projects/nissa/joxer_overlay.dts +++ b/zephyr/projects/nissa/joxer/overlay.dts diff --git a/zephyr/projects/nissa/joxer_power_signals.dts b/zephyr/projects/nissa/joxer/power_signals.dts index 0f10bba52f..0f10bba52f 100644 --- a/zephyr/projects/nissa/joxer_power_signals.dts +++ b/zephyr/projects/nissa/joxer/power_signals.dts diff --git a/zephyr/projects/nissa/prj_joxer.conf b/zephyr/projects/nissa/joxer/prj.conf index 03cccf3113..03cccf3113 100644 --- a/zephyr/projects/nissa/prj_joxer.conf +++ b/zephyr/projects/nissa/joxer/prj.conf diff --git a/zephyr/projects/nissa/joxer_pwm_leds.dts b/zephyr/projects/nissa/joxer/pwm_leds.dts index 9a981b7071..9a981b7071 100644 --- a/zephyr/projects/nissa/joxer_pwm_leds.dts +++ b/zephyr/projects/nissa/joxer/pwm_leds.dts diff --git a/zephyr/projects/nissa/src/joxer/charger.c b/zephyr/projects/nissa/joxer/src/charger.c index ff350b44da..ff350b44da 100644 --- a/zephyr/projects/nissa/src/joxer/charger.c +++ b/zephyr/projects/nissa/joxer/src/charger.c diff --git a/zephyr/projects/nissa/src/joxer/fan.c b/zephyr/projects/nissa/joxer/src/fan.c index 8abeb95b39..8abeb95b39 100644 --- a/zephyr/projects/nissa/src/joxer/fan.c +++ b/zephyr/projects/nissa/joxer/src/fan.c diff --git a/zephyr/projects/nissa/src/joxer/keyboard.c b/zephyr/projects/nissa/joxer/src/keyboard.c index 2694445ca0..2694445ca0 100644 --- a/zephyr/projects/nissa/src/joxer/keyboard.c +++ b/zephyr/projects/nissa/joxer/src/keyboard.c diff --git a/zephyr/projects/nissa/src/joxer/usbc.c b/zephyr/projects/nissa/joxer/src/usbc.c index 9e12f05188..9e12f05188 100644 --- a/zephyr/projects/nissa/src/joxer/usbc.c +++ b/zephyr/projects/nissa/joxer/src/usbc.c diff --git a/zephyr/projects/nissa/nereid_generated.dts b/zephyr/projects/nissa/nereid/generated.dts index c969923ba0..c969923ba0 100644 --- a/zephyr/projects/nissa/nereid_generated.dts +++ b/zephyr/projects/nissa/nereid/generated.dts diff --git a/zephyr/projects/nissa/nereid_keyboard.dts b/zephyr/projects/nissa/nereid/keyboard.dts index b9e9c21707..b9e9c21707 100644 --- a/zephyr/projects/nissa/nereid_keyboard.dts +++ b/zephyr/projects/nissa/nereid/keyboard.dts diff --git a/zephyr/projects/nissa/nereid_motionsense.dts b/zephyr/projects/nissa/nereid/motionsense.dts index 3f589d132f..3f589d132f 100644 --- a/zephyr/projects/nissa/nereid_motionsense.dts +++ b/zephyr/projects/nissa/nereid/motionsense.dts diff --git a/zephyr/projects/nissa/nereid_overlay.dts b/zephyr/projects/nissa/nereid/overlay.dts index 9d72da1b37..9d72da1b37 100644 --- a/zephyr/projects/nissa/nereid_overlay.dts +++ b/zephyr/projects/nissa/nereid/overlay.dts diff --git a/zephyr/projects/nissa/nereid_power_signals.dts b/zephyr/projects/nissa/nereid/power_signals.dts index 0f10bba52f..0f10bba52f 100644 --- a/zephyr/projects/nissa/nereid_power_signals.dts +++ b/zephyr/projects/nissa/nereid/power_signals.dts diff --git a/zephyr/projects/nissa/prj_nereid.conf b/zephyr/projects/nissa/nereid/prj.conf index c5913a5cdf..c5913a5cdf 100644 --- a/zephyr/projects/nissa/prj_nereid.conf +++ b/zephyr/projects/nissa/nereid/prj.conf diff --git a/zephyr/projects/nissa/nereid_pwm_leds.dts b/zephyr/projects/nissa/nereid/pwm_leds.dts index 9a981b7071..9a981b7071 100644 --- a/zephyr/projects/nissa/nereid_pwm_leds.dts +++ b/zephyr/projects/nissa/nereid/pwm_leds.dts diff --git a/zephyr/projects/nissa/src/nereid/charger.c b/zephyr/projects/nissa/nereid/src/charger.c index a494988951..a494988951 100644 --- a/zephyr/projects/nissa/src/nereid/charger.c +++ b/zephyr/projects/nissa/nereid/src/charger.c diff --git a/zephyr/projects/nissa/src/nereid/keyboard.c b/zephyr/projects/nissa/nereid/src/keyboard.c index 0671b6570d..0671b6570d 100644 --- a/zephyr/projects/nissa/src/nereid/keyboard.c +++ b/zephyr/projects/nissa/nereid/src/keyboard.c diff --git a/zephyr/projects/nissa/src/nereid/usbc.c b/zephyr/projects/nissa/nereid/src/usbc.c index b352d578f2..b352d578f2 100644 --- a/zephyr/projects/nissa/src/nereid/usbc.c +++ b/zephyr/projects/nissa/nereid/src/usbc.c diff --git a/zephyr/projects/nissa/nivviks_cbi.dts b/zephyr/projects/nissa/nivviks/cbi.dts index d8cc34ce77..d8cc34ce77 100644 --- a/zephyr/projects/nissa/nivviks_cbi.dts +++ b/zephyr/projects/nissa/nivviks/cbi.dts diff --git a/zephyr/projects/nissa/nivviks_generated.dts b/zephyr/projects/nissa/nivviks/generated.dts index 11a0ef2315..11a0ef2315 100644 --- a/zephyr/projects/nissa/nivviks_generated.dts +++ b/zephyr/projects/nissa/nivviks/generated.dts diff --git a/zephyr/projects/nissa/nivviks_keyboard.dts b/zephyr/projects/nissa/nivviks/keyboard.dts index fd18e1de99..fd18e1de99 100644 --- a/zephyr/projects/nissa/nivviks_keyboard.dts +++ b/zephyr/projects/nissa/nivviks/keyboard.dts diff --git a/zephyr/projects/nissa/nivviks_motionsense.dts b/zephyr/projects/nissa/nivviks/motionsense.dts index fc2a3e2fe4..fc2a3e2fe4 100644 --- a/zephyr/projects/nissa/nivviks_motionsense.dts +++ b/zephyr/projects/nissa/nivviks/motionsense.dts diff --git a/zephyr/projects/nissa/nivviks_overlay.dts b/zephyr/projects/nissa/nivviks/overlay.dts index 3929d62c3d..3929d62c3d 100644 --- a/zephyr/projects/nissa/nivviks_overlay.dts +++ b/zephyr/projects/nissa/nivviks/overlay.dts diff --git a/zephyr/projects/nissa/nivviks_power_signals.dts b/zephyr/projects/nissa/nivviks/power_signals.dts index 91876f0402..91876f0402 100644 --- a/zephyr/projects/nissa/nivviks_power_signals.dts +++ b/zephyr/projects/nissa/nivviks/power_signals.dts diff --git a/zephyr/projects/nissa/prj_nivviks.conf b/zephyr/projects/nissa/nivviks/prj.conf index 1c474823d9..1c474823d9 100644 --- a/zephyr/projects/nissa/prj_nivviks.conf +++ b/zephyr/projects/nissa/nivviks/prj.conf diff --git a/zephyr/projects/nissa/nivviks_pwm_leds.dts b/zephyr/projects/nissa/nivviks/pwm_leds.dts index b6f657fb03..b6f657fb03 100644 --- a/zephyr/projects/nissa/nivviks_pwm_leds.dts +++ b/zephyr/projects/nissa/nivviks/pwm_leds.dts diff --git a/zephyr/projects/nissa/src/nivviks/charger.c b/zephyr/projects/nissa/nivviks/src/charger.c index 5a8bbe0e7a..5a8bbe0e7a 100644 --- a/zephyr/projects/nissa/src/nivviks/charger.c +++ b/zephyr/projects/nissa/nivviks/src/charger.c diff --git a/zephyr/projects/nissa/src/nivviks/fan.c b/zephyr/projects/nissa/nivviks/src/fan.c index 95f3a32935..95f3a32935 100644 --- a/zephyr/projects/nissa/src/nivviks/fan.c +++ b/zephyr/projects/nissa/nivviks/src/fan.c diff --git a/zephyr/projects/nissa/src/nivviks/form_factor.c b/zephyr/projects/nissa/nivviks/src/form_factor.c index 018ed2b959..018ed2b959 100644 --- a/zephyr/projects/nissa/src/nivviks/form_factor.c +++ b/zephyr/projects/nissa/nivviks/src/form_factor.c diff --git a/zephyr/projects/nissa/src/nivviks/keyboard.c b/zephyr/projects/nissa/nivviks/src/keyboard.c index 406ea246b4..406ea246b4 100644 --- a/zephyr/projects/nissa/src/nivviks/keyboard.c +++ b/zephyr/projects/nissa/nivviks/src/keyboard.c diff --git a/zephyr/projects/nissa/src/nivviks/usbc.c b/zephyr/projects/nissa/nivviks/src/usbc.c index 651a18c21c..651a18c21c 100644 --- a/zephyr/projects/nissa/src/nivviks/usbc.c +++ b/zephyr/projects/nissa/nivviks/src/usbc.c diff --git a/zephyr/projects/nissa/pujjo_generated.dts b/zephyr/projects/nissa/pujjo/generated.dts index 11a0ef2315..11a0ef2315 100644 --- a/zephyr/projects/nissa/pujjo_generated.dts +++ b/zephyr/projects/nissa/pujjo/generated.dts diff --git a/zephyr/projects/nissa/pujjo_keyboard.dts b/zephyr/projects/nissa/pujjo/keyboard.dts index fd18e1de99..fd18e1de99 100644 --- a/zephyr/projects/nissa/pujjo_keyboard.dts +++ b/zephyr/projects/nissa/pujjo/keyboard.dts diff --git a/zephyr/projects/nissa/pujjo_motionsense.dts b/zephyr/projects/nissa/pujjo/motionsense.dts index 3f589d132f..3f589d132f 100644 --- a/zephyr/projects/nissa/pujjo_motionsense.dts +++ b/zephyr/projects/nissa/pujjo/motionsense.dts diff --git a/zephyr/projects/nissa/pujjo_overlay.dts b/zephyr/projects/nissa/pujjo/overlay.dts index fd75c0d083..fd75c0d083 100644 --- a/zephyr/projects/nissa/pujjo_overlay.dts +++ b/zephyr/projects/nissa/pujjo/overlay.dts diff --git a/zephyr/projects/nissa/pujjo_power_signals.dts b/zephyr/projects/nissa/pujjo/power_signals.dts index 91876f0402..91876f0402 100644 --- a/zephyr/projects/nissa/pujjo_power_signals.dts +++ b/zephyr/projects/nissa/pujjo/power_signals.dts diff --git a/zephyr/projects/nissa/prj_pujjo.conf b/zephyr/projects/nissa/pujjo/prj.conf index 5ad45f7773..5ad45f7773 100644 --- a/zephyr/projects/nissa/prj_pujjo.conf +++ b/zephyr/projects/nissa/pujjo/prj.conf diff --git a/zephyr/projects/nissa/pujjo_pwm_leds.dts b/zephyr/projects/nissa/pujjo/pwm_leds.dts index b6f657fb03..b6f657fb03 100644 --- a/zephyr/projects/nissa/pujjo_pwm_leds.dts +++ b/zephyr/projects/nissa/pujjo/pwm_leds.dts diff --git a/zephyr/projects/nissa/src/pujjo/charger.c b/zephyr/projects/nissa/pujjo/src/charger.c index c6209bdf75..c6209bdf75 100644 --- a/zephyr/projects/nissa/src/pujjo/charger.c +++ b/zephyr/projects/nissa/pujjo/src/charger.c diff --git a/zephyr/projects/nissa/src/pujjo/fan.c b/zephyr/projects/nissa/pujjo/src/fan.c index 1884380de8..1884380de8 100644 --- a/zephyr/projects/nissa/src/pujjo/fan.c +++ b/zephyr/projects/nissa/pujjo/src/fan.c diff --git a/zephyr/projects/nissa/src/pujjo/keyboard.c b/zephyr/projects/nissa/pujjo/src/keyboard.c index 8a619a95f6..8a619a95f6 100644 --- a/zephyr/projects/nissa/src/pujjo/keyboard.c +++ b/zephyr/projects/nissa/pujjo/src/keyboard.c diff --git a/zephyr/projects/nissa/src/pujjo/usbc.c b/zephyr/projects/nissa/pujjo/src/usbc.c index 16a763efb0..16a763efb0 100644 --- a/zephyr/projects/nissa/src/pujjo/usbc.c +++ b/zephyr/projects/nissa/pujjo/src/usbc.c diff --git a/zephyr/projects/nissa/xivu_generated.dts b/zephyr/projects/nissa/xivu/generated.dts index 28b76a7680..28b76a7680 100644 --- a/zephyr/projects/nissa/xivu_generated.dts +++ b/zephyr/projects/nissa/xivu/generated.dts diff --git a/zephyr/projects/nissa/xivu_keyboard.dts b/zephyr/projects/nissa/xivu/keyboard.dts index e97165cc92..e97165cc92 100644 --- a/zephyr/projects/nissa/xivu_keyboard.dts +++ b/zephyr/projects/nissa/xivu/keyboard.dts diff --git a/zephyr/projects/nissa/xivu_led_pins.dts b/zephyr/projects/nissa/xivu/led_pins.dts index 67c11f0019..67c11f0019 100644 --- a/zephyr/projects/nissa/xivu_led_pins.dts +++ b/zephyr/projects/nissa/xivu/led_pins.dts diff --git a/zephyr/projects/nissa/xivu_led_policy.dts b/zephyr/projects/nissa/xivu/led_policy.dts index a86cb27407..a86cb27407 100644 --- a/zephyr/projects/nissa/xivu_led_policy.dts +++ b/zephyr/projects/nissa/xivu/led_policy.dts diff --git a/zephyr/projects/nissa/xivu_motionsense.dts b/zephyr/projects/nissa/xivu/motionsense.dts index 1230cc98bc..1230cc98bc 100644 --- a/zephyr/projects/nissa/xivu_motionsense.dts +++ b/zephyr/projects/nissa/xivu/motionsense.dts diff --git a/zephyr/projects/nissa/xivu_overlay.dts b/zephyr/projects/nissa/xivu/overlay.dts index 969e327801..969e327801 100644 --- a/zephyr/projects/nissa/xivu_overlay.dts +++ b/zephyr/projects/nissa/xivu/overlay.dts diff --git a/zephyr/projects/nissa/xivu_power_signals.dts b/zephyr/projects/nissa/xivu/power_signals.dts index 91876f0402..91876f0402 100644 --- a/zephyr/projects/nissa/xivu_power_signals.dts +++ b/zephyr/projects/nissa/xivu/power_signals.dts diff --git a/zephyr/projects/nissa/prj_xivu.conf b/zephyr/projects/nissa/xivu/prj.conf index 4211fc8215..4211fc8215 100644 --- a/zephyr/projects/nissa/prj_xivu.conf +++ b/zephyr/projects/nissa/xivu/prj.conf diff --git a/zephyr/projects/nissa/src/xivu/charger.c b/zephyr/projects/nissa/xivu/src/charger.c index 459f6f1cff..459f6f1cff 100644 --- a/zephyr/projects/nissa/src/xivu/charger.c +++ b/zephyr/projects/nissa/xivu/src/charger.c diff --git a/zephyr/projects/nissa/src/xivu/usbc.c b/zephyr/projects/nissa/xivu/src/usbc.c index dcf613bd4b..dcf613bd4b 100644 --- a/zephyr/projects/nissa/src/xivu/usbc.c +++ b/zephyr/projects/nissa/xivu/src/usbc.c |