diff --git a/arch/arm/src/stm32u5/CMakeLists.txt b/arch/arm/src/stm32u5/CMakeLists.txt
index d034144d899..a84f3aca8b5 100644
--- a/arch/arm/src/stm32u5/CMakeLists.txt
+++ b/arch/arm/src/stm32u5/CMakeLists.txt
@@ -25,6 +25,7 @@ set(SRCS
     stm32_irq.c
     stm32_lowputc.c
     stm32_rcc.c
+    stm32_i2c.c
     stm32_serial.c
     stm32_start.c
     stm32_waste.c
@@ -32,6 +33,7 @@ set(SRCS
     stm32_spi.c
     stm32_lse.c
     stm32_lsi.c
+    stm32u5xx_rcc.c
     stm32_pwr.c
     stm32_tim.c
     stm32_flash.c
@@ -53,8 +55,8 @@ if(CONFIG_DEBUG_FEATURES)
   list(APPEND SRCS stm32_dumpgpio.c)
 endif()
 
-if(CONFIG_STM32U5_STM32U585XX)
-  list(APPEND SRCS stm32u585xx_rcc.c)
+if(CONFIG_USBDEV)
+  list(APPEND SRCS stm32_otgdev.c)
 endif()
 
 target_sources(arch PRIVATE ${SRCS})
diff --git a/boards/arm/stm32u5/nucleo-u5a5zj-q/CMakeLists.txt b/boards/arm/stm32u5/nucleo-u5a5zj-q/CMakeLists.txt
new file mode 100644
index 00000000000..1168a509fb5
--- /dev/null
+++ b/boards/arm/stm32u5/nucleo-u5a5zj-q/CMakeLists.txt
@@ -0,0 +1,21 @@
+# ##############################################################################
+# boards/arm/stm32u5/nucleo-u5a5zj-q/CMakeLists.txt
+#
+# 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.
+#
+# ##############################################################################
+
+add_subdirectory(src)
diff --git a/boards/arm/stm32u5/nucleo-u5a5zj-q/src/CMakeLists.txt b/boards/arm/stm32u5/nucleo-u5a5zj-q/src/CMakeLists.txt
new file mode 100644
index 00000000000..b60ca95d09e
--- /dev/null
+++ b/boards/arm/stm32u5/nucleo-u5a5zj-q/src/CMakeLists.txt
@@ -0,0 +1,34 @@
+# ##############################################################################
+# boards/arm/stm32u5/nucleo-u5a5zj-q/src/CMakeLists.txt
+#
+# 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.
+#
+# ##############################################################################
+
+set(SRCS stm32_boot.c stm32_bringup.c stm32_spi.c)
+
+if(CONFIG_BOARDCTL)
+  list(APPEND SRCS stm32_appinit.c)
+endif()
+
+if(CONFIG_ARCH_BOARD_STM32U5_CUSTOM_CLOCKCONFIG)
+  list(APPEND SRCS stm32_clockconfig.c)
+endif()
+
+target_sources(board PRIVATE ${SRCS})
+
+# TODO: make this the default and then allow boards to redefine
+set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/flash.ld")