From 631bfe2a26314205409d62513900232933a4744c Mon Sep 17 00:00:00 2001
From: Brendan Haines <brendan.haines@gmail.com>
Date: Sat, 31 May 2025 01:35:23 -0600
Subject: [PATCH] fix path stuff and kconfig references

---
 .gitignore                                |  8 ++++----
 README.md                                 |  4 ++--
 CMakeLists.txt => firmware/CMakeLists.txt |  0
 Kconfig => firmware/Kconfig               |  0
 firmware/zephyr/module.yml                | 17 +++++++++++++++++
 5 files changed, 23 insertions(+), 6 deletions(-)
 rename CMakeLists.txt => firmware/CMakeLists.txt (100%)
 rename Kconfig => firmware/Kconfig (100%)
 create mode 100644 firmware/zephyr/module.yml

diff --git a/.gitignore b/.gitignore
index 641445f..f4ac295 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@ __pycache__/
 /doc/_build*
 
 # stuff managed by west
-bootloader
-modules
-tools
-zephyr
+./bootloader
+./modules
+./tools
+./zephyr
diff --git a/README.md b/README.md
index 2728e0e..3be02da 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@ nrfutil install device
 ```bash
 west build -p auto -b nrf52dk/nrf52832 firmware/blinky
 west build -p auto -b nrf52dk/nrf52832 firmware/app
-west build -p auto -b mellifera_rev1 firmware/blinky -- -DBOARD_ROOT=$(pwd)/firmware
-west build -p auto -b mellifera_rev1 firmware/app -- -DBOARD_ROOT=$(pwd)/firmware
+west build -p auto -b mellifera_rev1 firmware/blinky
+west build -p auto -b mellifera_rev1 firmware/app
 
 west flash
 ```
diff --git a/CMakeLists.txt b/firmware/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to firmware/CMakeLists.txt
diff --git a/Kconfig b/firmware/Kconfig
similarity index 100%
rename from Kconfig
rename to firmware/Kconfig
diff --git a/firmware/zephyr/module.yml b/firmware/zephyr/module.yml
new file mode 100644
index 0000000..0bc8656
--- /dev/null
+++ b/firmware/zephyr/module.yml
@@ -0,0 +1,17 @@
+build:
+  # Path to the Kconfig file that will be sourced into Zephyr Kconfig tree under
+  # Zephyr > Modules > example-application. Path is relative from root of this
+  # repository.
+  kconfig: Kconfig
+  # Path to the folder that contains the CMakeLists.txt file to be included by
+  # Zephyr build system. The `.` is the root of this repository.
+  cmake: .
+  settings:
+    # Additional roots for boards and DTS files. Zephyr will use the
+    # `<board_root>/boards` for additional boards. The `.` is the root of this
+    # repository.
+    board_root: .
+    # Zephyr will use the `<dts_root>/dts` for additional dts files and
+    # `<dts_root>/dts/bindings` for additional dts binding files. The `.` is
+    # the root of this repository.
+    dts_root: .