diff --git a/zephcore/patches/zephyr/0001-lora-lr11xx-lr20xx-build.patch b/zephcore/patches/zephyr/0001-lora-lr11xx-lr20xx-build.patch index b7f19b9..793d96b 100644 --- a/zephcore/patches/zephyr/0001-lora-lr11xx-lr20xx-build.patch +++ b/zephcore/patches/zephyr/0001-lora-lr11xx-lr20xx-build.patch @@ -22,6 +22,9 @@ LR1121); zephcore_common.conf selects it on every board, so on an LR1110- or LR2021-only board the choice silently fell through to loramac-node (a Kconfig warning, no build error). Our two drivers are native-backend drivers. +Rebased 2026-10-15 onto upstream bb0f4534b50 ("lora: native: fake LoRa driver"), which added +DT_HAS_ZEPHYR_FAKE_LORA_ENABLED to the same depends on line; ours are appended after it. + diff --git a/drivers/lora/CMakeLists.txt b/drivers/lora/CMakeLists.txt index fecfe8ea8bb..0fbeadcc404 100644 --- a/drivers/lora/CMakeLists.txt @@ -40,7 +43,7 @@ index fecfe8ea8bb..0fbeadcc404 100644 add_subdirectory_ifdef(CONFIG_LORA_MODULE_BACKEND_LORAMAC_NODE loramac-node) add_subdirectory_ifdef(CONFIG_LORA_MODULE_BACKEND_LORA_BASICS_MODEM lora-basics-modem) diff --git a/drivers/lora/Kconfig b/drivers/lora/Kconfig -index 67346bc1142..eff530d806a 100644 +index db8639fdc63..02e85e70b87 100644 --- a/drivers/lora/Kconfig +++ b/drivers/lora/Kconfig @@ -5,6 +5,7 @@ @@ -51,19 +54,20 @@ index 67346bc1142..eff530d806a 100644 menuconfig LORA bool "LoRa drivers" -@@ -36,8 +37,10 @@ config LORA_MODULE_BACKEND_LORA_BASICS_MODEM +@@ -37,9 +38,11 @@ config LORA_MODULE_BACKEND_LORA_BASICS_MODEM config LORA_MODULE_BACKEND_NATIVE bool "Native Zephyr backend" + # ZephCore patch: lr11xx/ and lr20xx/ are native-backend drivers too. depends on DT_HAS_SEMTECH_SX1261_ENABLED || DT_HAS_SEMTECH_SX1262_ENABLED \ -- || DT_HAS_ST_STM32WL_SUBGHZ_RADIO_ENABLED || DT_HAS_SEMTECH_LR1121_ENABLED -+ || DT_HAS_ST_STM32WL_SUBGHZ_RADIO_ENABLED || DT_HAS_SEMTECH_LR1121_ENABLED \ + || DT_HAS_ST_STM32WL_SUBGHZ_RADIO_ENABLED || DT_HAS_SEMTECH_LR1121_ENABLED || \ +- DT_HAS_ZEPHYR_FAKE_LORA_ENABLED ++ DT_HAS_ZEPHYR_FAKE_LORA_ENABLED \ + || DT_HAS_SEMTECH_LR1110_ENABLED || DT_HAS_SEMTECH_LR2021_ENABLED help Use Zephyr's built-in LoRa drivers without external modules. - Currently supports SX1261/SX1262, the STM32WL sub-GHz radio and LR1121. -@@ -81,6 +84,8 @@ config LORA_INIT_PRIORITY + Currently supports SX1261/SX1262, STM32WL, LR1121 and fake radios. +@@ -88,6 +91,8 @@ config LORA_INIT_PRIORITY rsource "Kconfig.sx12xx" rsource "Kconfig.rylrxxx" diff --git a/zephcore/west.yml b/zephcore/west.yml index 6a676ca..985f962 100644 --- a/zephcore/west.yml +++ b/zephcore/west.yml @@ -6,7 +6,7 @@ manifest: projects: - name: zephyr remote: zephyrproject-rtos - revision: 11808e9ea8abc132661fe18a21236e053ab04b93 + revision: c136c73d7be3305d2c07ee5726d4c6d0d985068b import: true self: