diff --git a/boards/arm/bambino-200e/configs/knsh/defconfig b/boards/arm/bambino-200e/configs/knsh/defconfig
index 789ce212c9..9e61dd354e 100644
--- a/boards/arm/bambino-200e/configs/knsh/defconfig
+++ b/boards/arm/bambino-200e/configs/knsh/defconfig
@@ -38,7 +38,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x14040000
-CONFIG_PASS1_BUILDIR="boards/bambino-200e/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/bambino-200e/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
diff --git a/boards/arm/clicker2-stm32/configs/knsh/defconfig b/boards/arm/clicker2-stm32/configs/knsh/defconfig
index 9e1f7f3bb0..7700bc6006 100644
--- a/boards/arm/clicker2-stm32/configs/knsh/defconfig
+++ b/boards/arm/clicker2-stm32/configs/knsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x08020000
-CONFIG_PASS1_BUILDIR="boards/clicker2-stm32/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/clicker2-stm32/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=8
diff --git a/boards/arm/ea3131/configs/pgnsh/defconfig b/boards/arm/ea3131/configs/pgnsh/defconfig
index e2b222b32a..1f534a7b9e 100644
--- a/boards/arm/ea3131/configs/pgnsh/defconfig
+++ b/boards/arm/ea3131/configs/pgnsh/defconfig
@@ -41,7 +41,7 @@ CONFIG_PAGING_NPPAGED=96
 CONFIG_PAGING_NVPAGED=384
 CONFIG_PAGING_PAGESIZE=1024
 CONFIG_PAGING_STACKSIZE=2048
-CONFIG_PASS1_BUILDIR="boards/ea3131/locked"
+CONFIG_PASS1_BUILDIR="boards/arm/ea3131/locked"
 CONFIG_PASS1_OBJECT="locked.r"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/imxrt1050-evk/configs/knsh/defconfig b/boards/arm/imxrt1050-evk/configs/knsh/defconfig
index b586acb0b0..ffbc8ed04d 100644
--- a/boards/arm/imxrt1050-evk/configs/knsh/defconfig
+++ b/boards/arm/imxrt1050-evk/configs/knsh/defconfig
@@ -35,7 +35,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x60200000
-CONFIG_PASS1_BUILDIR="boards/imxrt1050-evk/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/imxrt1050-evk/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_WDOGS=16
 CONFIG_RAM_SIZE=524288
diff --git a/boards/arm/imxrt1060-evk/configs/knsh/defconfig b/boards/arm/imxrt1060-evk/configs/knsh/defconfig
index f4c381317d..51e2b52237 100644
--- a/boards/arm/imxrt1060-evk/configs/knsh/defconfig
+++ b/boards/arm/imxrt1060-evk/configs/knsh/defconfig
@@ -35,7 +35,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x60200000
-CONFIG_PASS1_BUILDIR="boards/imxrt1060-evk/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/imxrt1060-evk/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_WDOGS=16
 CONFIG_RAM_SIZE=1048576
diff --git a/boards/arm/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450-xgevk/configs/knsh/defconfig
index 048659d529..58b3675e15 100644
--- a/boards/arm/lc823450-xgevk/configs/knsh/defconfig
+++ b/boards/arm/lc823450-xgevk/configs/knsh/defconfig
@@ -85,7 +85,7 @@ CONFIG_NUTTX_USERSPACE=0x05020000
 CONFIG_NX=y
 CONFIG_NXFONT_MONO5X8=y
 CONFIG_NX_BLOCKING=y
-CONFIG_PASS1_BUILDIR="boards/lc823450-xgevk/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/lc823450-xgevk/kernel"
 CONFIG_PIPES=y
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
 CONFIG_PREALLOC_MQ_MSGS=4
diff --git a/boards/arm/lc823450-xgevk/configs/kostest/defconfig b/boards/arm/lc823450-xgevk/configs/kostest/defconfig
index 86dcdf625d..d4109c577a 100644
--- a/boards/arm/lc823450-xgevk/configs/kostest/defconfig
+++ b/boards/arm/lc823450-xgevk/configs/kostest/defconfig
@@ -27,7 +27,7 @@ CONFIG_MAX_WDOGPARMS=2
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NUTTX_USERSPACE=0x05020000
-CONFIG_PASS1_BUILDIR="boards/lc823450-xgevk/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/lc823450-xgevk/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=8
diff --git a/boards/arm/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450-xgevk/configs/krndis/defconfig
index 2af06bf0e6..38de526c64 100644
--- a/boards/arm/lc823450-xgevk/configs/krndis/defconfig
+++ b/boards/arm/lc823450-xgevk/configs/krndis/defconfig
@@ -138,7 +138,7 @@ CONFIG_NXFONT_MONO5X8=y
 CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sd1"
 CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y
 CONFIG_NX_BLOCKING=y
-CONFIG_PASS1_BUILDIR="boards/lc823450-xgevk/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/lc823450-xgevk/kernel"
 CONFIG_PATH_INITIAL="/mnt/sd0/bin"
 CONFIG_PIPES=y
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
diff --git a/boards/arm/lpc4088-devkit/configs/knsh/defconfig b/boards/arm/lpc4088-devkit/configs/knsh/defconfig
index b84ffe77de..a05017646d 100644
--- a/boards/arm/lpc4088-devkit/configs/knsh/defconfig
+++ b/boards/arm/lpc4088-devkit/configs/knsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_NSH_DISABLE_MKRD=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x00040000
-CONFIG_PASS1_BUILDIR="boards/lpc4088-devkit/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/lpc4088-devkit/kernel"
 CONFIG_PIPES=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/lpc4088-quickstart/configs/knsh/defconfig b/boards/arm/lpc4088-quickstart/configs/knsh/defconfig
index 62d0063ca4..125910c363 100644
--- a/boards/arm/lpc4088-quickstart/configs/knsh/defconfig
+++ b/boards/arm/lpc4088-quickstart/configs/knsh/defconfig
@@ -42,7 +42,7 @@ CONFIG_NSH_DISABLE_MKRD=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x00040000
-CONFIG_PASS1_BUILDIR="boards/lpc4088-quickstart/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/lpc4088-quickstart/kernel"
 CONFIG_PIPES=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/mikroe-stm32f4/configs/kostest/defconfig b/boards/arm/mikroe-stm32f4/configs/kostest/defconfig
index f2a3fb03c0..bbf85054c2 100644
--- a/boards/arm/mikroe-stm32f4/configs/kostest/defconfig
+++ b/boards/arm/mikroe-stm32f4/configs/kostest/defconfig
@@ -55,7 +55,7 @@ CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NSH_STRERROR=y
 CONFIG_NUTTX_USERSPACE=0x08020000
-CONFIG_PASS1_BUILDIR="boards/mikroe-stm32f4/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/mikroe-stm32f4/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=8
diff --git a/boards/arm/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/olimex-stm32-p407/configs/kelf/defconfig
index 6763c03da5..a598835857 100644
--- a/boards/arm/olimex-stm32-p407/configs/kelf/defconfig
+++ b/boards/arm/olimex-stm32-p407/configs/kelf/defconfig
@@ -37,7 +37,7 @@ CONFIG_MM_REGIONS=2
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NUTTX_USERSPACE=0x08020000
-CONFIG_PASS1_BUILDIR="boards/olimex-stm32-p407/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/olimex-stm32-p407/kernel"
 CONFIG_PATH_INITIAL="/mnt/vfat"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/olimex-stm32-p407/configs/kmodule/defconfig b/boards/arm/olimex-stm32-p407/configs/kmodule/defconfig
index 1b60aa8a7f..700e27daa8 100644
--- a/boards/arm/olimex-stm32-p407/configs/kmodule/defconfig
+++ b/boards/arm/olimex-stm32-p407/configs/kmodule/defconfig
@@ -36,7 +36,7 @@ CONFIG_MODULE=y
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NUTTX_USERSPACE=0x08020000
-CONFIG_PASS1_BUILDIR="boards/olimex-stm32-p407/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/olimex-stm32-p407/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
diff --git a/boards/arm/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/olimex-stm32-p407/configs/knsh/defconfig
index 7c1ef74a93..3bfb347c29 100644
--- a/boards/arm/olimex-stm32-p407/configs/knsh/defconfig
+++ b/boards/arm/olimex-stm32-p407/configs/knsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x08020000
-CONFIG_PASS1_BUILDIR="boards/olimex-stm32-p407/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/olimex-stm32-p407/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=8
diff --git a/boards/arm/open1788/configs/knsh/defconfig b/boards/arm/open1788/configs/knsh/defconfig
index 5081977999..39eea5aeae 100644
--- a/boards/arm/open1788/configs/knsh/defconfig
+++ b/boards/arm/open1788/configs/knsh/defconfig
@@ -44,7 +44,7 @@ CONFIG_NSH_DISABLE_MKRD=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x00040000
-CONFIG_PASS1_BUILDIR="boards/open1788/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/open1788/kernel"
 CONFIG_PIPES=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/open1788/configs/knxterm/defconfig b/boards/arm/open1788/configs/knxterm/defconfig
index 6cc4bc3b8c..eeb756d5c8 100644
--- a/boards/arm/open1788/configs/knxterm/defconfig
+++ b/boards/arm/open1788/configs/knxterm/defconfig
@@ -56,7 +56,7 @@ CONFIG_NXTERM_CURSORCHAR=95
 CONFIG_NXTERM_MXCHARS=512
 CONFIG_NXTERM_NOWRAP=y
 CONFIG_NX_BLOCKING=y
-CONFIG_PASS1_BUILDIR="boards/open1788/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/open1788/kernel"
 CONFIG_PIPES=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
diff --git a/boards/arm/pnev5180b/configs/knsh/defconfig b/boards/arm/pnev5180b/configs/knsh/defconfig
index 82f7068a69..d7bba8b3c2 100644
--- a/boards/arm/pnev5180b/configs/knsh/defconfig
+++ b/boards/arm/pnev5180b/configs/knsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_BUILD_PROTECTED=y
 CONFIG_LPC17_40_UART0=y
 CONFIG_MM_REGIONS=2
 CONFIG_NUTTX_USERSPACE=0x00020000
-CONFIG_PASS1_BUILDIR="boards/pnev5180b/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/pnev5180b/kernel"
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x10000000
 CONFIG_SYSTEM_NSH=y
diff --git a/boards/arm/sam3u-ek/configs/knsh/defconfig b/boards/arm/sam3u-ek/configs/knsh/defconfig
index 50eaa4aa2d..4f5021bab7 100644
--- a/boards/arm/sam3u-ek/configs/knsh/defconfig
+++ b/boards/arm/sam3u-ek/configs/knsh/defconfig
@@ -36,7 +36,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x00090000
-CONFIG_PASS1_BUILDIR="boards/sam3u-ek/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/sam3u-ek/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
diff --git a/boards/arm/samv71-xult/configs/knsh/defconfig b/boards/arm/samv71-xult/configs/knsh/defconfig
index 77e156f98c..3d0a4f9bb1 100644
--- a/boards/arm/samv71-xult/configs/knsh/defconfig
+++ b/boards/arm/samv71-xult/configs/knsh/defconfig
@@ -57,7 +57,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x00500000
-CONFIG_PASS1_BUILDIR="boards/samv71-xult/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/samv71-xult/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=393216
diff --git a/boards/arm/stm3240g-eval/configs/knxwm/defconfig b/boards/arm/stm3240g-eval/configs/knxwm/defconfig
index 5041045d91..24a68b276b 100644
--- a/boards/arm/stm3240g-eval/configs/knxwm/defconfig
+++ b/boards/arm/stm3240g-eval/configs/knxwm/defconfig
@@ -71,7 +71,7 @@ CONFIG_NXWM_TASKBAR_VSPACING=4
 CONFIG_NX_BLOCKING=y
 CONFIG_NX_KBD=y
 CONFIG_NX_XYINPUT_TOUCHSCREEN=y
-CONFIG_PASS1_BUILDIR="boards/stm3240g-eval/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/stm3240g-eval/kernel"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=8
 CONFIG_RAM_SIZE=196608
diff --git a/boards/arm/stm32f4discovery/configs/kostest/defconfig b/boards/arm/stm32f4discovery/configs/kostest/defconfig
index 7e64249ca0..a7c517d6ac 100644
--- a/boards/arm/stm32f4discovery/configs/kostest/defconfig
+++ b/boards/arm/stm32f4discovery/configs/kostest/defconfig
@@ -27,7 +27,7 @@ CONFIG_MM_REGIONS=2
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NUTTX_USERSPACE=0x08020000
-CONFIG_PASS1_BUILDIR="boards/stm32f4discovery/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/stm32f4discovery/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=8
diff --git a/boards/arm/stm32l476vg-disco/configs/knsh/defconfig b/boards/arm/stm32l476vg-disco/configs/knsh/defconfig
index fd9f779ec2..585c93736d 100644
--- a/boards/arm/stm32l476vg-disco/configs/knsh/defconfig
+++ b/boards/arm/stm32l476vg-disco/configs/knsh/defconfig
@@ -48,7 +48,7 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=80
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x08020000
-CONFIG_PASS1_BUILDIR="boards/stm32l476vg-disco/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/stm32l476vg-disco/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=8
diff --git a/boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig b/boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig
index 96559b3305..22f10410f5 100644
--- a/boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig
+++ b/boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig
@@ -49,7 +49,7 @@ CONFIG_NSH_DISABLE_MKRD=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
 CONFIG_NUTTX_USERSPACE=0x08020000
-CONFIG_PASS1_BUILDIR="boards/stm32l4r9ai-disco/kernel"
+CONFIG_PASS1_BUILDIR="boards/arm/stm32l4r9ai-disco/kernel"
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=8
diff --git a/tools/configure.c b/tools/configure.c
index 164578754b..5cfeaa7f46 100644
--- a/tools/configure.c
+++ b/tools/configure.c
@@ -412,6 +412,7 @@ static void parse_args(int argc, char **argv)
     {
       fprintf(stderr, "ERROR: Architecture for board %s not found\n",
               g_boarddir);
+      g_archdir = "unknown";
     }
 }