diff --git a/bsps/aarch64/xilinx-versal/dev/serial/versal-uart.c b/bsps/aarch64/xilinx-versal/dev/serial/versal-uart.c
index 63beda4cb2..c5cc132381 100644
--- a/bsps/aarch64/xilinx-versal/dev/serial/versal-uart.c
+++ b/bsps/aarch64/xilinx-versal/dev/serial/versal-uart.c
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2022 Chris Johns <chris@contemporary.software>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/bsps/aarch64/xilinx-versal/include/bsp/i2c.h b/bsps/aarch64/xilinx-versal/include/bsp/i2c.h
index 116f8dd0cb..6d0a9ad2c8 100644
--- a/bsps/aarch64/xilinx-versal/include/bsp/i2c.h
+++ b/bsps/aarch64/xilinx-versal/include/bsp/i2c.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2022 Chris Johns <chris@contemporary.software>
  * Copyright (C) 2014 embedded brains GmbH & Co. KG
  *
diff --git a/bsps/aarch64/xilinx-zynqmp/include/bsp/i2c.h b/bsps/aarch64/xilinx-zynqmp/include/bsp/i2c.h
index f79006b94c..4bc993ec31 100644
--- a/bsps/aarch64/xilinx-zynqmp/include/bsp/i2c.h
+++ b/bsps/aarch64/xilinx-zynqmp/include/bsp/i2c.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2021 On-Line Applications Research (OAR)
  * Copyright (C) 2014 embedded brains GmbH & Co. KG
  *
diff --git a/bsps/aarch64/xilinx-zynqmp/include/bsp/jffs2_xnandpsu.h b/bsps/aarch64/xilinx-zynqmp/include/bsp/jffs2_xnandpsu.h
index 6b55e50b2b..2f36a8e0da 100644
--- a/bsps/aarch64/xilinx-zynqmp/include/bsp/jffs2_xnandpsu.h
+++ b/bsps/aarch64/xilinx-zynqmp/include/bsp/jffs2_xnandpsu.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2023 On-Line Applications Research Corporation (OAR)
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/bsps/aarch64/xilinx-zynqmp/jffs2_xnandpsu.c b/bsps/aarch64/xilinx-zynqmp/jffs2_xnandpsu.c
index 3fa70cc0c3..69d0306bff 100644
--- a/bsps/aarch64/xilinx-zynqmp/jffs2_xnandpsu.c
+++ b/bsps/aarch64/xilinx-zynqmp/jffs2_xnandpsu.c
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2023 On-Line Applications Research Corporation (OAR)
  *
  * Redistribution and use in source and binary forms, with or without