zephyr EC: Project organization - herobrine

Organized the herobrin program into folders for projects.

Devicetree files have been changed to use the .dtsi extension following
the zephyr convention. Formerly prj.conf file have been separated into
programs and projects for disambiguation.

BUG=b:254097836
TEST=Ran zmake compare-builds
BRANCH=none

Change-Id: Id398eccde2b243f8aa521e898e6c09e6cd175236
Signed-off-by: Jason Yuan <jasonyuan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3995330
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Tested-by: zhi cheng yuan <jasonyuan@chromium.org>
Commit-Queue: zhi cheng yuan <jasonyuan@chromium.org>

61 files changed, 144 insertions, 86 deletions

diff --git a/zephyr/projects/herobrine/BUILD.py b/zephyr/projects/herobrine/BUILD.py
index d38803deb7..0bee6ffe2a 100644
--- a/zephyr/projects/herobrine/BUILD.py
+++ b/zephyr/projects/herobrine/BUILD.py
@@ -6,119 +6,44 @@
 
 
 def register_variant(
-    project_name, extra_dts_overlays=(), extra_kconfig_files=()
+    project_name,
 ):
     """Register a variant of herobrine."""
     register_npcx_project(
         project_name=project_name,
         zephyr_board="npcx9m3f",
         dts_overlays=[
-            # Common to all projects.
-            here / "adc.dts",
-            here / "common.dts",
-            here / "interrupts.dts",
-            here / "keyboard.dts",
-            here / "default_gpio_pinctrl.dts",
-            # Project-specific DTS customization.
-            *extra_dts_overlays,
+            here / project_name / "project.overlay",
         ],
         kconfig_files=[
             # Common to all projects.
-            here / "prj.conf",
+            here / "program.conf",
             # Project-specific KConfig customization.
-            *extra_kconfig_files,
+            here / project_name / "project.conf",
         ],
     )
 
 
 register_variant(
     project_name="evoker",
-    extra_dts_overlays=[
-        here / "display.dts",
-        here / "battery_evoker.dts",
-        here / "gpio_evoker.dts",
-        here / "i2c_evoker.dts",
-        here / "led_pins_evoker.dts",
-        here / "led_policy_evoker.dts",
-        here / "motionsense_evoker.dts",
-        here / "switchcap.dts",
-        here / "usbc_evoker.dts",
-    ],
-    extra_kconfig_files=[here / "prj_evoker.conf"],
 )
 
 register_variant(
     project_name="herobrine",
-    extra_dts_overlays=[
-        here / "display.dts",
-        here / "battery_herobrine.dts",
-        here / "gpio.dts",
-        here / "i2c_herobrine.dts",
-        here / "led_pins_herobrine.dts",
-        here / "led_policy_herobrine.dts",
-        here / "motionsense.dts",
-        here / "switchcap.dts",
-        here / "usbc_herobrine.dts",
-    ],
-    extra_kconfig_files=[here / "prj_herobrine.conf"],
 )
 
 register_variant(
     project_name="hoglin",
-    extra_dts_overlays=[
-        here / "battery_hoglin.dts",
-        here / "gpio_hoglin.dts",
-        here / "i2c_hoglin.dts",
-        here / "led_pins_hoglin.dts",
-        here / "led_policy_hoglin.dts",
-        here / "motionsense_hoglin.dts",
-        here / "switchcap_hoglin.dts",
-        here / "usbc_hoglin.dts",
-    ],
-    extra_kconfig_files=[here / "prj_hoglin.conf"],
 )
 
 register_variant(
     project_name="villager",
-    extra_dts_overlays=[
-        here / "battery_villager.dts",
-        here / "gpio_villager.dts",
-        here / "i2c_villager.dts",
-        here / "led_pins_villager.dts",
-        here / "led_policy_villager.dts",
-        here / "motionsense_villager.dts",
-        here / "switchcap.dts",
-        here / "usbc_villager.dts",
-    ],
-    extra_kconfig_files=[here / "prj_villager.conf"],
 )
 
 register_variant(
     project_name="zoglin",
-    extra_dts_overlays=[
-        here / "battery_hoglin.dts",
-        here / "gpio_hoglin.dts",
-        here / "i2c_hoglin.dts",
-        here / "led_pins_hoglin.dts",
-        here / "led_policy_hoglin.dts",
-        here / "motionsense_hoglin.dts",
-        here / "switchcap_hoglin.dts",
-        here / "usbc_hoglin.dts",
-    ],
-    extra_kconfig_files=[here / "prj_zoglin.conf"],
 )
 
 register_variant(
     project_name="zombie",
-    extra_dts_overlays=[
-        here / "battery_zombie.dts",
-        here / "gpio_zombie.dts",
-        here / "i2c_zombie.dts",
-        here / "led_pins_zombie.dts",
-        here / "led_policy_zombie.dts",
-        here / "motionsense_zombie.dts",
-        here / "switchcap.dts",
-        here / "usbc_zombie.dts",
-    ],
-    extra_kconfig_files=[here / "prj_zombie.conf"],
 )
diff --git a/zephyr/projects/herobrine/CMakeLists.txt b/zephyr/projects/herobrine/CMakeLists.txt
index a7e2fc6cf6..90a49a053e 100644
--- a/zephyr/projects/herobrine/CMakeLists.txt
+++ b/zephyr/projects/herobrine/CMakeLists.txt
@@ -24,8 +24,7 @@ if(DEFINED CONFIG_BOARD_EVOKER)
 	project(evoker)
 elseif(DEFINED CONFIG_BOARD_HEROBRINE)
 	project(herobrine)
-	zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
-	  "src/herobrine/alt_dev_replacement.c")
+	add_subdirectory(herobrine)
 elseif(DEFINED CONFIG_BOARD_HOGLIN)
 	project(hoglin)
 elseif(DEFINED CONFIG_BOARD_VILLAGER)
diff --git a/zephyr/projects/herobrine/adc.dts b/zephyr/projects/herobrine/adc.dtsi
index 16a5434e9d..16a5434e9d 100644
--- a/zephyr/projects/herobrine/adc.dts
+++ b/zephyr/projects/herobrine/adc.dtsi
diff --git a/zephyr/projects/herobrine/common.dts b/zephyr/projects/herobrine/common.dtsi
index a722f1dfa2..a722f1dfa2 100644
--- a/zephyr/projects/herobrine/common.dts
+++ b/zephyr/projects/herobrine/common.dtsi
diff --git a/zephyr/projects/herobrine/default_gpio_pinctrl.dts b/zephyr/projects/herobrine/default_gpio_pinctrl.dtsi
index 604658a145..604658a145 100644
--- a/zephyr/projects/herobrine/default_gpio_pinctrl.dts
+++ b/zephyr/projects/herobrine/default_gpio_pinctrl.dtsi
diff --git a/zephyr/projects/herobrine/display.dts b/zephyr/projects/herobrine/display.dtsi
index 65d3a2d91b..65d3a2d91b 100644
--- a/zephyr/projects/herobrine/display.dts
+++ b/zephyr/projects/herobrine/display.dtsi
diff --git a/zephyr/projects/herobrine/battery_evoker.dts b/zephyr/projects/herobrine/evoker/battery.dtsi
index 0e09616c1d..0e09616c1d 100644
--- a/zephyr/projects/herobrine/battery_evoker.dts
+++ b/zephyr/projects/herobrine/evoker/battery.dtsi
diff --git a/zephyr/projects/herobrine/gpio_evoker.dts b/zephyr/projects/herobrine/evoker/gpio.dtsi
index d60fdf93c7..d60fdf93c7 100644
--- a/zephyr/projects/herobrine/gpio_evoker.dts
+++ b/zephyr/projects/herobrine/evoker/gpio.dtsi
diff --git a/zephyr/projects/herobrine/i2c_evoker.dts b/zephyr/projects/herobrine/evoker/i2c.dtsi
index 7023d08c8d..6de6863f60 100644
--- a/zephyr/projects/herobrine/i2c_evoker.dts
+++ b/zephyr/projects/herobrine/evoker/i2c.dtsi
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "i2c_common.dtsi"
+#include "../i2c.dtsi"
 
 &i2c1_0 {
 	ppc_port0: syv682x@41 {
diff --git a/zephyr/projects/herobrine/led_pins_evoker.dts b/zephyr/projects/herobrine/evoker/led_pins.dtsi
index ff2dc0e36c..ff2dc0e36c 100644
--- a/zephyr/projects/herobrine/led_pins_evoker.dts
+++ b/zephyr/projects/herobrine/evoker/led_pins.dtsi
diff --git a/zephyr/projects/herobrine/led_policy_evoker.dts b/zephyr/projects/herobrine/evoker/led_policy.dtsi
index fc17755ede..fc17755ede 100644
--- a/zephyr/projects/herobrine/led_policy_evoker.dts
+++ b/zephyr/projects/herobrine/evoker/led_policy.dtsi
diff --git a/zephyr/projects/herobrine/motionsense_evoker.dts b/zephyr/projects/herobrine/evoker/motionsense.dtsi
index aa7646e0b3..aa7646e0b3 100644
--- a/zephyr/projects/herobrine/motionsense_evoker.dts
+++ b/zephyr/projects/herobrine/evoker/motionsense.dtsi
diff --git a/zephyr/projects/herobrine/prj_evoker.conf b/zephyr/projects/herobrine/evoker/project.conf
index b4a5fce160..b4a5fce160 100644
--- a/zephyr/projects/herobrine/prj_evoker.conf
+++ b/zephyr/projects/herobrine/evoker/project.conf
diff --git a/zephyr/projects/herobrine/evoker/project.overlay b/zephyr/projects/herobrine/evoker/project.overlay
new file mode 100644
index 0000000000..5731bf3312
--- /dev/null
+++ b/zephyr/projects/herobrine/evoker/project.overlay
@@ -0,0 +1,22 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Herobrine program common DTS includes */
+#include "../adc.dtsi"
+#include "../common.dtsi"
+#include "../interrupts.dtsi"
+#include "../keyboard.dtsi"
+#include "../default_gpio_pinctrl.dtsi"
+#include "../display.dtsi"
+#include "../switchcap.dtsi"
+
+/* Evoker project DTS includes*/
+#include "battery.dtsi"
+#include "gpio.dtsi"
+#include "i2c.dtsi"
+#include "led_pins.dtsi"
+#include "led_policy.dtsi"
+#include "motionsense.dtsi"
+#include "usbc.dtsi"
diff --git a/zephyr/projects/herobrine/usbc_evoker.dts b/zephyr/projects/herobrine/evoker/usbc.dtsi
index 20bd48382f..20bd48382f 100644
--- a/zephyr/projects/herobrine/usbc_evoker.dts
+++ b/zephyr/projects/herobrine/evoker/usbc.dtsi
diff --git a/zephyr/projects/herobrine/gpio.dts b/zephyr/projects/herobrine/gpio.dtsi
index a355aaf099..a355aaf099 100644
--- a/zephyr/projects/herobrine/gpio.dts
+++ b/zephyr/projects/herobrine/gpio.dtsi
diff --git a/zephyr/projects/herobrine/herobrine/CMakeLists.txt b/zephyr/projects/herobrine/herobrine/CMakeLists.txt
new file mode 100644
index 0000000000..5524db7215
--- /dev/null
+++ b/zephyr/projects/herobrine/herobrine/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright 2022 The ChromiumOS Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
+  "src/alt_dev_replacement.c")
diff --git a/zephyr/projects/herobrine/battery_herobrine.dts b/zephyr/projects/herobrine/herobrine/battery.dtsi
index b347ec4c3c..b347ec4c3c 100644
--- a/zephyr/projects/herobrine/battery_herobrine.dts
+++ b/zephyr/projects/herobrine/herobrine/battery.dtsi
diff --git a/zephyr/projects/herobrine/i2c_herobrine.dts b/zephyr/projects/herobrine/herobrine/i2c.dtsi
index 92c68f4215..6f2d89aa71 100644
--- a/zephyr/projects/herobrine/i2c_herobrine.dts
+++ b/zephyr/projects/herobrine/herobrine/i2c.dtsi
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "i2c_common.dtsi"
+#include "../i2c.dtsi"
 
 &i2c1_0 {
 	ppc_port0: sn5s330@40 {
diff --git a/zephyr/projects/herobrine/led_pins_herobrine.dts b/zephyr/projects/herobrine/herobrine/led_pins.dtsi
index c509ab1a64..c509ab1a64 100644
--- a/zephyr/projects/herobrine/led_pins_herobrine.dts
+++ b/zephyr/projects/herobrine/herobrine/led_pins.dtsi
diff --git a/zephyr/projects/herobrine/led_policy_herobrine.dts b/zephyr/projects/herobrine/herobrine/led_policy.dtsi
index 13e5306deb..13e5306deb 100644
--- a/zephyr/projects/herobrine/led_policy_herobrine.dts
+++ b/zephyr/projects/herobrine/herobrine/led_policy.dtsi
diff --git a/zephyr/projects/herobrine/prj_herobrine.conf b/zephyr/projects/herobrine/herobrine/project.conf
index bf39f65692..bf39f65692 100644
--- a/zephyr/projects/herobrine/prj_herobrine.conf
+++ b/zephyr/projects/herobrine/herobrine/project.conf
diff --git a/zephyr/projects/herobrine/herobrine/project.overlay b/zephyr/projects/herobrine/herobrine/project.overlay
new file mode 100644
index 0000000000..a74db66815
--- /dev/null
+++ b/zephyr/projects/herobrine/herobrine/project.overlay
@@ -0,0 +1,22 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Herobrine program common DTS includes */
+#include "../adc.dtsi"
+#include "../common.dtsi"
+#include "../interrupts.dtsi"
+#include "../keyboard.dtsi"
+#include "../default_gpio_pinctrl.dtsi"
+#include "../display.dtsi"
+#include "../gpio.dtsi"
+#include "../motionsense.dtsi"
+#include "../switchcap.dtsi"
+
+/* Herobrine project DTS includes*/
+#include "battery.dtsi"
+#include "i2c.dtsi"
+#include "led_pins.dtsi"
+#include "led_policy.dtsi"
+#include "usbc.dtsi"
diff --git a/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c b/zephyr/projects/herobrine/herobrine/src/alt_dev_replacement.c
index 00acd509f4..00acd509f4 100644
--- a/zephyr/projects/herobrine/src/herobrine/alt_dev_replacement.c
+++ b/zephyr/projects/herobrine/herobrine/src/alt_dev_replacement.c
diff --git a/zephyr/projects/herobrine/usbc_herobrine.dts b/zephyr/projects/herobrine/herobrine/usbc.dtsi
index 675286ecd7..675286ecd7 100644
--- a/zephyr/projects/herobrine/usbc_herobrine.dts
+++ b/zephyr/projects/herobrine/herobrine/usbc.dtsi
diff --git a/zephyr/projects/herobrine/battery_hoglin.dts b/zephyr/projects/herobrine/hoglin/battery.dtsi
index 11180c3988..11180c3988 100644
--- a/zephyr/projects/herobrine/battery_hoglin.dts
+++ b/zephyr/projects/herobrine/hoglin/battery.dtsi
diff --git a/zephyr/projects/herobrine/gpio_hoglin.dts b/zephyr/projects/herobrine/hoglin/gpio.dtsi
index cb7babc9cf..cb7babc9cf 100644
--- a/zephyr/projects/herobrine/gpio_hoglin.dts
+++ b/zephyr/projects/herobrine/hoglin/gpio.dtsi
diff --git a/zephyr/projects/herobrine/i2c_hoglin.dts b/zephyr/projects/herobrine/hoglin/i2c.dtsi
index 504dbb9248..ca2529cbaa 100644
--- a/zephyr/projects/herobrine/i2c_hoglin.dts
+++ b/zephyr/projects/herobrine/hoglin/i2c.dtsi
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "i2c_common.dtsi"
+#include "../i2c.dtsi"
 
 &i2c1_0 {
 	ppc_port0: syv682x@41 {
diff --git a/zephyr/projects/herobrine/led_pins_hoglin.dts b/zephyr/projects/herobrine/hoglin/led_pins.dtsi
index 7b125c5cac..7b125c5cac 100644
--- a/zephyr/projects/herobrine/led_pins_hoglin.dts
+++ b/zephyr/projects/herobrine/hoglin/led_pins.dtsi
diff --git a/zephyr/projects/herobrine/led_policy_hoglin.dts b/zephyr/projects/herobrine/hoglin/led_policy.dtsi
index 043dfbcaa5..043dfbcaa5 100644
--- a/zephyr/projects/herobrine/led_policy_hoglin.dts
+++ b/zephyr/projects/herobrine/hoglin/led_policy.dtsi
diff --git a/zephyr/projects/herobrine/motionsense_hoglin.dts b/zephyr/projects/herobrine/hoglin/motionsense.dtsi
index c3935178ff..c3935178ff 100644
--- a/zephyr/projects/herobrine/motionsense_hoglin.dts
+++ b/zephyr/projects/herobrine/hoglin/motionsense.dtsi
diff --git a/zephyr/projects/herobrine/prj_hoglin.conf b/zephyr/projects/herobrine/hoglin/project.conf
index c6e20937c0..c6e20937c0 100644
--- a/zephyr/projects/herobrine/prj_hoglin.conf
+++ b/zephyr/projects/herobrine/hoglin/project.conf
diff --git a/zephyr/projects/herobrine/hoglin/project.overlay b/zephyr/projects/herobrine/hoglin/project.overlay
new file mode 100644
index 0000000000..d68a5a80d1
--- /dev/null
+++ b/zephyr/projects/herobrine/hoglin/project.overlay
@@ -0,0 +1,21 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Herobrine program common DTS includes */
+#include "../adc.dtsi"
+#include "../common.dtsi"
+#include "../interrupts.dtsi"
+#include "../keyboard.dtsi"
+#include "../default_gpio_pinctrl.dtsi"
+
+/* Hoglin project DTS includes*/
+#include "battery.dtsi"
+#include "gpio.dtsi"
+#include "i2c.dtsi"
+#include "led_pins.dtsi"
+#include "led_policy.dtsi"
+#include "motionsense.dtsi"
+#include "switchcap.dtsi"
+#include "usbc.dtsi"
diff --git a/zephyr/projects/herobrine/switchcap_hoglin.dts b/zephyr/projects/herobrine/hoglin/switchcap.dtsi
index 7c083667a1..7c083667a1 100644
--- a/zephyr/projects/herobrine/switchcap_hoglin.dts
+++ b/zephyr/projects/herobrine/hoglin/switchcap.dtsi
diff --git a/zephyr/projects/herobrine/usbc_hoglin.dts b/zephyr/projects/herobrine/hoglin/usbc.dtsi
index 20bd48382f..20bd48382f 100644
--- a/zephyr/projects/herobrine/usbc_hoglin.dts
+++ b/zephyr/projects/herobrine/hoglin/usbc.dtsi
diff --git a/zephyr/projects/herobrine/i2c_common.dtsi b/zephyr/projects/herobrine/i2c.dtsi
index b1ed0242c0..b1ed0242c0 100644
--- a/zephyr/projects/herobrine/i2c_common.dtsi
+++ b/zephyr/projects/herobrine/i2c.dtsi
diff --git a/zephyr/projects/herobrine/interrupts.dts b/zephyr/projects/herobrine/interrupts.dtsi
index 82650bfc51..82650bfc51 100644
--- a/zephyr/projects/herobrine/interrupts.dts
+++ b/zephyr/projects/herobrine/interrupts.dtsi
diff --git a/zephyr/projects/herobrine/keyboard.dts b/zephyr/projects/herobrine/keyboard.dtsi
index 3b7e830f2f..3b7e830f2f 100644
--- a/zephyr/projects/herobrine/keyboard.dts
+++ b/zephyr/projects/herobrine/keyboard.dtsi
diff --git a/zephyr/projects/herobrine/motionsense.dts b/zephyr/projects/herobrine/motionsense.dtsi
index 1955f43284..1955f43284 100644
--- a/zephyr/projects/herobrine/motionsense.dts
+++ b/zephyr/projects/herobrine/motionsense.dtsi
diff --git a/zephyr/projects/herobrine/prj.conf b/zephyr/projects/herobrine/program.conf
index 3391e60dce..3391e60dce 100644
--- a/zephyr/projects/herobrine/prj.conf
+++ b/zephyr/projects/herobrine/program.conf
diff --git a/zephyr/projects/herobrine/switchcap.dts b/zephyr/projects/herobrine/switchcap.dtsi
index ed200a0c6f..ed200a0c6f 100644
--- a/zephyr/projects/herobrine/switchcap.dts
+++ b/zephyr/projects/herobrine/switchcap.dtsi
diff --git a/zephyr/projects/herobrine/battery_villager.dts b/zephyr/projects/herobrine/villager/battery.dtsi
index dafd473a6e..dafd473a6e 100644
--- a/zephyr/projects/herobrine/battery_villager.dts
+++ b/zephyr/projects/herobrine/villager/battery.dtsi
diff --git a/zephyr/projects/herobrine/gpio_villager.dts b/zephyr/projects/herobrine/villager/gpio.dtsi
index 1e7625ff6a..1e7625ff6a 100644
--- a/zephyr/projects/herobrine/gpio_villager.dts
+++ b/zephyr/projects/herobrine/villager/gpio.dtsi
diff --git a/zephyr/projects/herobrine/i2c_villager.dts b/zephyr/projects/herobrine/villager/i2c.dtsi
index efdf88ac38..02d1729dd1 100644
--- a/zephyr/projects/herobrine/i2c_villager.dts
+++ b/zephyr/projects/herobrine/villager/i2c.dtsi
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "i2c_common.dtsi"
+#include "../i2c.dtsi"
 
 &i2c1_0 {
 	ppc_port0: syv682x@41 {
diff --git a/zephyr/projects/herobrine/led_pins_villager.dts b/zephyr/projects/herobrine/villager/led_pins.dtsi
index b0913cdbce..b0913cdbce 100644
--- a/zephyr/projects/herobrine/led_pins_villager.dts
+++ b/zephyr/projects/herobrine/villager/led_pins.dtsi
diff --git a/zephyr/projects/herobrine/led_policy_villager.dts b/zephyr/projects/herobrine/villager/led_policy.dtsi
index f8996a3f4b..f8996a3f4b 100644
--- a/zephyr/projects/herobrine/led_policy_villager.dts
+++ b/zephyr/projects/herobrine/villager/led_policy.dtsi
diff --git a/zephyr/projects/herobrine/motionsense_villager.dts b/zephyr/projects/herobrine/villager/motionsense.dtsi
index 31d00e04a5..31d00e04a5 100644
--- a/zephyr/projects/herobrine/motionsense_villager.dts
+++ b/zephyr/projects/herobrine/villager/motionsense.dtsi
diff --git a/zephyr/projects/herobrine/prj_villager.conf b/zephyr/projects/herobrine/villager/project.conf
index 35eebe6d99..35eebe6d99 100644
--- a/zephyr/projects/herobrine/prj_villager.conf
+++ b/zephyr/projects/herobrine/villager/project.conf
diff --git a/zephyr/projects/herobrine/villager/project.overlay b/zephyr/projects/herobrine/villager/project.overlay
new file mode 100644
index 0000000000..a18d6416dd
--- /dev/null
+++ b/zephyr/projects/herobrine/villager/project.overlay
@@ -0,0 +1,21 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Herobrine program common DTS includes */
+#include "../adc.dtsi"
+#include "../common.dtsi"
+#include "../interrupts.dtsi"
+#include "../keyboard.dtsi"
+#include "../default_gpio_pinctrl.dtsi"
+#include "../switchcap.dtsi"
+
+/* Villager project DTS includes*/
+#include "battery.dtsi"
+#include "gpio.dtsi"
+#include "i2c.dtsi"
+#include "led_pins.dtsi"
+#include "led_policy.dtsi"
+#include "motionsense.dtsi"
+#include "usbc.dtsi"
diff --git a/zephyr/projects/herobrine/usbc_villager.dts b/zephyr/projects/herobrine/villager/usbc.dtsi
index 20bd48382f..20bd48382f 100644
--- a/zephyr/projects/herobrine/usbc_villager.dts
+++ b/zephyr/projects/herobrine/villager/usbc.dtsi
diff --git a/zephyr/projects/herobrine/prj_zoglin.conf b/zephyr/projects/herobrine/zoglin/project.conf
index 7f96cf6c79..7f96cf6c79 100644
--- a/zephyr/projects/herobrine/prj_zoglin.conf
+++ b/zephyr/projects/herobrine/zoglin/project.conf
diff --git a/zephyr/projects/herobrine/zoglin/project.overlay b/zephyr/projects/herobrine/zoglin/project.overlay
new file mode 100644
index 0000000000..55f7dd73fc
--- /dev/null
+++ b/zephyr/projects/herobrine/zoglin/project.overlay
@@ -0,0 +1,21 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Herobrine program common DTS includes */
+#include "../adc.dtsi"
+#include "../common.dtsi"
+#include "../interrupts.dtsi"
+#include "../keyboard.dtsi"
+#include "../default_gpio_pinctrl.dtsi"
+
+/* Zoglin project DTS includes*/
+#include "../hoglin/battery.dtsi"
+#include "../hoglin/gpio.dtsi"
+#include "../hoglin/i2c.dtsi"
+#include "../hoglin/led_pins.dtsi"
+#include "../hoglin/led_policy.dtsi"
+#include "../hoglin/motionsense.dtsi"
+#include "../hoglin/switchcap.dtsi"
+#include "../hoglin/usbc.dtsi"
diff --git a/zephyr/projects/herobrine/battery_zombie.dts b/zephyr/projects/herobrine/zombie/battery.dtsi
index dafd473a6e..dafd473a6e 100644
--- a/zephyr/projects/herobrine/battery_zombie.dts
+++ b/zephyr/projects/herobrine/zombie/battery.dtsi
diff --git a/zephyr/projects/herobrine/gpio_zombie.dts b/zephyr/projects/herobrine/zombie/gpio.dtsi
index 14ed1f54d6..14ed1f54d6 100644
--- a/zephyr/projects/herobrine/gpio_zombie.dts
+++ b/zephyr/projects/herobrine/zombie/gpio.dtsi
diff --git a/zephyr/projects/herobrine/i2c_zombie.dts b/zephyr/projects/herobrine/zombie/i2c.dtsi
index efdf88ac38..02d1729dd1 100644
--- a/zephyr/projects/herobrine/i2c_zombie.dts
+++ b/zephyr/projects/herobrine/zombie/i2c.dtsi
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "i2c_common.dtsi"
+#include "../i2c.dtsi"
 
 &i2c1_0 {
 	ppc_port0: syv682x@41 {
diff --git a/zephyr/projects/herobrine/led_pins_zombie.dts b/zephyr/projects/herobrine/zombie/led_pins.dtsi
index b0913cdbce..b0913cdbce 100644
--- a/zephyr/projects/herobrine/led_pins_zombie.dts
+++ b/zephyr/projects/herobrine/zombie/led_pins.dtsi
diff --git a/zephyr/projects/herobrine/led_policy_zombie.dts b/zephyr/projects/herobrine/zombie/led_policy.dtsi
index f8996a3f4b..f8996a3f4b 100644
--- a/zephyr/projects/herobrine/led_policy_zombie.dts
+++ b/zephyr/projects/herobrine/zombie/led_policy.dtsi
diff --git a/zephyr/projects/herobrine/motionsense_zombie.dts b/zephyr/projects/herobrine/zombie/motionsense.dtsi
index e069564b35..e069564b35 100644
--- a/zephyr/projects/herobrine/motionsense_zombie.dts
+++ b/zephyr/projects/herobrine/zombie/motionsense.dtsi
diff --git a/zephyr/projects/herobrine/prj_zombie.conf b/zephyr/projects/herobrine/zombie/project.conf
index 037ab5cc05..037ab5cc05 100644
--- a/zephyr/projects/herobrine/prj_zombie.conf
+++ b/zephyr/projects/herobrine/zombie/project.conf
diff --git a/zephyr/projects/herobrine/zombie/project.overlay b/zephyr/projects/herobrine/zombie/project.overlay
new file mode 100644
index 0000000000..7b44350e5a
--- /dev/null
+++ b/zephyr/projects/herobrine/zombie/project.overlay
@@ -0,0 +1,21 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Herobrine program common DTS includes */
+#include "../adc.dtsi"
+#include "../common.dtsi"
+#include "../interrupts.dtsi"
+#include "../keyboard.dtsi"
+#include "../default_gpio_pinctrl.dtsi"
+#include "../switchcap.dtsi"
+
+/* Zombie project DTS includes*/
+#include "battery.dtsi"
+#include "gpio.dtsi"
+#include "i2c.dtsi"
+#include "led_pins.dtsi"
+#include "led_policy.dtsi"
+#include "motionsense.dtsi"
+#include "usbc.dtsi"
diff --git a/zephyr/projects/herobrine/usbc_zombie.dts b/zephyr/projects/herobrine/zombie/usbc.dtsi
index 20bd48382f..20bd48382f 100644
--- a/zephyr/projects/herobrine/usbc_zombie.dts
+++ b/zephyr/projects/herobrine/zombie/usbc.dtsi