diff --git a/boards/Kconfig b/boards/Kconfig
index 5d2efb3ec1..6a63aa24ff 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -3545,6 +3545,9 @@ endif
 if ARCH_CHIP_STM32
 source "boards/arm/stm32/common/Kconfig"
 endif
+if ARCH_CHIP_STM32F0L0G0
+source "boards/arm/stm32f0l0g0/common/Kconfig"
+endif
 if ARCH_CHIP_RP2040
 source "boards/arm/rp2040/common/Kconfig"
 endif
diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Make.defs
similarity index 87%
rename from boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile
rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Make.defs
index 0f20f01396..f28302f576 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile
+# boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -52,4 +52,6 @@ ifeq ($(CONFIG_LCD_SSD1306),y)
 CSRCS += stm32_ssd1306.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/common/Kconfig b/boards/arm/stm32f0l0g0/common/Kconfig
new file mode 100644
index 0000000000..18c7905aed
--- /dev/null
+++ b/boards/arm/stm32f0l0g0/common/Kconfig
@@ -0,0 +1,5 @@
+#
+# 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/arm/stm32f0l0g0/common/Makefile b/boards/arm/stm32f0l0g0/common/Makefile
new file mode 100644
index 0000000000..5d32f28083
--- /dev/null
+++ b/boards/arm/stm32f0l0g0/common/Makefile
@@ -0,0 +1,33 @@
+#############################################################################
+# boards/arm/stm32f0l0g0/common/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+#############################################################################
+
+include $(TOPDIR)/Make.defs
+
+include board/Make.defs
+include src/Make.defs
+
+DEPPATH += --dep-path board
+DEPPATH += --dep-path src
+
+include $(TOPDIR)/boards/Board.mk
+
+ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
+BOARDDIR = $(ARCHSRCDIR)$(DELIM)board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(BOARDDIR)$(DELIM)include)
diff --git a/boards/arm/stm32f0l0g0/common/src/Make.defs b/boards/arm/stm32f0l0g0/common/src/Make.defs
new file mode 100644
index 0000000000..c63421bd7e
--- /dev/null
+++ b/boards/arm/stm32f0l0g0/common/src/Make.defs
@@ -0,0 +1,27 @@
+#############################################################################
+# boards/arm/stm32f0l0g0/common/src/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+#############################################################################
+
+ifeq ($(CONFIG_ARCH_BOARD_COMMON),y)
+
+DEPPATH += --dep-path src
+VPATH += :src
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src)
+
+endif
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Make.defs
similarity index 85%
rename from boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile
rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/Make.defs
index f2a5b8753d..e3629aa7c3 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile
+# boards/arm/stm32f0l0g0/nucleo-f072rb/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -36,4 +36,6 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Make.defs
similarity index 86%
rename from boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile
rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/Make.defs
index 0b841f82db..ef109220d1 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile
+# boards/arm/stm32f0l0g0/nucleo-f091rc/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -44,4 +44,6 @@ ifeq ($(CONFIG_LPWAN_SX127X),y)
 CSRCS += stm32_sx127x.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/Make.defs
similarity index 86%
rename from boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile
rename to boards/arm/stm32f0l0g0/nucleo-g070rb/src/Make.defs
index 5cc2eb0e22..4c94665f99 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile
+++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/nucleo-g070rb/src/Makefile
+# boards/arm/stm32f0l0g0/nucleo-g070rb/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -48,4 +48,6 @@ ifeq ($(CONFIG_TIMER),y)
 CSRCS += stm32_timer.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Make.defs
similarity index 85%
rename from boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile
rename to boards/arm/stm32f0l0g0/nucleo-g071rb/src/Make.defs
index 80efb272d9..10e8a05707 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile
+++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile
+# boards/arm/stm32f0l0g0/nucleo-g071rb/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -36,4 +36,6 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Make.defs
similarity index 87%
rename from boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile
rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/Make.defs
index d5b7529c30..30a7cf8339 100644
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile
+# boards/arm/stm32f0l0g0/nucleo-l073rz/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -52,4 +52,6 @@ ifeq ($(CONFIG_CL_MFRC522),y)
 CSRCS += stm32_mfrc522.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Make.defs
similarity index 86%
rename from boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile
rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/Make.defs
index 7c1d8ee7d8..50682a4f63 100644
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile
+# boards/arm/stm32f0l0g0/stm32f051-discovery/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -48,4 +48,6 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Make.defs
similarity index 86%
rename from boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile
rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/Make.defs
index 888aed933b..b649f06d54 100644
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile
+# boards/arm/stm32f0l0g0/stm32f072-discovery/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -48,4 +48,6 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/stm32g071b-disco/src/Makefile b/boards/arm/stm32f0l0g0/stm32g071b-disco/src/Make.defs
similarity index 84%
rename from boards/arm/stm32f0l0g0/stm32g071b-disco/src/Makefile
rename to boards/arm/stm32f0l0g0/stm32g071b-disco/src/Make.defs
index 76f9124adf..248e31ba27 100644
--- a/boards/arm/stm32f0l0g0/stm32g071b-disco/src/Makefile
+++ b/boards/arm/stm32f0l0g0/stm32g071b-disco/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/stm32g071b-disco/src/Makefile
+# boards/arm/stm32f0l0g0/stm32g071b-disco/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -35,4 +35,6 @@ ifeq ($(CONFIG_INPUT_DJOYSTICK),y)
 CSRCS += stm32_djoystick.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)
diff --git a/boards/arm/stm32f0l0g0/stm32l0538-disco/src/Makefile b/boards/arm/stm32f0l0g0/stm32l0538-disco/src/Make.defs
similarity index 84%
rename from boards/arm/stm32f0l0g0/stm32l0538-disco/src/Makefile
rename to boards/arm/stm32f0l0g0/stm32l0538-disco/src/Make.defs
index 4a3cbb6dc1..34a6d714a9 100644
--- a/boards/arm/stm32f0l0g0/stm32l0538-disco/src/Makefile
+++ b/boards/arm/stm32f0l0g0/stm32l0538-disco/src/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/stm32f0l0g0/stm32l0538-disco/src/Makefile
+# boards/arm/stm32f0l0g0/stm32l0538-disco/src/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -36,4 +36,6 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+DEPPATH += --dep-path board
+VPATH += :board
+CFLAGS += $(shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board)