6 files changed, 8 insertions, 14 deletions
diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h
index 6d08f5df98..e98cb46c90 100644
--- a/include/u-boot/crc.h
+++ b/include/u-boot/crc.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _UBOOT_CRC_H
diff --git a/include/u-boot/rsa-checksum.h b/include/u-boot/rsa-checksum.h
index c240720249..02b814d34e 100644
--- a/include/u-boot/rsa-checksum.h
+++ b/include/u-boot/rsa-checksum.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2013, Andreas Oetken.
- *
- * SPDX-License-Identifier:    GPL-2.0+
-*/
+ */
 
 #ifndef _RSA_CHECKSUM_H
 #define _RSA_CHECKSUM_H
diff --git a/include/u-boot/rsa-mod-exp.h b/include/u-boot/rsa-mod-exp.h
index 45a031b4b6..3253614ede 100644
--- a/include/u-boot/rsa-mod-exp.h
+++ b/include/u-boot/rsa-mod-exp.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2014 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
-*/
+ */
 
 #ifndef _RSA_MOD_EXP_H
 #define _RSA_MOD_EXP_H
diff --git a/include/u-boot/rsa.h b/include/u-boot/rsa.h
index 0e96c38711..68bcb14c74 100644
--- a/include/u-boot/rsa.h
+++ b/include/u-boot/rsa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2013, Google Inc.
  *
@@ -5,8 +6,6 @@
  *
  * (C) Copyright 2000-2006
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef _RSA_H
diff --git a/include/u-boot/sha1.h b/include/u-boot/sha1.h
index 2634a29c20..283f103293 100644
--- a/include/u-boot/sha1.h
+++ b/include/u-boot/sha1.h
@@ -1,11 +1,10 @@
+/* SPDX-License-Identifier: LGPL-2.1 */
 /**
  * \file sha1.h
  * based from http://xyssl.org/code/source/sha1/
  *  FIPS-180-1 compliant SHA-1 implementation
  *
  *  Copyright (C) 2003-2006  Christophe Devine
- *
- * SPDX-License-Identifier:	LGPL-2.1
  */
 /*
  *  The SHA-1 standard was published by NIST in 1993.
diff --git a/include/u-boot/variadic-macro.h b/include/u-boot/variadic-macro.h
index 922beafcea..cb815d0fee 100644
--- a/include/u-boot/variadic-macro.h
+++ b/include/u-boot/variadic-macro.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Helper for work with variadic macros
  *
  * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef __VARIADIC_MACRO_H__