From 2e701b3c12fedee86037c4057a67110ca86406d5 Mon Sep 17 00:00:00 2001
From: Eden Frosst <edenfrosst@gmail.com>
Date: Mon, 2 Jun 2025 20:00:44 +0000
Subject: [PATCH 1/2] Fix West support

---
 zephyr/module.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/zephyr/module.yml b/zephyr/module.yml
index 743c12991..b292d6a18 100644
--- a/zephyr/module.yml
+++ b/zephyr/module.yml
@@ -1,6 +1,4 @@
 name: etl
 build:
-  cmake-ext: true
-  kconfig-ext: true
   cmake: zephyr
   kconfig: zephyr/Kconfig

From 3b870e1b1ea6b8ea68560fd00f4edda7638baa44 Mon Sep 17 00:00:00 2001
From: Eden Frosst <edenfrosst@gmail.com>
Date: Mon, 2 Jun 2025 20:41:26 +0000
Subject: [PATCH 2/2] Add ETL Kconfig options

---
 zephyr/CMakeLists.txt | 10 ++++++++--
 zephyr/Kconfig        | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 0dbac030f..2940b7c20 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -1,2 +1,8 @@
-add_subdirectory_ifdef(CONFIG_ETL ${CMAKE_CURRENT_LIST_DIR}/.. etl)
-zephyr_link_interface_ifdef(CONFIG_ETL etl)
+if(CONFIG_ETL)
+  add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/.. etl)
+  zephyr_link_interface(etl)
+
+  zephyr_compile_definitions_ifdef(CONFIG_ETL_DEBUG ETL_DEBUG)
+  zephyr_compile_definitions_ifdef(CONFIG_ETL_CHECK_PUSH_POP ETL_CHECK_PUSH_POP)
+  zephyr_compile_definitions_ifdef(CONFIG_ETL_LOG_ERRORS ETL_LOG_ERRORS)
+endif()
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index b54488ace..ad8cd12dc 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -3,3 +3,17 @@ config ETL
   depends on CPP
   help
     This option enables the 'ETL' library.
+
+if ETL
+
+config ETL_DEBUG
+  bool "Build ETL with debugging checks"
+  default y if DEBUG
+
+config ETL_CHECK_PUSH_POP
+  bool "Enable push/pop checks in ETL"
+
+config ETL_LOG_ERRORS
+  bool "Call ETL error handler instead of assert"
+
+endif # ETL