[doc] Update Licence Headers to fit agreed style

This commit primarily fixes typos in existing licence headers, or
changes the comment style of existing headers to be compatible with the
licence checker.

This commit does add licence headers to some files, where they were
missing before.

Signed-off-by: Sam Elliott <selliott@lowrisc.org>
diff --git a/ci/azp-private.yml b/ci/azp-private.yml
index 0a55f2a..4657e39 100644
--- a/ci/azp-private.yml
+++ b/ci/azp-private.yml
@@ -1,3 +1,7 @@
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+#
 # Private CI trigger.  Used to run tooling that can't currently be shared
 # publicly.
 
diff --git a/ci/run-riscv-compliance.yml b/ci/run-riscv-compliance.yml
index bcd9114..57c1ecb 100644
--- a/ci/run-riscv-compliance.yml
+++ b/ci/run-riscv-compliance.yml
@@ -1,3 +1,7 @@
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
 parameters:
   rvc_test_suites: []
 
diff --git a/hw/Makefile b/hw/Makefile
index 5fd3742..7d686eb 100644
--- a/hw/Makefile
+++ b/hw/Makefile
@@ -1,3 +1,7 @@
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
 CUR_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 PRJ_DIR := $(realpath ${CUR_DIR}/../)
 export PRJ_DIR
diff --git a/hw/dv/data/tests/csr_tests.hjson b/hw/dv/data/tests/csr_tests.hjson
index dde6401..6f1f648 100644
--- a/hw/dv/data/tests/csr_tests.hjson
+++ b/hw/dv/data/tests/csr_tests.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   run_modes: [
     {
diff --git a/hw/dv/data/tests/intr_test.hjson b/hw/dv/data/tests/intr_test.hjson
index 982e959..92c1293 100644
--- a/hw/dv/data/tests/intr_test.hjson
+++ b/hw/dv/data/tests/intr_test.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   tests: [
     {
diff --git a/hw/dv/data/tests/mem_tests.hjson b/hw/dv/data/tests/mem_tests.hjson
index e758199..04f942a 100644
--- a/hw/dv/data/tests/mem_tests.hjson
+++ b/hw/dv/data/tests/mem_tests.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   run_modes: [
     {
diff --git a/hw/dv/data/tests/stress_tests.hjson b/hw/dv/data/tests/stress_tests.hjson
index ab8db39..58b74a8 100644
--- a/hw/dv/data/tests/stress_tests.hjson
+++ b/hw/dv/data/tests/stress_tests.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   tests: [
     {
diff --git a/hw/dv/data/tests/tl_access_tests.hjson b/hw/dv/data/tests/tl_access_tests.hjson
index d551045..1930aae 100644
--- a/hw/dv/data/tests/tl_access_tests.hjson
+++ b/hw/dv/data/tests/tl_access_tests.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   tests: [
     {
diff --git a/hw/dv/sv/scoreboard/scoreboard.sv b/hw/dv/sv/scoreboard/scoreboard.sv
index 829238a..4601e1e 100644
--- a/hw/dv/sv/scoreboard/scoreboard.sv
+++ b/hw/dv/sv/scoreboard/scoreboard.sv
@@ -1,4 +1,4 @@
-// Copyright 2018 lowRISC contributors.
+// Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
diff --git a/hw/dv/sv/scoreboard/scoreboard_pkg.sv b/hw/dv/sv/scoreboard/scoreboard_pkg.sv
index 8afa9e6..cbf61f3 100644
--- a/hw/dv/sv/scoreboard/scoreboard_pkg.sv
+++ b/hw/dv/sv/scoreboard/scoreboard_pkg.sv
@@ -1,4 +1,4 @@
-// Copyright 2018 lowRISC contributors.
+// Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
diff --git a/hw/dv/sv/scoreboard/scoreboard_queue.sv b/hw/dv/sv/scoreboard/scoreboard_queue.sv
index 4baeda3..3a52ce3 100644
--- a/hw/dv/sv/scoreboard/scoreboard_queue.sv
+++ b/hw/dv/sv/scoreboard/scoreboard_queue.sv
@@ -1,4 +1,4 @@
-// Copyright 2018 lowRISC contributors.
+// Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
diff --git a/hw/ip/aes/model/Makefile b/hw/ip/aes/model/Makefile
index c7c1423..705e928 100644
--- a/hw/ip/aes/model/Makefile
+++ b/hw/ip/aes/model/Makefile
@@ -1,3 +1,7 @@
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
 BORING_SSL_PATH=../boringssl
 
 NAME=aes_example aes_modes
diff --git a/hw/ip/alert_handler/data/alert_handler_env_pkg__params.sv.tpl b/hw/ip/alert_handler/data/alert_handler_env_pkg__params.sv.tpl
index a8273e1..372d7fc 100644
--- a/hw/ip/alert_handler/data/alert_handler_env_pkg__params.sv.tpl
+++ b/hw/ip/alert_handler/data/alert_handler_env_pkg__params.sv.tpl
@@ -1,2 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+
 parameter uint NUM_ALERTS = ${n_alerts};
 parameter bit [NUM_ALERTS-1:0] ASYNC_ON = ${async_on};
diff --git a/hw/ip/clkmgr/data/clkmgr_pkg.sv.tpl b/hw/ip/clkmgr/data/clkmgr_pkg.sv.tpl
index 62ca076..5944585 100644
--- a/hw/ip/clkmgr/data/clkmgr_pkg.sv.tpl
+++ b/hw/ip/clkmgr/data/clkmgr_pkg.sv.tpl
@@ -1,3 +1,7 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+
 <%
 clks_attr = cfg['clocks']
 grps = clks_attr['groups']
diff --git a/hw/ip/clkmgr/rtl/clkmgr_pkg.sv b/hw/ip/clkmgr/rtl/clkmgr_pkg.sv
index aa7acf8..b699fac 100644
--- a/hw/ip/clkmgr/rtl/clkmgr_pkg.sv
+++ b/hw/ip/clkmgr/rtl/clkmgr_pkg.sv
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 
 
 package clkmgr_pkg;
diff --git a/hw/ip/entropy_src/rtl/entropy_src_pkg.sv b/hw/ip/entropy_src/rtl/entropy_src_pkg.sv
index 6bb24a7..cd45ab0 100755
--- a/hw/ip/entropy_src/rtl/entropy_src_pkg.sv
+++ b/hw/ip/entropy_src/rtl/entropy_src_pkg.sv
@@ -1,5 +1,5 @@
 // Copyright lowRISC contributors.
-// Licensed under the Apache License; Version 2.0; see LICENSE for details.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 //
 
diff --git a/hw/ip/gpio/data/gpio_testplan.hjson b/hw/ip/gpio/data/gpio_testplan.hjson
index ee4aad0..ea3901d 100644
--- a/hw/ip/gpio/data/gpio_testplan.hjson
+++ b/hw/ip/gpio/data/gpio_testplan.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "gpio"
   import_testplans: ["hw/dv/tools/testplans/csr_testplan.hjson",
diff --git a/hw/ip/gpio/dv/cov/gpio_cov_excl.el b/hw/ip/gpio/dv/cov/gpio_cov_excl.el
index 4362fb8..3ef271f 100644
--- a/hw/ip/gpio/dv/cov/gpio_cov_excl.el
+++ b/hw/ip/gpio/dv/cov/gpio_cov_excl.el
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 //==================================================
 // This file contains the Excluded objects
 // Generated By User: gaurangg
diff --git a/hw/ip/hmac/data/hmac_testplan.hjson b/hw/ip/hmac/data/hmac_testplan.hjson
index f945f8b..b81a2d5 100644
--- a/hw/ip/hmac/data/hmac_testplan.hjson
+++ b/hw/ip/hmac/data/hmac_testplan.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "hmac"
   import_testplans: ["hw/dv/tools/testplans/csr_testplan.hjson",
diff --git a/hw/ip/hmac/dv/cov/hmac_cov_excl.el b/hw/ip/hmac/dv/cov/hmac_cov_excl.el
index 9f1a821..ec1e19a 100644
--- a/hw/ip/hmac/dv/cov/hmac_cov_excl.el
+++ b/hw/ip/hmac/dv/cov/hmac_cov_excl.el
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 //==================================================
 // This file contains the Excluded objects
 // Generated By User: chencindy
diff --git a/hw/ip/hmac/model/run_test.sh b/hw/ip/hmac/model/run_test.sh
index 95a13de..603487c 100755
--- a/hw/ip/hmac/model/run_test.sh
+++ b/hw/ip/hmac/model/run_test.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+#
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
 echo '' | ./hmac_model.py -v -k DEADBEEF
 ./hmac_model.py -k DEADBEEF -v message.dat
 
diff --git a/hw/ip/padctrl/data/padctrl_fpv_testplan.hjson b/hw/ip/padctrl/data/padctrl_fpv_testplan.hjson
index f47f3e3..2391f75 100644
--- a/hw/ip/padctrl/data/padctrl_fpv_testplan.hjson
+++ b/hw/ip/padctrl/data/padctrl_fpv_testplan.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "padctrl"
   import_testplans: ["hw/dv/tools/testplans/fpv_csr_testplan.hjson"]
diff --git a/hw/ip/pinmux/data/pinmux_fpv_testplan.hjson b/hw/ip/pinmux/data/pinmux_fpv_testplan.hjson
index 5001667..f17c986 100644
--- a/hw/ip/pinmux/data/pinmux_fpv_testplan.hjson
+++ b/hw/ip/pinmux/data/pinmux_fpv_testplan.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "pinmux"
   import_testplans: ["hw/dv/tools/testplans/fpv_csr_testplan.hjson"]
diff --git a/hw/ip/prim/dv/prim_present/prim_present_testplan.hjson b/hw/ip/prim/dv/prim_present/prim_present_testplan.hjson
index dda6bef..9ff6328 100644
--- a/hw/ip/prim/dv/prim_present/prim_present_testplan.hjson
+++ b/hw/ip/prim/dv/prim_present/prim_present_testplan.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "prim_present"
   import_testplans: []
diff --git a/hw/ip/prim/rtl/prim_filter.sv b/hw/ip/prim/rtl/prim_filter.sv
index 214e0c3..876e11d 100644
--- a/hw/ip/prim/rtl/prim_filter.sv
+++ b/hw/ip/prim/rtl/prim_filter.sv
@@ -1,6 +1,6 @@
-// Copyright 2018 lowRISC contributors.
+// Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Indentifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0
 //
 // Primitive input filter, with enable.  Configurable number of cycles.
 //
diff --git a/hw/ip/prim/rtl/prim_filter_ctr.sv b/hw/ip/prim/rtl/prim_filter_ctr.sv
index 941ad27..ec635b8 100644
--- a/hw/ip/prim/rtl/prim_filter_ctr.sv
+++ b/hw/ip/prim/rtl/prim_filter_ctr.sv
@@ -1,6 +1,6 @@
-// Copyright 2018 lowRISC contributors.
+// Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Indentifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0
 //
 // Primitive counter-based input filter, with enable.
 // Configurable number of cycles. Cheaper version of filter for
diff --git a/hw/ip/prim/rtl/prim_intr_hw.sv b/hw/ip/prim/rtl/prim_intr_hw.sv
index 950c337..6198b31 100644
--- a/hw/ip/prim/rtl/prim_intr_hw.sv
+++ b/hw/ip/prim/rtl/prim_intr_hw.sv
@@ -1,6 +1,6 @@
 // Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Indentifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0
 //
 // Primitive interrupt handler. This assumes the existence of three
 // controller registers: INTR_ENABLE, INTR_STATE, INTR_TEST.
diff --git a/hw/ip/rstmgr/rtl/rstmgr_pkg.sv b/hw/ip/rstmgr/rtl/rstmgr_pkg.sv
index df797ee..a07fcce 100644
--- a/hw/ip/rstmgr/rtl/rstmgr_pkg.sv
+++ b/hw/ip/rstmgr/rtl/rstmgr_pkg.sv
@@ -1,3 +1,7 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+
 package rstmgr_pkg;
 
   // global constants
diff --git a/hw/ip/rv_core_ibex/data/rv_core_ibex_testplan.hjson b/hw/ip/rv_core_ibex/data/rv_core_ibex_testplan.hjson
index 80d6485..ea3c894 100644
--- a/hw/ip/rv_core_ibex/data/rv_core_ibex_testplan.hjson
+++ b/hw/ip/rv_core_ibex/data/rv_core_ibex_testplan.hjson
@@ -1,5 +1,5 @@
 // Copyright lowRISC contributors.
-// Licensed under the Apache License, Versio 2.0, see LICENSE for details.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 {
   name: "rv_core_ibex"
diff --git a/hw/ip/rv_plic/data/rv_plic_fpv_testplan.hjson b/hw/ip/rv_plic/data/rv_plic_fpv_testplan.hjson
index 9aaca44..4c6cf93 100644
--- a/hw/ip/rv_plic/data/rv_plic_fpv_testplan.hjson
+++ b/hw/ip/rv_plic/data/rv_plic_fpv_testplan.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "rv_plic"
   import_testplans: ["hw/dv/tools/testplans/fpv_csr_testplan.hjson"]
diff --git a/hw/ip/rv_timer/data/rv_timer_testplan.hjson b/hw/ip/rv_timer/data/rv_timer_testplan.hjson
index 14f12dc..9f1cd0d 100644
--- a/hw/ip/rv_timer/data/rv_timer_testplan.hjson
+++ b/hw/ip/rv_timer/data/rv_timer_testplan.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "rv_timer"
   import_testplans: ["hw/dv/tools/testplans/csr_testplan.hjson",
diff --git a/hw/ip/tlul/generic_dv/tests/xbar_test_pkg.sv b/hw/ip/tlul/generic_dv/tests/xbar_test_pkg.sv
index 927e4eb..8726e07 100644
--- a/hw/ip/tlul/generic_dv/tests/xbar_test_pkg.sv
+++ b/hw/ip/tlul/generic_dv/tests/xbar_test_pkg.sv
@@ -1,4 +1,4 @@
-// Copyright 2018 lowRISC contributors.
+// Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
diff --git a/hw/ip/usbuart/rtl/usb_serial_ctrl_ep.sv b/hw/ip/usbuart/rtl/usb_serial_ctrl_ep.sv
index d619fe7..7d37f09 100644
--- a/hw/ip/usbuart/rtl/usb_serial_ctrl_ep.sv
+++ b/hw/ip/usbuart/rtl/usb_serial_ctrl_ep.sv
@@ -1,3 +1,8 @@
+// Copyright lowRISC contributors.
+// Copyright Luke Valenty (TinyFPGA project)
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+//
 // Converted from common/usb_serial_ctrl_ep.v
 // -- move from CDC to Google simple serial protocol
 // -- conform to lowRISC coding style
diff --git a/hw/ip/usbuart/rtl/usb_serial_fifo_ep.sv b/hw/ip/usbuart/rtl/usb_serial_fifo_ep.sv
index 9529752..a0d8ff8 100644
--- a/hw/ip/usbuart/rtl/usb_serial_fifo_ep.sv
+++ b/hw/ip/usbuart/rtl/usb_serial_fifo_ep.sv
@@ -1,3 +1,8 @@
+// Copyright lowRISC contributors.
+// Copyright Luke Valenty (TinyFPGA project)
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+
 module usb_serial_fifo_ep  #(
   parameter int unsigned MaxPktSizeByte = 32,
 
diff --git a/hw/top_earlgrey/data/standalone_sw_testplan.hjson b/hw/top_earlgrey/data/standalone_sw_testplan.hjson
index df002ad..1fcd48d 100644
--- a/hw/top_earlgrey/data/standalone_sw_testplan.hjson
+++ b/hw/top_earlgrey/data/standalone_sw_testplan.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "self-contained-tests"
 
diff --git a/hw/top_earlgrey/data/xbar_main.hjson b/hw/top_earlgrey/data/xbar_main.hjson
index 4042092..65018fa 100644
--- a/hw/top_earlgrey/data/xbar_main.hjson
+++ b/hw/top_earlgrey/data/xbar_main.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 { name: "main",
   type: "xbar",
   clock_primary: "clk_main_i", // Main clock, used in sockets
diff --git a/hw/top_earlgrey/data/xbar_peri.hjson b/hw/top_earlgrey/data/xbar_peri.hjson
index 9ab6308..6dd38e2 100644
--- a/hw/top_earlgrey/data/xbar_peri.hjson
+++ b/hw/top_earlgrey/data/xbar_peri.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 { name: "peri",
   type: "xbar",
   clock_primary: "clk_peri_i", // Main clock, used in sockets
diff --git a/hw/top_earlgrey/ip/xbar_main/dv/cov/xbar_cov_excl.el b/hw/top_earlgrey/ip/xbar_main/dv/cov/xbar_cov_excl.el
index 6487b56..6c54be2 100644
--- a/hw/top_earlgrey/ip/xbar_main/dv/cov/xbar_cov_excl.el
+++ b/hw/top_earlgrey/ip/xbar_main/dv/cov/xbar_cov_excl.el
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 //==================================================
 // This file contains the Excluded objects
 // Generated By User: weicai
diff --git a/hw/top_earlgrey/ip/xbar_peri/dv/cov/xbar_cov_excl.el b/hw/top_earlgrey/ip/xbar_peri/dv/cov/xbar_cov_excl.el
index da89376..8b70dd8 100644
--- a/hw/top_earlgrey/ip/xbar_peri/dv/cov/xbar_cov_excl.el
+++ b/hw/top_earlgrey/ip/xbar_peri/dv/cov/xbar_cov_excl.el
@@ -1 +1,5 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+
 // TODO, need to add coverage exclusion
diff --git a/meson_options.txt b/meson_options.txt
index 73ef890..e8bfeda 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,7 @@
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
 option(
   'dev_bin_dir',
   type: 'string',
diff --git a/sw/device/boot_rom2/boot_rom.c b/sw/device/boot_rom2/boot_rom.c
index d71cd11..5787be5 100644
--- a/sw/device/boot_rom2/boot_rom.c
+++ b/sw/device/boot_rom2/boot_rom.c
@@ -1,6 +1,6 @@
 // Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0`
+// SPDX-License-Identifier: Apache-2.0
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/sw/device/boot_rom2/uart_log.c b/sw/device/boot_rom2/uart_log.c
index 796115b..5c695a6 100644
--- a/sw/device/boot_rom2/uart_log.c
+++ b/sw/device/boot_rom2/uart_log.c
@@ -1,6 +1,6 @@
 // Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0`
+// SPDX-License-Identifier: Apache-2.0
 
 #include "sw/device/boot_rom2/uart_log.h"
 
diff --git a/sw/device/boot_rom2/uart_log.h b/sw/device/boot_rom2/uart_log.h
index ea04a13..444b06f 100644
--- a/sw/device/boot_rom2/uart_log.h
+++ b/sw/device/boot_rom2/uart_log.h
@@ -1,6 +1,6 @@
 // Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0`
+// SPDX-License-Identifier: Apache-2.0
 
 #ifndef OPENTITAN_SW_DEVICE_BOOT_ROM2_UART_LOG_H_
 #define OPENTITAN_SW_DEVICE_BOOT_ROM2_UART_LOG_H_
diff --git a/sw/device/lib/runtime/check.h b/sw/device/lib/runtime/check.h
index 8ece6df..413a912 100644
--- a/sw/device/lib/runtime/check.h
+++ b/sw/device/lib/runtime/check.h
@@ -1,6 +1,6 @@
 // Copyright lowRISC contributors.
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0`
+// SPDX-License-Identifier: Apache-2.0
 
 #ifndef OPENTITAN_SW_DEVICE_LIB_RUNTIME_CHECK_H_
 #define OPENTITAN_SW_DEVICE_LIB_RUNTIME_CHECK_H_
diff --git a/sw/device/tock/dif/Cargo.toml b/sw/device/tock/dif/Cargo.toml
index a8c723f..605cc3a 100644
--- a/sw/device/tock/dif/Cargo.toml
+++ b/sw/device/tock/dif/Cargo.toml
@@ -1,3 +1,7 @@
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
 [package]
 name = "dif"
 version = "0.1.0"
diff --git a/sw/device/tock/dif/src/riscv32_c_types.rs b/sw/device/tock/dif/src/riscv32_c_types.rs
index 34bfaab..b2f5c58 100644
--- a/sw/device/tock/dif/src/riscv32_c_types.rs
+++ b/sw/device/tock/dif/src/riscv32_c_types.rs
@@ -1,3 +1,7 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+
 #[allow(nonstandard_style)]
 pub type c_int = i32;
 #[allow(nonstandard_style)]
diff --git a/util/dvsim/style.css b/util/dvsim/style.css
index 784ed71..f89293a 100644
--- a/util/dvsim/style.css
+++ b/util/dvsim/style.css
@@ -1,7 +1,6 @@
-/* Copyright lowRISC contributors.
- * Licensed under the Apache License, Version 2.0, see LICENSE for details.
- * SPDX-License-Identifier: Apache-2.0
- */
+/* Copyright lowRISC contributors. */
+/* Licensed under the Apache License, Version 2.0, see LICENSE for details. */
+/* SPDX-License-Identifier: Apache-2.0 */
 
 /* CSS for reports.opentitan.org.
  * This is referenced by all results published to the reports server for some basic styling.
diff --git a/util/example/tlgen/xbar_2x2.hjson b/util/example/tlgen/xbar_2x2.hjson
index 28c8be3..ae884d1 100644
--- a/util/example/tlgen/xbar_2x2.hjson
+++ b/util/example/tlgen/xbar_2x2.hjson
@@ -1,3 +1,6 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
 {
   name: "2x2",
   clock: "clk_main_i",
diff --git a/util/reggen/field_enums.py b/util/reggen/field_enums.py
index 7aaf7b1..8ca5af1 100644
--- a/util/reggen/field_enums.py
+++ b/util/reggen/field_enums.py
@@ -1,3 +1,7 @@
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+
 """Enumerated types for fields
 Generated by validation, used by backends
 """
diff --git a/util/reggen/reg_html.css b/util/reggen/reg_html.css
index c657573..4cb48ed 100644
--- a/util/reggen/reg_html.css
+++ b/util/reggen/reg_html.css
@@ -1,6 +1,6 @@
 /* Stylesheet for reggen HTML register output */
 /* Copyright lowRISC contributors. */
-/* Licensed under the Apache License, Version 2.0, see LICENSE for details.*/
+/* Licensed under the Apache License, Version 2.0, see LICENSE for details. */
 /* SPDX-License-Identifier: Apache-2.0 */
 
 table.regpic {
diff --git a/util/uvmdvgen/Makefile.tpl b/util/uvmdvgen/Makefile.tpl
index 01c1380..10427e5 100644
--- a/util/uvmdvgen/Makefile.tpl
+++ b/util/uvmdvgen/Makefile.tpl
@@ -1,3 +1,6 @@
+# Copyright lowRISC contributors.
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
 ${'####################################################################################################'}
 ${'## Copyright lowRISC contributors.                                                                ##'}
 ${'## Licensed under the Apache License, Version 2.0, see LICENSE for details.                       ##'}