diff --git a/configs/imxrt1050-evk/scripts/Make.defs b/configs/imxrt1050-evk/scripts/Make.defs
index 7e6ec4db668..b1268ff54f1 100644
--- a/configs/imxrt1050-evk/scripts/Make.defs
+++ b/configs/imxrt1050-evk/scripts/Make.defs
@@ -104,9 +104,9 @@ CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
 
 LDMODULEFLAGS = -r -e module_initialize
 ifeq ($(WINTOOL),y)
-  LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libc/modlib/gnu-elf.ld}"
+  LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
 else
-  LDMODULEFLAGS += -T $(TOPDIR)/libc/modlib/gnu-elf.ld
+  LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
 endif
 
 ASMEXT = .S
diff --git a/configs/samv71-xult/module/defconfig b/configs/samv71-xult/module/defconfig
index 954c52dfd3b..84038b6dd90 100644
--- a/configs/samv71-xult/module/defconfig
+++ b/configs/samv71-xult/module/defconfig
@@ -1,21 +1,20 @@
 # CONFIG_ARCH_RAMFUNCS is not set
-# CONFIG_NSH_CMDOPT_DF_H is not set
 # CONFIG_SAMV7_UART0 is not set
 # CONFIG_SAMV7_UART2 is not set
 # CONFIG_SAMV7_UART4 is not set
-CONFIG_ARCH_BOARD_SAMV71_XULT=y
+CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD="samv71-xult"
+CONFIG_ARCH_BOARD_SAMV71_XULT=y
 CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CHIP_SAMV7=y
 CONFIG_ARCH_CHIP_SAMV71=y
-CONFIG_ARCH_CHIP_SAMV71Q=y
 CONFIG_ARCH_CHIP_SAMV71Q21=y
+CONFIG_ARCH_CHIP_SAMV71Q=y
+CONFIG_ARCH_CHIP_SAMV7=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_IRQBUTTONS=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH="arm"
-CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DCACHE=y
+CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_LAZYFPU=y
 CONFIG_ARMV7M_USEBASEPRI=y
@@ -48,10 +47,10 @@ CONFIG_RAM_SIZE=393216
 CONFIG_RAM_START=0x20400000
 CONFIG_RAW_BINARY=y
 CONFIG_RR_INTERVAL=200
-CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_GPIOA_IRQ=y
 CONFIG_SAMV7_GPIOB_IRQ=y
 CONFIG_SAMV7_GPIOD_IRQ=y
+CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_UART3=y
 CONFIG_SAMV7_XDMAC=y
 CONFIG_SCHED_HPWORK=y
diff --git a/configs/samv71-xult/scripts/Make.defs b/configs/samv71-xult/scripts/Make.defs
index f8066cefb3e..7755e7a89a1 100644
--- a/configs/samv71-xult/scripts/Make.defs
+++ b/configs/samv71-xult/scripts/Make.defs
@@ -104,9 +104,9 @@ CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
 
 LDMODULEFLAGS = -r -e module_initialize
 ifeq ($(WINTOOL),y)
-  LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libc/modlib/gnu-elf.ld}"
+  LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
 else
-  LDMODULEFLAGS += -T $(TOPDIR)/libc/modlib/gnu-elf.ld
+  LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
 endif
 
 ASMEXT = .S