diff --git a/LICENSE b/LICENSE
index 1cdc70e5..46dea464 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018 Western Digital Corporation or its affiliates.
+Copyright (c) 2019 Western Digital Corporation or its affiliates.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
diff --git a/Makefile b/Makefile
index 98238991..b362a56e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 # Current Version
 MAJOR = 0
diff --git a/firmware/external_deps.mk b/firmware/external_deps.mk
index c2e9e905..d2346abc 100644
--- a/firmware/external_deps.mk
+++ b/firmware/external_deps.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 $(build_dir)/$(platform_subdir)/firmware/fw_payload.o: $(FW_PAYLOAD_PATH_FINAL)
 $(build_dir)/$(platform_subdir)/firmware/fw_payload.o: $(FW_PAYLOAD_FDT_PATH)
diff --git a/firmware/fw_base.S b/firmware/fw_base.S
index 5738f57e..63cb64c1 100644
--- a/firmware/fw_base.S
+++ b/firmware/fw_base.S
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/firmware/fw_base.ldS b/firmware/fw_base.ldS
index 52771f8b..84d3758d 100644
--- a/firmware/fw_base.ldS
+++ b/firmware/fw_base.ldS
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 	. = FW_TEXT_START;
diff --git a/firmware/fw_jump.S b/firmware/fw_jump.S
index be9c2967..4b718631 100644
--- a/firmware/fw_jump.S
+++ b/firmware/fw_jump.S
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include "fw_base.S"
diff --git a/firmware/fw_jump.elf.ldS b/firmware/fw_jump.elf.ldS
index 8df45ab1..7ee07870 100644
--- a/firmware/fw_jump.elf.ldS
+++ b/firmware/fw_jump.elf.ldS
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 OUTPUT_ARCH(riscv)
diff --git a/firmware/fw_payload.S b/firmware/fw_payload.S
index 7cbd57b4..4d4db452 100644
--- a/firmware/fw_payload.S
+++ b/firmware/fw_payload.S
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include "fw_base.S"
diff --git a/firmware/fw_payload.elf.ldS b/firmware/fw_payload.elf.ldS
index 7106005b..44fa4c3f 100644
--- a/firmware/fw_payload.elf.ldS
+++ b/firmware/fw_payload.elf.ldS
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 OUTPUT_ARCH(riscv)
diff --git a/firmware/objects.mk b/firmware/objects.mk
index 128834c2..89410f71 100644
--- a/firmware/objects.mk
+++ b/firmware/objects.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 firmware-genflags-y =
 firmware-cppflags-y +=
diff --git a/firmware/payloads/objects.mk b/firmware/payloads/objects.mk
index 03955995..21e0185a 100644
--- a/firmware/payloads/objects.mk
+++ b/firmware/payloads/objects.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 firmware-bins-$(FW_PAYLOAD) += payloads/test.bin
 
diff --git a/firmware/payloads/test.elf.ldS b/firmware/payloads/test.elf.ldS
index d0854d5a..f3f3242a 100644
--- a/firmware/payloads/test.elf.ldS
+++ b/firmware/payloads/test.elf.ldS
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 OUTPUT_ARCH(riscv)
diff --git a/firmware/payloads/test_head.S b/firmware/payloads/test_head.S
index e2b5f7b9..4454e468 100644
--- a/firmware/payloads/test_head.S
+++ b/firmware/payloads/test_head.S
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #define __ASM_STR(x)	x
diff --git a/firmware/payloads/test_main.c b/firmware/payloads/test_main.c
index 957f963f..c96ed872 100644
--- a/firmware/payloads/test_main.c
+++ b/firmware/payloads/test_main.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/sbi_ecall_interface.h>
diff --git a/include/sbi/riscv_asm.h b/include/sbi/riscv_asm.h
index b7a8d4ed..e0710490 100644
--- a/include/sbi/riscv_asm.h
+++ b/include/sbi/riscv_asm.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __RISCV_ASM_H__
diff --git a/include/sbi/riscv_atomic.h b/include/sbi/riscv_atomic.h
index 0fea6bdf..215191ef 100644
--- a/include/sbi/riscv_atomic.h
+++ b/include/sbi/riscv_atomic.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __RISCV_ATOMIC_H__
diff --git a/include/sbi/riscv_barrier.h b/include/sbi/riscv_barrier.h
index 993cbda9..ce4b5d15 100644
--- a/include/sbi/riscv_barrier.h
+++ b/include/sbi/riscv_barrier.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __RISCV_BARRIER_H__
diff --git a/include/sbi/riscv_encoding.h b/include/sbi/riscv_encoding.h
index a6651a15..b441c8ec 100644
--- a/include/sbi/riscv_encoding.h
+++ b/include/sbi/riscv_encoding.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __RISCV_ENCODING_H__
diff --git a/include/sbi/riscv_fp.h b/include/sbi/riscv_fp.h
index 0deb8e4a..71430235 100644
--- a/include/sbi/riscv_fp.h
+++ b/include/sbi/riscv_fp.h
@@ -1,10 +1,10 @@
 /*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __RISCV_FP_H__
diff --git a/include/sbi/riscv_io.h b/include/sbi/riscv_io.h
index 08f1a2f0..ea29c44d 100644
--- a/include/sbi/riscv_io.h
+++ b/include/sbi/riscv_io.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __RISCV_IO_H__
diff --git a/include/sbi/riscv_locks.h b/include/sbi/riscv_locks.h
index 4a683d92..4476319a 100644
--- a/include/sbi/riscv_locks.h
+++ b/include/sbi/riscv_locks.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __RISCV_LOCKS_H__
diff --git a/include/sbi/sbi_bitops.h b/include/sbi/sbi_bitops.h
index c7a6e884..13d4fabe 100644
--- a/include/sbi/sbi_bitops.h
+++ b/include/sbi/sbi_bitops.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Atish Patra<atish.patra@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_BITOPS_H__
diff --git a/include/sbi/sbi_bits.h b/include/sbi/sbi_bits.h
index b9e4a1a7..6dc49fb2 100644
--- a/include/sbi/sbi_bits.h
+++ b/include/sbi/sbi_bits.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_BITS_H__
diff --git a/include/sbi/sbi_console.h b/include/sbi/sbi_console.h
index df258ba6..80696697 100644
--- a/include/sbi/sbi_console.h
+++ b/include/sbi/sbi_console.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_CONSOLE_H__
diff --git a/include/sbi/sbi_const.h b/include/sbi/sbi_const.h
index 3071094b..e90b7523 100644
--- a/include/sbi/sbi_const.h
+++ b/include/sbi/sbi_const.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_CONST_H__
diff --git a/include/sbi/sbi_ecall.h b/include/sbi/sbi_ecall.h
index 4f393292..2425fc5e 100644
--- a/include/sbi/sbi_ecall.h
+++ b/include/sbi/sbi_ecall.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_ECALL_H__
diff --git a/include/sbi/sbi_ecall_interface.h b/include/sbi/sbi_ecall_interface.h
index 1ea26764..2bf004d9 100644
--- a/include/sbi/sbi_ecall_interface.h
+++ b/include/sbi/sbi_ecall_interface.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_ECALL_INTERFACE_H__
diff --git a/include/sbi/sbi_emulate_csr.h b/include/sbi/sbi_emulate_csr.h
index c6fe4198..00d5eff9 100644
--- a/include/sbi/sbi_emulate_csr.h
+++ b/include/sbi/sbi_emulate_csr.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_EMULATE_CSR_H__
diff --git a/include/sbi/sbi_error.h b/include/sbi/sbi_error.h
index 955674ea..68076e73 100644
--- a/include/sbi/sbi_error.h
+++ b/include/sbi/sbi_error.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_ERROR_H__
diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h
index 70416430..8b11df74 100644
--- a/include/sbi/sbi_hart.h
+++ b/include/sbi/sbi_hart.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_HART_H__
diff --git a/include/sbi/sbi_illegal_insn.h b/include/sbi/sbi_illegal_insn.h
index 1b8837fd..2dc09888 100644
--- a/include/sbi/sbi_illegal_insn.h
+++ b/include/sbi/sbi_illegal_insn.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_ILLEGAl_INSN_H__
diff --git a/include/sbi/sbi_init.h b/include/sbi/sbi_init.h
index 7c4267ba..033286f7 100644
--- a/include/sbi/sbi_init.h
+++ b/include/sbi/sbi_init.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_INIT_H__
diff --git a/include/sbi/sbi_ipi.h b/include/sbi/sbi_ipi.h
index 188f84e8..708dd8c1 100644
--- a/include/sbi/sbi_ipi.h
+++ b/include/sbi/sbi_ipi.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_IPI_H__
diff --git a/include/sbi/sbi_misaligned_ldst.h b/include/sbi/sbi_misaligned_ldst.h
index 16419586..c631f763 100644
--- a/include/sbi/sbi_misaligned_ldst.h
+++ b/include/sbi/sbi_misaligned_ldst.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_MISALIGNED_LDST_H__
diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h
index 05e7a7ee..8f4f44be 100644
--- a/include/sbi/sbi_platform.h
+++ b/include/sbi/sbi_platform.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_PLATFORM_H__
diff --git a/include/sbi/sbi_scratch.h b/include/sbi/sbi_scratch.h
index 562f7bb0..e4c648c8 100644
--- a/include/sbi/sbi_scratch.h
+++ b/include/sbi/sbi_scratch.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_SCRATCH_H__
diff --git a/include/sbi/sbi_system.h b/include/sbi/sbi_system.h
index 3aad646a..3e794e2c 100644
--- a/include/sbi/sbi_system.h
+++ b/include/sbi/sbi_system.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_SYSTEM_H__
diff --git a/include/sbi/sbi_timer.h b/include/sbi/sbi_timer.h
index 37e1c795..e40cce9d 100644
--- a/include/sbi/sbi_timer.h
+++ b/include/sbi/sbi_timer.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_TIMER_H__
diff --git a/include/sbi/sbi_trap.h b/include/sbi/sbi_trap.h
index ab94d196..504e7dd7 100644
--- a/include/sbi/sbi_trap.h
+++ b/include/sbi/sbi_trap.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_TRAP_H__
diff --git a/include/sbi/sbi_types.h b/include/sbi/sbi_types.h
index c6cdf18c..9231dff9 100644
--- a/include/sbi/sbi_types.h
+++ b/include/sbi/sbi_types.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_TYPES_H__
diff --git a/include/sbi/sbi_unpriv.h b/include/sbi/sbi_unpriv.h
index 2b925c5e..2da57850 100644
--- a/include/sbi/sbi_unpriv.h
+++ b/include/sbi/sbi_unpriv.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SBI_UNPRIV_H__
diff --git a/lib/objects.mk b/lib/objects.mk
index 2ce6328f..ebee5924 100644
--- a/lib/objects.mk
+++ b/lib/objects.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 lib-objs-y += riscv_asm.o
 lib-objs-y += riscv_atomic.o
diff --git a/lib/riscv_asm.c b/lib/riscv_asm.c
index 4ffd7547..2959a540 100644
--- a/lib/riscv_asm.c
+++ b/lib/riscv_asm.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/lib/riscv_atomic.c b/lib/riscv_atomic.c
index 4a52fc6f..f6d61951 100644
--- a/lib/riscv_atomic.c
+++ b/lib/riscv_atomic.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/sbi_types.h>
diff --git a/lib/riscv_hardfp.S b/lib/riscv_hardfp.S
index 11f3e41e..f363908a 100644
--- a/lib/riscv_hardfp.S
+++ b/lib/riscv_hardfp.S
@@ -1,10 +1,10 @@
 /*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifdef __riscv_flen
diff --git a/lib/riscv_locks.c b/lib/riscv_locks.c
index 0f949867..8b5413e0 100644
--- a/lib/riscv_locks.c
+++ b/lib/riscv_locks.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_barrier.h>
diff --git a/lib/sbi_console.c b/lib/sbi_console.c
index 36a4414a..bc8f9526 100644
--- a/lib/sbi_console.c
+++ b/lib/sbi_console.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/sbi_platform.h>
diff --git a/lib/sbi_ecall.c b/lib/sbi_ecall.c
index 9341ea8c..7f3986d5 100644
--- a/lib/sbi_ecall.c
+++ b/lib/sbi_ecall.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/sbi_console.h>
diff --git a/lib/sbi_emulate_csr.c b/lib/sbi_emulate_csr.c
index d073189b..2918a804 100644
--- a/lib/sbi_emulate_csr.c
+++ b/lib/sbi_emulate_csr.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/lib/sbi_hart.c b/lib/sbi_hart.c
index dfa474c7..ae11a526 100644
--- a/lib/sbi_hart.c
+++ b/lib/sbi_hart.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/lib/sbi_illegal_insn.c b/lib/sbi_illegal_insn.c
index 1bdc7590..3f7f4eac 100644
--- a/lib/sbi_illegal_insn.c
+++ b/lib/sbi_illegal_insn.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/lib/sbi_init.c b/lib/sbi_init.c
index 3e5de514..a806b456 100644
--- a/lib/sbi_init.c
+++ b/lib/sbi_init.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/lib/sbi_ipi.c b/lib/sbi_ipi.c
index 55896b26..316b2a01 100644
--- a/lib/sbi_ipi.c
+++ b/lib/sbi_ipi.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/lib/sbi_misaligned_ldst.c b/lib/sbi_misaligned_ldst.c
index bde96074..77885a4b 100644
--- a/lib/sbi_misaligned_ldst.c
+++ b/lib/sbi_misaligned_ldst.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/lib/sbi_system.c b/lib/sbi_system.c
index 738ff456..7b73aa42 100644
--- a/lib/sbi_system.c
+++ b/lib/sbi_system.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/sbi_hart.h>
diff --git a/lib/sbi_timer.c b/lib/sbi_timer.c
index 0cef98a8..a72c2809 100644
--- a/lib/sbi_timer.c
+++ b/lib/sbi_timer.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/lib/sbi_trap.c b/lib/sbi_trap.c
index c6a6b3fe..4c0f2a94 100644
--- a/lib/sbi_trap.c
+++ b/lib/sbi_trap.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_asm.h>
diff --git a/platform/common/include/plat/irqchip/plic.h b/platform/common/include/plat/irqchip/plic.h
index 79a8e544..6e18440f 100644
--- a/platform/common/include/plat/irqchip/plic.h
+++ b/platform/common/include/plat/irqchip/plic.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __IRQCHIP_PLIC_H__
diff --git a/platform/common/include/plat/serial/sifive-uart.h b/platform/common/include/plat/serial/sifive-uart.h
index b932b166..2c4e7f3d 100644
--- a/platform/common/include/plat/serial/sifive-uart.h
+++ b/platform/common/include/plat/serial/sifive-uart.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SERIAL_SIFIVE_UART_H__
diff --git a/platform/common/include/plat/serial/uart8250.h b/platform/common/include/plat/serial/uart8250.h
index ca19a9f6..c1ffc0d7 100644
--- a/platform/common/include/plat/serial/uart8250.h
+++ b/platform/common/include/plat/serial/uart8250.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SERIAL_UART8250_H__
diff --git a/platform/common/include/plat/string.h b/platform/common/include/plat/string.h
index ab09f4ec..67ad3f24 100644
--- a/platform/common/include/plat/string.h
+++ b/platform/common/include/plat/string.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Atish Patra <atish.patra@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __STRING_H__
diff --git a/platform/common/include/plat/sys/clint.h b/platform/common/include/plat/sys/clint.h
index 7da8aad1..78e12099 100644
--- a/platform/common/include/plat/sys/clint.h
+++ b/platform/common/include/plat/sys/clint.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __SYS_CLINT_H__
diff --git a/platform/common/include/plat/tinyfdt.h b/platform/common/include/plat/tinyfdt.h
index 246243f1..8d21262c 100644
--- a/platform/common/include/plat/tinyfdt.h
+++ b/platform/common/include/plat/tinyfdt.h
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifndef __FDT_H__
diff --git a/platform/common/irqchip/objects.mk b/platform/common/irqchip/objects.mk
index 84fffa60..041834da 100644
--- a/platform/common/irqchip/objects.mk
+++ b/platform/common/irqchip/objects.mk
@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 platform-common-objs-$(PLATFORM_IRQCHIP_PLIC) += irqchip/plic.o
diff --git a/platform/common/irqchip/plic.c b/platform/common/irqchip/plic.c
index ce2aafcd..3a0c93f5 100644
--- a/platform/common/irqchip/plic.c
+++ b/platform/common/irqchip/plic.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_io.h>
diff --git a/platform/common/libc/objects.mk b/platform/common/libc/objects.mk
index 9da0b0e7..1dcfe8e8 100644
--- a/platform/common/libc/objects.mk
+++ b/platform/common/libc/objects.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Atish Patra<atish.patra@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 libc_files = string.o
 
diff --git a/platform/common/libc/string.c b/platform/common/libc/string.c
index 9c094458..7cc0fb7c 100644
--- a/platform/common/libc/string.c
+++ b/platform/common/libc/string.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Atish Patra <atish.patra@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /*
diff --git a/platform/common/libfdt/objects.mk b/platform/common/libfdt/objects.mk
index bd58e30d..e0451507 100644
--- a/platform/common/libfdt/objects.mk
+++ b/platform/common/libfdt/objects.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Atish Patra<atish.patra@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
                fdt_empty_tree.o
diff --git a/platform/common/objects.mk b/platform/common/objects.mk
index b3e06fdf..49e96317 100644
--- a/platform/common/objects.mk
+++ b/platform/common/objects.mk
@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 platform-common-objs-y += tinyfdt.o
diff --git a/platform/common/serial/objects.mk b/platform/common/serial/objects.mk
index cb6062db..67f85b47 100644
--- a/platform/common/serial/objects.mk
+++ b/platform/common/serial/objects.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 platform-common-objs-$(PLATFORM_SERIAL_UART8250) += serial/uart8250.o
 platform-common-objs-$(PLATFORM_SERIAL_SIFIVE_UART) += serial/sifive-uart.o
diff --git a/platform/common/serial/sifive-uart.c b/platform/common/serial/sifive-uart.c
index 60eade3b..2c0e1f1e 100644
--- a/platform/common/serial/sifive-uart.c
+++ b/platform/common/serial/sifive-uart.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_io.h>
diff --git a/platform/common/serial/uart8250.c b/platform/common/serial/uart8250.c
index 7a990459..02eabbe0 100644
--- a/platform/common/serial/uart8250.c
+++ b/platform/common/serial/uart8250.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_io.h>
diff --git a/platform/common/sys/clint.c b/platform/common/sys/clint.c
index a518996b..78ea118c 100644
--- a/platform/common/sys/clint.c
+++ b/platform/common/sys/clint.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_io.h>
diff --git a/platform/common/sys/objects.mk b/platform/common/sys/objects.mk
index 183d8db6..5cb98869 100644
--- a/platform/common/sys/objects.mk
+++ b/platform/common/sys/objects.mk
@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 platform-common-objs-$(PLATFORM_SYS_CLINT) += sys/clint.o
diff --git a/platform/common/tinyfdt.c b/platform/common/tinyfdt.c
index c3bf2100..e83f5406 100644
--- a/platform/common/tinyfdt.c
+++ b/platform/common/tinyfdt.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <plat/string.h>
diff --git a/platform/kendryte/k210/config.mk b/platform/kendryte/k210/config.mk
index 14747c0c..3bc49317 100644
--- a/platform/kendryte/k210/config.mk
+++ b/platform/kendryte/k210/config.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Damien Le Moal <damien.lemoal@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 # Compiler flags
 platform-cppflags-y =
diff --git a/platform/kendryte/k210/k210.dts b/platform/kendryte/k210/k210.dts
index 17f5214f..bcd075bf 100644
--- a/platform/kendryte/k210/k210.dts
+++ b/platform/kendryte/k210/k210.dts
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Damien Le Moal <damien.lemoal@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /dts-v1/;
diff --git a/platform/kendryte/k210/objects.mk b/platform/kendryte/k210/objects.mk
index a8a6e353..1924d7af 100644
--- a/platform/kendryte/k210/objects.mk
+++ b/platform/kendryte/k210/objects.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Damien Le Moal <damien.lemoal@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 platform-objs-y += uarths.o sysctl.o platform.o
 platform-dtb-y += k210.dtb
diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c
index 5c513d4e..f1e19b79 100644
--- a/platform/kendryte/k210/platform.c
+++ b/platform/kendryte/k210/platform.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Damien Le Moal <damien.lemoal@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_encoding.h>
diff --git a/platform/qemu/sifive_u/config.mk b/platform/qemu/sifive_u/config.mk
index 59d3d064..6e2c1932 100644
--- a/platform/qemu/sifive_u/config.mk
+++ b/platform/qemu/sifive_u/config.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 # Compiler flags
 platform-cppflags-y =
diff --git a/platform/qemu/sifive_u/objects.mk b/platform/qemu/sifive_u/objects.mk
index 7e96bad0..c382cbfb 100644
--- a/platform/qemu/sifive_u/objects.mk
+++ b/platform/qemu/sifive_u/objects.mk
@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 platform-objs-y += platform.o
diff --git a/platform/qemu/sifive_u/platform.c b/platform/qemu/sifive_u/platform.c
index 9f3da1c0..e8542f2e 100644
--- a/platform/qemu/sifive_u/platform.c
+++ b/platform/qemu/sifive_u/platform.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_encoding.h>
diff --git a/platform/qemu/virt/config.mk b/platform/qemu/virt/config.mk
index bb162e01..1ee66d0c 100644
--- a/platform/qemu/virt/config.mk
+++ b/platform/qemu/virt/config.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 # Compiler flags
 platform-cppflags-y =
diff --git a/platform/qemu/virt/objects.mk b/platform/qemu/virt/objects.mk
index 7e96bad0..c382cbfb 100644
--- a/platform/qemu/virt/objects.mk
+++ b/platform/qemu/virt/objects.mk
@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Anup Patel <anup.patel@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 platform-objs-y += platform.o
diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c
index 63f4747e..9dfd4d68 100644
--- a/platform/qemu/virt/platform.c
+++ b/platform/qemu/virt/platform.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Anup Patel <anup.patel@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <sbi/riscv_encoding.h>
diff --git a/platform/sifive/fu540/config.mk b/platform/sifive/fu540/config.mk
index ffcbff81..30f64136 100644
--- a/platform/sifive/fu540/config.mk
+++ b/platform/sifive/fu540/config.mk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Atish Patra <atish.patra@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 # Compiler flags
 platform-cppflags-y =
diff --git a/platform/sifive/fu540/objects.mk b/platform/sifive/fu540/objects.mk
index 0a4dfa7e..e0d05853 100644
--- a/platform/sifive/fu540/objects.mk
+++ b/platform/sifive/fu540/objects.mk
@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2019 Western Digital Corporation or its affiliates.
 #
 # Authors:
 #   Atish Patra <atish.patra@wdc.com>
 #
-# SPDX-License-Identifier: BSD-2-Clause
-#
 
 platform-objs-y += platform.o
diff --git a/platform/sifive/fu540/platform.c b/platform/sifive/fu540/platform.c
index 28b86eca..56ca666c 100644
--- a/platform/sifive/fu540/platform.c
+++ b/platform/sifive/fu540/platform.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2018 Western Digital Corporation or its affiliates.
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
  *
  * Authors:
  *   Atish Patra <atish.patra@wdc.com>
- *
- * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <libfdt.h>