diff --git a/boards/avr/drivers/Kconfig b/boards/avr/at32uc3/drivers/Kconfig
similarity index 100%
rename from boards/avr/drivers/Kconfig
rename to boards/avr/at32uc3/drivers/Kconfig
diff --git a/boards/hc/drivers/Kconfig b/boards/avr/at90usb/drivers/Kconfig
similarity index 100%
rename from boards/hc/drivers/Kconfig
rename to boards/avr/at90usb/drivers/Kconfig
diff --git a/boards/misoc/drivers/Kconfig b/boards/avr/atmega/drivers/Kconfig
similarity index 100%
rename from boards/misoc/drivers/Kconfig
rename to boards/avr/atmega/drivers/Kconfig
diff --git a/boards/or1k/drivers/Kconfig b/boards/hc/mcs92s12ne64/drivers/Kconfig
similarity index 100%
rename from boards/or1k/drivers/Kconfig
rename to boards/hc/mcs92s12ne64/drivers/Kconfig
diff --git a/boards/renesas/drivers/Kconfig b/boards/misoc/lm32/drivers/Kconfig
similarity index 100%
rename from boards/renesas/drivers/Kconfig
rename to boards/misoc/lm32/drivers/Kconfig
diff --git a/boards/risc-v/drivers/Kconfig b/boards/or1k/mor1kx/drivers/Kconfig
similarity index 100%
rename from boards/risc-v/drivers/Kconfig
rename to boards/or1k/mor1kx/drivers/Kconfig
diff --git a/boards/sim/drivers/Kconfig b/boards/renesas/m32262f8/drivers/Kconfig
similarity index 100%
rename from boards/sim/drivers/Kconfig
rename to boards/renesas/m32262f8/drivers/Kconfig
diff --git a/boards/x86/drivers/Kconfig b/boards/renesas/sh7032/drivers/Kconfig
similarity index 100%
rename from boards/x86/drivers/Kconfig
rename to boards/renesas/sh7032/drivers/Kconfig
diff --git a/boards/xtensa/drivers/Kconfig b/boards/risc-v/gap8/drivers/Kconfig
similarity index 100%
rename from boards/xtensa/drivers/Kconfig
rename to boards/risc-v/gap8/drivers/Kconfig
diff --git a/boards/z16/drivers/Kconfig b/boards/risc-v/nr5m100/drivers/Kconfig
similarity index 100%
rename from boards/z16/drivers/Kconfig
rename to boards/risc-v/nr5m100/drivers/Kconfig
diff --git a/boards/z80/drivers/Kconfig b/boards/x86/qemu/drivers/Kconfig
similarity index 100%
rename from boards/z80/drivers/Kconfig
rename to boards/x86/qemu/drivers/Kconfig
diff --git a/boards/xtensa/esp32/drivers/Kconfig b/boards/xtensa/esp32/drivers/Kconfig
new file mode 100644
index 00000000000..f72f3c094ce
--- /dev/null
+++ b/boards/xtensa/esp32/drivers/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/boards/z16/z16f2811/drivers/Kconfig b/boards/z16/z16f2811/drivers/Kconfig
new file mode 100644
index 00000000000..f72f3c094ce
--- /dev/null
+++ b/boards/z16/z16f2811/drivers/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/boards/z80/ez80/drivers/Kconfig b/boards/z80/ez80/drivers/Kconfig
new file mode 100644
index 00000000000..f72f3c094ce
--- /dev/null
+++ b/boards/z80/ez80/drivers/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/boards/z80/z180/drivers/Kconfig b/boards/z80/z180/drivers/Kconfig
new file mode 100644
index 00000000000..f72f3c094ce
--- /dev/null
+++ b/boards/z80/z180/drivers/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/boards/z80/z8/drivers/Kconfig b/boards/z80/z8/drivers/Kconfig
new file mode 100644
index 00000000000..f72f3c094ce
--- /dev/null
+++ b/boards/z80/z8/drivers/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/boards/z80/z80/drivers/Kconfig b/boards/z80/z80/drivers/Kconfig
new file mode 100644
index 00000000000..f72f3c094ce
--- /dev/null
+++ b/boards/z80/z80/drivers/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
diff --git a/sched/wqueue/kwork_process.c b/sched/wqueue/kwork_process.c
index 00fda302ce6..650bbda2725 100644
--- a/sched/wqueue/kwork_process.c
+++ b/sched/wqueue/kwork_process.c
@@ -128,7 +128,7 @@ void work_process(FAR struct kwork_wqueue_s *wqueue, int wndx)
    */
 
   work = (FAR struct work_s *)wqueue->q.head;
-  while (work)
+  while (work != NULL)
     {
       /* Is this work ready?  It is ready if there is no delay or if
        * the delay has elapsed. qtime is the time that the work was added