From a6c65b426d5f7ba9e6dbcaa84229241f93b0a662 Mon Sep 17 00:00:00 2001
From: Andrew Scheller <andrew.scheller@raspberrypi.com>
Date: Mon, 20 May 2024 01:26:30 +0100
Subject: [PATCH] Small kitchen-sink fixes (#1707)

- tweak CMakeLists.txt and kitchen_sink.c to be in a more similar order
- add some "missing" headers to kitchen_sink.c
---
 test/kitchen_sink/CMakeLists.txt | 3 +--
 test/kitchen_sink/kitchen_sink.c | 8 +++++++-
 tools/build_all_headers.py       | 8 +++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/test/kitchen_sink/CMakeLists.txt b/test/kitchen_sink/CMakeLists.txt
index 8d98603e..60ca0a21 100644
--- a/test/kitchen_sink/CMakeLists.txt
+++ b/test/kitchen_sink/CMakeLists.txt
@@ -3,8 +3,8 @@ target_link_libraries(kitchen_sink_libs INTERFACE
     hardware_adc
     hardware_clocks
     hardware_divider
-    hardware_exception
     hardware_dma
+    hardware_exception
     hardware_flash
     hardware_gpio
     hardware_i2c
@@ -15,7 +15,6 @@ target_link_libraries(kitchen_sink_libs INTERFACE
     hardware_pwm
     hardware_resets
     hardware_rtc
-    hardware_uart
     hardware_spi
     hardware_sync
     hardware_timer
diff --git a/test/kitchen_sink/kitchen_sink.c b/test/kitchen_sink/kitchen_sink.c
index e1c23c03..29dda2bf 100644
--- a/test/kitchen_sink/kitchen_sink.c
+++ b/test/kitchen_sink/kitchen_sink.c
@@ -41,10 +41,12 @@
 #include "pico/fix/rp2040_usb_device_enumeration.h"
 #include "pico/flash.h"
 #include "pico/float.h"
-#include "pico/int64_ops.h"
 #include "pico/i2c_slave.h"
+#include "pico/int64_ops.h"
 #include "pico/malloc.h"
+#include "pico/mem_ops.h"
 #include "pico/multicore.h"
+#include "pico/platform.h"
 #include "pico/printf.h"
 #include "pico/rand.h"
 #include "pico/runtime.h"
@@ -53,6 +55,9 @@
 #include "pico/sync.h"
 #include "pico/time.h"
 #include "pico/unique_id.h"
+#include "pico/util/datetime.h"
+#include "pico/util/pheap.h"
+#include "pico/util/queue.h"
 
 #include "hardware/structs/adc.h"
 #include "hardware/structs/bus_ctrl.h"
@@ -63,6 +68,7 @@
 #include "hardware/structs/iobank0.h"
 #include "hardware/structs/ioqspi.h"
 #include "hardware/structs/mpu.h"
+#include "hardware/structs/nvic.h"
 #include "hardware/structs/padsbank0.h"
 #include "hardware/structs/pads_qspi.h"
 #include "hardware/structs/pio.h"
diff --git a/tools/build_all_headers.py b/tools/build_all_headers.py
index a3392bbc..fc047d99 100755
--- a/tools/build_all_headers.py
+++ b/tools/build_all_headers.py
@@ -20,7 +20,13 @@ import sys
 IGNORE_DIRS = set(['host', 'boards'])
 IGNORE_DIRS.add('common/boot_picoboot')
 IGNORE_DIRS.add('common/boot_uf2')
-IGNORE_DIRS.add('rp2_common/pico_mem_ops')
+IGNORE_DIRS.add('common/pico_usb_reset_interface')
+IGNORE_DIRS.add('rp2_common/cmsis')
+IGNORE_DIRS.add('rp2_common/pico_async_context')
+IGNORE_DIRS.add('rp2_common/pico_btstack')
+IGNORE_DIRS.add('rp2_common/pico_cyw43_arch')
+IGNORE_DIRS.add('rp2_common/pico_cyw43_driver')
+IGNORE_DIRS.add('rp2_common/pico_lwip')
 IGNORE_DIRS.add('rp2_common/pico_stdio_semihosting')
 IGNORE_DIRS.add('rp2_common/pico_stdio_usb')