zephyr: krabby: restructure folder layout

To follow the guidelines in go/zephyr-variant.

next steps:
 - restructure kingler layout
 - move common configs into prj.conf
 - move source files from cros-ec/krabby to zephyr

BUG=b:206553789
TEST=zmake -b krabby; zmake -b kingler
BRANCH=main

Change-Id: I145fcb90cca360f733ecad41d0fcc82283563634
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3289581
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Eric Yilun Lin <yllin@google.com>
Auto-Submit: Eric Yilun Lin <yllin@google.com>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>

14 files changed, 41 insertions, 17 deletions

diff --git a/zephyr/projects/corsola/BUILD.py b/zephyr/projects/corsola/BUILD.py
new file mode 100644
index 0000000000..e5336aa1f8
--- /dev/null
+++ b/zephyr/projects/corsola/BUILD.py
@@ -0,0 +1,37 @@
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Default chip is it8xxx2, some variants will use NPCX9X.
+
+
+def register_corsola_project(
+    project_name,
+    chip="it8xxx2",
+    extra_dts_overlays=(),
+    extra_kconfig_files=(),
+):
+    register_func = register_binman_project
+    if chip.startswith("npcx9"):
+        register_func = register_npcx_project
+
+    register_func(
+        project_name=project_name,
+        zephyr_board=chip,
+        dts_overlays=[*extra_dts_overlays],
+        kconfig_files=[here / "prj.conf", *extra_kconfig_files],
+    )
+
+
+register_corsola_project(
+    "krabby",
+    extra_dts_overlays=[
+        here / "adc_krabby.dts",
+        here / "battery_krabby.dts",
+        here / "gpio_krabby.dts",
+        here / "i2c_krabby.dts",
+        here / "motionsense_krabby.dts",
+        here / "pwm_krabby.dts",
+    ],
+    extra_kconfig_files=[here / "prj_krabby.conf"],
+)
diff --git a/zephyr/projects/corsola/krabby/CMakeLists.txt b/zephyr/projects/corsola/CMakeLists.txt
index dd59e4e2fb..c237bae135 100644
--- a/zephyr/projects/corsola/krabby/CMakeLists.txt
+++ b/zephyr/projects/corsola/CMakeLists.txt
@@ -30,4 +30,4 @@ zephyr_library_sources(
   "${PLATFORM_EC_BOARD}/led.c")
 
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_I2C
-  "src/i2c.c")
+  "src/krabby/i2c.c")
diff --git a/zephyr/projects/corsola/krabby/adc.dts b/zephyr/projects/corsola/adc_krabby.dts
index 7f308c04f9..7f308c04f9 100644
--- a/zephyr/projects/corsola/krabby/adc.dts
+++ b/zephyr/projects/corsola/adc_krabby.dts
diff --git a/zephyr/projects/corsola/krabby/battery.dts b/zephyr/projects/corsola/battery_krabby.dts
index deb803bb8c..deb803bb8c 100644
--- a/zephyr/projects/corsola/krabby/battery.dts
+++ b/zephyr/projects/corsola/battery_krabby.dts
diff --git a/zephyr/projects/corsola/krabby/gpio.dts b/zephyr/projects/corsola/gpio_krabby.dts
index 29fc7dd879..29fc7dd879 100644
--- a/zephyr/projects/corsola/krabby/gpio.dts
+++ b/zephyr/projects/corsola/gpio_krabby.dts
diff --git a/zephyr/projects/corsola/krabby/i2c.dts b/zephyr/projects/corsola/i2c_krabby.dts
index 7205bf19bc..7205bf19bc 100644
--- a/zephyr/projects/corsola/krabby/i2c.dts
+++ b/zephyr/projects/corsola/i2c_krabby.dts
diff --git a/zephyr/projects/corsola/krabby/include/gpio_map.h b/zephyr/projects/corsola/include/gpio_map.h
index 9122c85ffc..9122c85ffc 100644
--- a/zephyr/projects/corsola/krabby/include/gpio_map.h
+++ b/zephyr/projects/corsola/include/gpio_map.h
diff --git a/zephyr/projects/corsola/krabby/include/i2c_map.h b/zephyr/projects/corsola/include/i2c_map.h
index 898d5c398c..898d5c398c 100644
--- a/zephyr/projects/corsola/krabby/include/i2c_map.h
+++ b/zephyr/projects/corsola/include/i2c_map.h
diff --git a/zephyr/projects/corsola/krabby/BUILD.py b/zephyr/projects/corsola/krabby/BUILD.py
deleted file mode 100644
index e533544d8c..0000000000
--- a/zephyr/projects/corsola/krabby/BUILD.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2021 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-register_binman_project(
-    project_name="krabby",
-    zephyr_board="it8xxx2",
-    dts_overlays=[
-        "adc.dts",
-        "battery.dts",
-        "gpio.dts",
-        "i2c.dts",
-        "motionsense.dts",
-        "pwm.dts",
-    ],
-)
diff --git a/zephyr/projects/corsola/krabby/motionsense.dts b/zephyr/projects/corsola/motionsense_krabby.dts
index 00434e6be9..00434e6be9 100644
--- a/zephyr/projects/corsola/krabby/motionsense.dts
+++ b/zephyr/projects/corsola/motionsense_krabby.dts
diff --git a/zephyr/projects/corsola/prj.conf b/zephyr/projects/corsola/prj.conf
new file mode 100644
index 0000000000..80f1d03d96
--- /dev/null
+++ b/zephyr/projects/corsola/prj.conf
@@ -0,0 +1,3 @@
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
diff --git a/zephyr/projects/corsola/krabby/prj.conf b/zephyr/projects/corsola/prj_krabby.conf
index ad86923679..ad86923679 100644
--- a/zephyr/projects/corsola/krabby/prj.conf
+++ b/zephyr/projects/corsola/prj_krabby.conf
diff --git a/zephyr/projects/corsola/krabby/pwm.dts b/zephyr/projects/corsola/pwm_krabby.dts
index f86448cc8e..f86448cc8e 100644
--- a/zephyr/projects/corsola/krabby/pwm.dts
+++ b/zephyr/projects/corsola/pwm_krabby.dts
diff --git a/zephyr/projects/corsola/krabby/src/i2c.c b/zephyr/projects/corsola/src/krabby/i2c.c
index 12f626847c..12f626847c 100644
--- a/zephyr/projects/corsola/krabby/src/i2c.c
+++ b/zephyr/projects/corsola/src/krabby/i2c.c