From a45abbdd5d23b68bc8f6804ca627dc8eab6f8b66 Mon Sep 17 00:00:00 2001
From: Adrian G L <adrian@lauterer.it>
Date: Fri, 1 May 2026 12:34:47 +0200
Subject: [PATCH] chore: bump Zephyr to v4.3.0, SDK to 0.17.4, fix EPD BUSY pin
 to D5

---
 README.md                                    |  2 +-
 boards/xiao_nrf54l15_nrf54l15_cpuapp.overlay | 14 +-------------
 flake.nix                                    | 11 ++++++-----
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 640a8bf..29bcf77 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Built on [Zephyr RTOS](https://docs.zephyrproject.org/) v4.0. Targets the `xiao_
 | CS     | D1       | Chip select |
 | DC     | D3       | Data/command |
 | RST    | D0       | Hardware reset |
-| BUSY   | D2       | Busy status |
+| BUSY   | D5       | Busy status |
 
 ## Quick start
 
diff --git a/boards/xiao_nrf54l15_nrf54l15_cpuapp.overlay b/boards/xiao_nrf54l15_nrf54l15_cpuapp.overlay
index 162421d..0ab5588 100644
--- a/boards/xiao_nrf54l15_nrf54l15_cpuapp.overlay
+++ b/boards/xiao_nrf54l15_nrf54l15_cpuapp.overlay
@@ -5,32 +5,20 @@
 		led0 = &led0;
 	};
 
-	chosen {
-		zephyr,bt-hci = &bt_hci_controller;
-	};
-
 	epd_ctrl: epd-ctrl {
 		compatible = "nrfwarch,epd-ctrl";
 		cs-gpios   = <&xiao_d 1 GPIO_ACTIVE_LOW>;
 		dc-gpios   = <&xiao_d 3 GPIO_ACTIVE_HIGH>;
 		rst-gpios  = <&xiao_d 0 GPIO_ACTIVE_LOW>;
-		busy-gpios = <&xiao_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
+		busy-gpios = <&xiao_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>;
 	};
 };
 
 &xiao_spi {
 	status = "okay";
-	suggested-max-frequency = <4000000>;
 };
 
 &xiao_i2c {
 	status = "okay";
 	clock-frequency = <I2C_BITRATE_FAST>;
 };
-
-&bt_hci_controller {
-	status = "okay";
-};
-&bt_hci_sdc {
-	status = "okay";
-};
diff --git a/flake.nix b/flake.nix
index fa531aa..1fd6887 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
 
         zephyrEnv = ''
           export ZEPHYR_BASE="$(pwd)/.zephyr/zephyr"
-          export ZEPHYR_SDK_INSTALL_DIR="$(pwd)/.sdk/zephyr-sdk-0.17.0"
+          export ZEPHYR_SDK_INSTALL_DIR="$(pwd)/.sdk/zephyr-sdk-0.17.4"
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
         '';
       in
@@ -32,6 +32,7 @@
             python312Packages.pip
             python312Packages.west
             python312Packages.pyelftools
+            python312Packages.jsonschema
             qemu_full
             dtc
             git
@@ -51,7 +52,7 @@
           '';
 
           ZEPHYR_BASE = toString ./.zephyr/zephyr;
-          ZEPHYR_SDK_INSTALL_DIR = toString ./.sdk/zephyr-sdk-0.17.0;
+          ZEPHYR_SDK_INSTALL_DIR = toString ./.sdk/zephyr-sdk-0.17.4;
           ZEPHYR_TOOLCHAIN_VARIANT = "zephyr";
         };
 
@@ -62,7 +63,7 @@
               pkgs.writeShellScript "setup-sdk" ''
                 set -euo pipefail
 
-                SDK_VER="0.17.0"
+                SDK_VER="0.17.4"
                 SDK_DIR=".sdk/zephyr-sdk-$SDK_VER"
                 ZEPHYR_DIR=".zephyr"
 
@@ -70,7 +71,7 @@
 
                 if [ ! -d "$ZEPHYR_DIR/zephyr" ]; then
                   echo "Initializing Zephyr workspace..."
-                  west init -m https://github.com/zephyrproject-rtos/zephyr --mr v4.0.0 "$ZEPHYR_DIR"
+                  west init -m https://github.com/zephyrproject-rtos/zephyr --mr v4.3.0 "$ZEPHYR_DIR"
                   (cd "$ZEPHYR_DIR" && west update)
                   echo "Zephyr workspace ready."
                 else
@@ -86,7 +87,7 @@
                   tar xf .sdk/zephyr-sdk.tar.xz -C .sdk
                   rm .sdk/zephyr-sdk.tar.xz
 
-                  "$SDK_DIR/setup.sh" -t x86_64-zephyr-elf -t aarch64-zephyr-elf
+                  "$SDK_DIR/setup.sh" -t x86_64-zephyr-elf -t aarch64-zephyr-elf -t arm-zephyr-eabi
 
                   echo "Patching binaries for NixOS..."
                   LD_PATH="${pkgs.stdenv.cc.bintools.dynamicLinker}"