diff --git a/bsps/riscv/niosv/cache/alt_cache.c b/bsps/riscv/niosv/cache/alt_cache.c
index def707ddb3..d499c8b686 100644
--- a/bsps/riscv/niosv/cache/alt_cache.c
+++ b/bsps/riscv/niosv/cache/alt_cache.c
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2024 Kevin Kirspel
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/bsps/riscv/niosv/clock/clockdrv.c b/bsps/riscv/niosv/clock/clockdrv.c
index 71298cae85..cc37b66628 100644
--- a/bsps/riscv/niosv/clock/clockdrv.c
+++ b/bsps/riscv/niosv/clock/clockdrv.c
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2024 Kevin Kirspel
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/bsps/riscv/niosv/include/alt_cache.h b/bsps/riscv/niosv/include/alt_cache.h
index 6b1a17850d..c7deb06375 100644
--- a/bsps/riscv/niosv/include/alt_cache.h
+++ b/bsps/riscv/niosv/include/alt_cache.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2024 Kevin Kirspel
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/bsps/riscv/niosv/irq/irq.c b/bsps/riscv/niosv/irq/irq.c
index 91f28284a0..89fdfdb290 100644
--- a/bsps/riscv/niosv/irq/irq.c
+++ b/bsps/riscv/niosv/irq/irq.c
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2024 Kevin Kirspel
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/bsps/riscv/niosv/niosvc10lp/bspstart.c b/bsps/riscv/niosv/niosvc10lp/bspstart.c
index 6c8430f9f4..6ae1355bcf 100644
--- a/bsps/riscv/niosv/niosvc10lp/bspstart.c
+++ b/bsps/riscv/niosv/niosvc10lp/bspstart.c
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2024 Kevin Kirspel
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/bsps/riscv/niosv/start/bsp_fatal_halt.c b/bsps/riscv/niosv/start/bsp_fatal_halt.c
index b5dd4468a8..e77cd09e14 100644
--- a/bsps/riscv/niosv/start/bsp_fatal_halt.c
+++ b/bsps/riscv/niosv/start/bsp_fatal_halt.c
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2024 Kevin Kirspel
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/bsps/riscv/riscv/console/fe310-uart.c b/bsps/riscv/riscv/console/fe310-uart.c
index ddabcff4c8..ef3efcef68 100644
--- a/bsps/riscv/riscv/console/fe310-uart.c
+++ b/bsps/riscv/riscv/console/fe310-uart.c
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (c) 2019 Pragnesh Patel <pragnesh.patel@sifive.com>
  * Copyright (c) 2019 Sachin Ghadi <sachin.ghadi@sifive.com>
  *
diff --git a/bsps/riscv/riscv/include/bsp/fe310-uart.h b/bsps/riscv/riscv/include/bsp/fe310-uart.h
index c6c6fcb876..7bcf444cef 100644
--- a/bsps/riscv/riscv/include/bsp/fe310-uart.h
+++ b/bsps/riscv/riscv/include/bsp/fe310-uart.h
@@ -1,6 +1,6 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
- * SPDX-License-Identifier: BSD-2-Clause
- *
  * Copyright (C) 2019 Pragnesh Patel <pragnesh.patel@sifive.com>
  * Copyright (c) 2019 Sachin Ghadi <sachin.ghadi@sifive.com>
  *