Revert r330897:

This was intended to be a non-functional change. It wasn't. The commit
message was thus wrong. In addition it broke arm, and merged crypto
related code.

Revert with prejudice.

This revert skips files touched in r316370 since that commit was since
MFCed. This revert also skips files that require $FreeBSD$ property
changes.

Thank you to those who helped me get out of this mess including but not
limited to gonzo, kevans, rgrimes.

Requested by: gjb (re)

358 files changed, 546 insertions, 927 deletions

diff --git a/sys/mips/adm5120/adm5120_machdep.c b/sys/mips/adm5120/adm5120_machdep.c
index b1c1e3a..2713618 100644
--- a/sys/mips/adm5120/adm5120_machdep.c
+++ b/sys/mips/adm5120/adm5120_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/adm5120/adm5120reg.h b/sys/mips/adm5120/adm5120reg.h
index ce8a4d5..2f15e46 100644
--- a/sys/mips/adm5120/adm5120reg.h
+++ b/sys/mips/adm5120/adm5120reg.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: adm5120reg.h,v 1.1 2007/03/20 08:52:03 dyoung Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/admpci.c b/sys/mips/adm5120/admpci.c
index b1d6efa..0fb0b54 100644
--- a/sys/mips/adm5120/admpci.c
+++ b/sys/mips/adm5120/admpci.c
@@ -1,8 +1,6 @@
 /* $NetBSD: admpci.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 David Young.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or
diff --git a/sys/mips/adm5120/console.c b/sys/mips/adm5120/console.c
index 89495c3..20cd53d 100644
--- a/sys/mips/adm5120/console.c
+++ b/sys/mips/adm5120/console.c
@@ -1,8 +1,6 @@
 /* $NetBSD: uart.c,v 1.2 2007/03/23 20:05:47 dogcow Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/if_admsw.c b/sys/mips/adm5120/if_admsw.c
index 545b9e5..65f522f 100644
--- a/sys/mips/adm5120/if_admsw.c
+++ b/sys/mips/adm5120/if_admsw.c
@@ -1,8 +1,6 @@
 /* $NetBSD: if_admsw.c,v 1.3 2007/04/22 19:26:25 dyoung Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/if_admswreg.h b/sys/mips/adm5120/if_admswreg.h
index 28ec515..a4cfa33 100644
--- a/sys/mips/adm5120/if_admswreg.h
+++ b/sys/mips/adm5120/if_admswreg.h
@@ -1,8 +1,6 @@
 /* $NetBSD: if_admswreg.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/if_admswvar.h b/sys/mips/adm5120/if_admswvar.h
index d7d341a..1304fac 100644
--- a/sys/mips/adm5120/if_admswvar.h
+++ b/sys/mips/adm5120/if_admswvar.h
@@ -1,8 +1,6 @@
 /* $NetBSD: if_admswvar.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/obio.c b/sys/mips/adm5120/obio.c
index a52b405..90216c1 100644
--- a/sys/mips/adm5120/obio.c
+++ b/sys/mips/adm5120/obio.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/obiovar.h b/sys/mips/adm5120/obiovar.h
index 8a688bf..f09972c 100644
--- a/sys/mips/adm5120/obiovar.h
+++ b/sys/mips/adm5120/obiovar.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/uart_bus_adm5120.c b/sys/mips/adm5120/uart_bus_adm5120.c
index 926c9b2..8d7943f 100644
--- a/sys/mips/adm5120/uart_bus_adm5120.c
+++ b/sys/mips/adm5120/uart_bus_adm5120.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2007 Bruce M. Simpson.
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/uart_cpu_adm5120.c b/sys/mips/adm5120/uart_cpu_adm5120.c
index a9d9350..935d109 100644
--- a/sys/mips/adm5120/uart_cpu_adm5120.c
+++ b/sys/mips/adm5120/uart_cpu_adm5120.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/adm5120/uart_dev_adm5120.c b/sys/mips/adm5120/uart_dev_adm5120.c
index d7c8186..5c3e691 100644
--- a/sys/mips/adm5120/uart_dev_adm5120.c
+++ b/sys/mips/adm5120/uart_dev_adm5120.c
@@ -1,8 +1,6 @@
 /* $NetBSD: uart.c,v 1.2 2007/03/23 20:05:47 dogcow Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * Copyright (c) 2007 Oleksandr Tymoshenko.
  * All rights reserved.
diff --git a/sys/mips/adm5120/uart_dev_adm5120.h b/sys/mips/adm5120/uart_dev_adm5120.h
index e63434b..e7165f1 100644
--- a/sys/mips/adm5120/uart_dev_adm5120.h
+++ b/sys/mips/adm5120/uart_dev_adm5120.h
@@ -1,8 +1,6 @@
 /* $NetBSD: uart.h,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * All rights reserved.
  *
diff --git a/sys/mips/alchemy/alchemy_machdep.c b/sys/mips/alchemy/alchemy_machdep.c
index 14f0845..d7f242a 100644
--- a/sys/mips/alchemy/alchemy_machdep.c
+++ b/sys/mips/alchemy/alchemy_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/alchemy/obio.c b/sys/mips/alchemy/obio.c
index 924cb08..740445f 100644
--- a/sys/mips/alchemy/obio.c
+++ b/sys/mips/alchemy/obio.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/alchemy/uart_bus_alchemy.c b/sys/mips/alchemy/uart_bus_alchemy.c
index 3c96916..5c2315b 100644
--- a/sys/mips/alchemy/uart_bus_alchemy.c
+++ b/sys/mips/alchemy/uart_bus_alchemy.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2007 Bruce M. Simpson.
  * All rights reserved.
  *
diff --git a/sys/mips/alchemy/uart_cpu_alchemy.c b/sys/mips/alchemy/uart_cpu_alchemy.c
index 7ef3ec6..c995130 100644
--- a/sys/mips/alchemy/uart_cpu_alchemy.c
+++ b/sys/mips/alchemy/uart_cpu_alchemy.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c
index ba323c0..ef9b964 100644
--- a/sys/mips/atheros/apb.c
+++ b/sys/mips/atheros/apb.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/apbvar.h b/sys/mips/atheros/apbvar.h
index 5d7a1c5..f9af6ff 100644
--- a/sys/mips/atheros/apbvar.h
+++ b/sys/mips/atheros/apbvar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_bus_space_reversed.c b/sys/mips/atheros/ar71xx_bus_space_reversed.c
index f889de3..e03ade6 100644
--- a/sys/mips/atheros/ar71xx_bus_space_reversed.c
+++ b/sys/mips/atheros/ar71xx_bus_space_reversed.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_chip.c b/sys/mips/atheros/ar71xx_chip.c
index b697598..94cbce7 100644
--- a/sys/mips/atheros/ar71xx_chip.c
+++ b/sys/mips/atheros/ar71xx_chip.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_chip.h b/sys/mips/atheros/ar71xx_chip.h
index 64f80a7..a9b4804 100644
--- a/sys/mips/atheros/ar71xx_chip.h
+++ b/sys/mips/atheros/ar71xx_chip.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_cpudef.h b/sys/mips/atheros/ar71xx_cpudef.h
index 5345476..4b2c9fb 100644
--- a/sys/mips/atheros/ar71xx_cpudef.h
+++ b/sys/mips/atheros/ar71xx_cpudef.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c
index a8d93da..19e9a0e 100644
--- a/sys/mips/atheros/ar71xx_ehci.c
+++ b/sys/mips/atheros/ar71xx_ehci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2008 Sam Leffler.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/atheros/ar71xx_fixup.c b/sys/mips/atheros/ar71xx_fixup.c
index cf25d10..27747bd 100644
--- a/sys/mips/atheros/ar71xx_fixup.c
+++ b/sys/mips/atheros/ar71xx_fixup.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_fixup.h b/sys/mips/atheros/ar71xx_fixup.h
index 8e4b4c1..f81840f 100644
--- a/sys/mips/atheros/ar71xx_fixup.h
+++ b/sys/mips/atheros/ar71xx_fixup.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012, Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_gpio.c b/sys/mips/atheros/ar71xx_gpio.c
index 5cb1ea6..59ac13f 100644
--- a/sys/mips/atheros/ar71xx_gpio.c
+++ b/sys/mips/atheros/ar71xx_gpio.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * Copyright (c) 2009, Luiz Otavio O Souza. 
  * All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_gpiovar.h b/sys/mips/atheros/ar71xx_gpiovar.h
index 8279618..47b6e64 100644
--- a/sys/mips/atheros/ar71xx_gpiovar.h
+++ b/sys/mips/atheros/ar71xx_gpiovar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * Copyright (c) 2009, Luiz Otavio O Souza.
  * All rights reserved.
diff --git a/sys/mips/atheros/ar71xx_machdep.c b/sys/mips/atheros/ar71xx_machdep.c
index f9eb403..58218da 100644
--- a/sys/mips/atheros/ar71xx_machdep.c
+++ b/sys/mips/atheros/ar71xx_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Oleksandr Tymoshenko
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_ohci.c b/sys/mips/atheros/ar71xx_ohci.c
index 22a1574..aac32ec 100644
--- a/sys/mips/atheros/ar71xx_ohci.c
+++ b/sys/mips/atheros/ar71xx_ohci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c
index cff621b..f8fc255 100644
--- a/sys/mips/atheros/ar71xx_pci.c
+++ b/sys/mips/atheros/ar71xx_pci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_pci_bus_space.c b/sys/mips/atheros/ar71xx_pci_bus_space.c
index 99b81be..5540181 100644
--- a/sys/mips/atheros/ar71xx_pci_bus_space.c
+++ b/sys/mips/atheros/ar71xx_pci_bus_space.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_setup.c b/sys/mips/atheros/ar71xx_setup.c
index d3a330c..09ab02c 100644
--- a/sys/mips/atheros/ar71xx_setup.c
+++ b/sys/mips/atheros/ar71xx_setup.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_setup.h b/sys/mips/atheros/ar71xx_setup.h
index 3b6fd32..39db494 100644
--- a/sys/mips/atheros/ar71xx_setup.h
+++ b/sys/mips/atheros/ar71xx_setup.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_spi.c b/sys/mips/atheros/ar71xx_spi.c
index 694f168..1b722d4 100644
--- a/sys/mips/atheros/ar71xx_spi.c
+++ b/sys/mips/atheros/ar71xx_spi.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xx_wdog.c b/sys/mips/atheros/ar71xx_wdog.c
index 4a51e7f..bf1ebc6 100644
--- a/sys/mips/atheros/ar71xx_wdog.c
+++ b/sys/mips/atheros/ar71xx_wdog.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar71xxreg.h b/sys/mips/atheros/ar71xxreg.h
index bc426de..e1f533b 100644
--- a/sys/mips/atheros/ar71xxreg.h
+++ b/sys/mips/atheros/ar71xxreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Oleksandr Tymoshenko
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar724x_chip.c b/sys/mips/atheros/ar724x_chip.c
index cbd831b..a365c52 100644
--- a/sys/mips/atheros/ar724x_chip.c
+++ b/sys/mips/atheros/ar724x_chip.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar724x_chip.h b/sys/mips/atheros/ar724x_chip.h
index 0ee95ab..11b30b7 100644
--- a/sys/mips/atheros/ar724x_chip.h
+++ b/sys/mips/atheros/ar724x_chip.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c
index 22b07d0..12419d1 100644
--- a/sys/mips/atheros/ar724x_pci.c
+++ b/sys/mips/atheros/ar724x_pci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * Copyright (c) 2011, Luiz Otavio O Souza.
  * All rights reserved.
diff --git a/sys/mips/atheros/ar724xreg.h b/sys/mips/atheros/ar724xreg.h
index 8e2e132..28cb40d 100644
--- a/sys/mips/atheros/ar724xreg.h
+++ b/sys/mips/atheros/ar724xreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar91xx_chip.c b/sys/mips/atheros/ar91xx_chip.c
index 216ef2b..645d51a 100644
--- a/sys/mips/atheros/ar91xx_chip.c
+++ b/sys/mips/atheros/ar91xx_chip.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar91xx_chip.h b/sys/mips/atheros/ar91xx_chip.h
index e75f6cc..a98c264 100644
--- a/sys/mips/atheros/ar91xx_chip.h
+++ b/sys/mips/atheros/ar91xx_chip.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar91xxreg.h b/sys/mips/atheros/ar91xxreg.h
index e4815e4..2dfaeb5 100644
--- a/sys/mips/atheros/ar91xxreg.h
+++ b/sys/mips/atheros/ar91xxreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Adrian Chadd
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar933x_chip.c b/sys/mips/atheros/ar933x_chip.c
index 791a999..0113588 100644
--- a/sys/mips/atheros/ar933x_chip.c
+++ b/sys/mips/atheros/ar933x_chip.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar933x_chip.h b/sys/mips/atheros/ar933x_chip.h
index 3b1545a..925b781 100644
--- a/sys/mips/atheros/ar933x_chip.h
+++ b/sys/mips/atheros/ar933x_chip.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar933x_uart.h b/sys/mips/atheros/ar933x_uart.h
index 7cdf0eb..5062ad0 100644
--- a/sys/mips/atheros/ar933x_uart.h
+++ b/sys/mips/atheros/ar933x_uart.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar933xreg.h b/sys/mips/atheros/ar933xreg.h
index ffd778a..3f31088 100644
--- a/sys/mips/atheros/ar933xreg.h
+++ b/sys/mips/atheros/ar933xreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar934x_chip.c b/sys/mips/atheros/ar934x_chip.c
index 6408548..f59d4aa 100644
--- a/sys/mips/atheros/ar934x_chip.c
+++ b/sys/mips/atheros/ar934x_chip.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar934x_chip.h b/sys/mips/atheros/ar934x_chip.h
index 1f9a792..ba21b25 100644
--- a/sys/mips/atheros/ar934x_chip.h
+++ b/sys/mips/atheros/ar934x_chip.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/ar934xreg.h b/sys/mips/atheros/ar934xreg.h
index e93d1f3..313465e 100644
--- a/sys/mips/atheros/ar934xreg.h
+++ b/sys/mips/atheros/ar934xreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index 2dd1738..db14ab3 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/if_argevar.h b/sys/mips/atheros/if_argevar.h
index 5e284cc..b58acb0 100644
--- a/sys/mips/atheros/if_argevar.h
+++ b/sys/mips/atheros/if_argevar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/pcf2123_rtc.c b/sys/mips/atheros/pcf2123_rtc.c
index 0717e35..0cb4c8f 100644
--- a/sys/mips/atheros/pcf2123_rtc.c
+++ b/sys/mips/atheros/pcf2123_rtc.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/pcf2123reg.h b/sys/mips/atheros/pcf2123reg.h
index e20ca86..bd97e6c 100644
--- a/sys/mips/atheros/pcf2123reg.h
+++ b/sys/mips/atheros/pcf2123reg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/uart_bus_ar71xx.c b/sys/mips/atheros/uart_bus_ar71xx.c
index e71b200..7336152 100644
--- a/sys/mips/atheros/uart_bus_ar71xx.c
+++ b/sys/mips/atheros/uart_bus_ar71xx.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/uart_bus_ar933x.c b/sys/mips/atheros/uart_bus_ar933x.c
index f4a3371..1ce6c62 100644
--- a/sys/mips/atheros/uart_bus_ar933x.c
+++ b/sys/mips/atheros/uart_bus_ar933x.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012, Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/uart_cpu_ar71xx.c b/sys/mips/atheros/uart_cpu_ar71xx.c
index 62d7dd6..f004c1f 100644
--- a/sys/mips/atheros/uart_cpu_ar71xx.c
+++ b/sys/mips/atheros/uart_cpu_ar71xx.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Oleksandr Tymoshenko
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/uart_cpu_ar933x.c b/sys/mips/atheros/uart_cpu_ar933x.c
index 53879b5..c4f942e 100644
--- a/sys/mips/atheros/uart_cpu_ar933x.c
+++ b/sys/mips/atheros/uart_cpu_ar933x.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/uart_dev_ar933x.c b/sys/mips/atheros/uart_dev_ar933x.c
index 6545ec6..e769cbe 100644
--- a/sys/mips/atheros/uart_dev_ar933x.c
+++ b/sys/mips/atheros/uart_dev_ar933x.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/atheros/uart_dev_ar933x.h b/sys/mips/atheros/uart_dev_ar933x.h
index f6f8a4b..d41b43e 100644
--- a/sys/mips/atheros/uart_dev_ar933x.h
+++ b/sys/mips/atheros/uart_dev_ar933x.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/beri/beri_machdep.c b/sys/mips/beri/beri_machdep.c
index 32c317d..2c153e4 100644
--- a/sys/mips/beri/beri_machdep.c
+++ b/sys/mips/beri/beri_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * Copyright (c) 2012-2014 Robert N. M. Watson
  * All rights reserved.
diff --git a/sys/mips/beri/beri_pic.c b/sys/mips/beri/beri_pic.c
index ac8e98f..008732f 100644
--- a/sys/mips/beri/beri_pic.c
+++ b/sys/mips/beri/beri_pic.c
@@ -1,7 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2017 Ruslan Bukin <br@bsdpad.com>
  * Copyright (c) 2013 SRI International
  * All rights reserved.
  *
@@ -31,8 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_platform.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -42,118 +37,221 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
-#include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
-
-#ifdef SMP
-#include <mips/beri/beri_mp.h>
-#endif
+#include <machine/intr_machdep.h>
 
-#include <dev/fdt/fdt_common.h>
-#include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#include "pic_if.h"
+#include <dev/fdt/fdt_common.h>
 
-#define	BP_NUM_HARD_IRQS	5
-#define	BP_NUM_IRQS		32
-/* We use hard irqs 15-31 as soft */
-#define	BP_FIRST_SOFT		16
+#include "fdt_ic_if.h"
 
-#define	BP_CFG_IRQ_S		0
-#define	BP_CFG_IRQ_M		(0xf << BP_CFG_IRQ_S)
-#define	BP_CFG_TID_S		8
-#define	BP_CFG_TID_M		(0x7FFFFF << BP_CFG_TID_S)
-#define	BP_CFG_ENABLE		(1 << 31)
+struct beripic_softc;
 
-enum {
-	BP_CFG,
-	BP_IP_READ,
-	BP_IP_SET,
-	BP_IP_CLEAR
-};
+static uint64_t	bp_read_cfg(struct beripic_softc *, int);
+static void	bp_write_cfg(struct beripic_softc *, int, uint64_t);
+static void	bp_detach_resources(device_t);
+static char	*bp_strconfig(uint64_t, char *, size_t);
+static void	bp_config_source(device_t, int, int, u_long, u_long);
+#ifdef __mips__
+static void	bp_set_counter_name(device_t, device_t, int);
+#endif
 
-struct beripic_softc;
+static int	beripic_fdt_probe(device_t);
+static int	beripic_fdt_attach(device_t);
 
-struct beri_pic_isrc {
-	struct intr_irqsrc	isrc;
-	u_int			irq;
-	uint32_t		mips_hard_irq;
-};
+static int	beripic_activate_intr(device_t, struct resource *);
+static struct resource *
+		beripic_alloc_intr(device_t, device_t, int *, u_long, u_int);
+static int	beripic_config_intr(device_t, int,  enum intr_trigger,
+		    enum intr_polarity);
+static int	beripic_release_intr(device_t, struct resource *);
+static int	beripic_setup_intr(device_t, device_t, struct resource *,
+		    int, driver_filter_t *, driver_intr_t *, void *, void **);
+static int	beripic_teardown_intr(device_t, device_t, struct resource *,
+		    void *);
 
-struct hirq {
-	uint32_t		irq;
-	struct beripic_softc	*sc;
-};
+static int	beripic_filter(void *);
+static void	beripic_intr(void *);
+
+#define	BP_MAX_HARD_IRQS	6
+#define	BP_FIRST_SOFT		64
 
 struct beripic_softc {
-	device_t		dev;
-	uint32_t		nirqs;
-	struct beri_pic_isrc	irqs[BP_NUM_IRQS];
-	struct resource		*res[4 + BP_NUM_HARD_IRQS];
-	void			*ih[BP_NUM_HARD_IRQS];
-	struct hirq		hirq[BP_NUM_HARD_IRQS];
-	uint8_t			mips_hard_irq_idx;
+	device_t		bp_dev;
+	struct resource		*bp_cfg_res;
+	struct resource		*bp_read_res;
+	struct resource		*bp_set_res;
+	struct resource		*bp_clear_res;
+	int			bp_cfg_rid;
+	int			bp_read_rid;
+	int			bp_set_rid;
+	int			bp_clear_rid;
+	bus_space_tag_t		bp_cfg_bst;
+	bus_space_tag_t		bp_read_bst;
+	bus_space_tag_t		bp_set_bst;
+	bus_space_tag_t		bp_clear_bst;
+	bus_space_handle_t	bp_cfg_bsh;
+	bus_space_handle_t	bp_read_bsh;
+	bus_space_handle_t	bp_set_bsh;
+	bus_space_handle_t	bp_clear_bsh;
+
+	struct resource		*bp_irqs[BP_MAX_HARD_IRQS];
+	int			bp_irq_rids[BP_MAX_HARD_IRQS];
+	int			bp_nirqs;
+	int			bp_next_irq;
+	int			bp_next_tid;
+
+	int			bp_nthreads;
+
+	int			bp_nhard;
+	int			bp_nsoft;
+	int			bp_nsrcs;
+	struct rman		bp_src_rman;
+
+#ifdef __mips__
+	mips_intrcnt_t		*bp_counters;
+#endif
+
+	struct mtx		bp_cfgmtx;
 };
 
-static struct resource_spec beri_pic_spec[] = {
-	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
-	{ SYS_RES_MEMORY,	1,	RF_ACTIVE },
-	{ SYS_RES_MEMORY,	2,	RF_ACTIVE },
-	{ SYS_RES_MEMORY,	3,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		1,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		2,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		3,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		4,	RF_ACTIVE },
-	{ -1, 0 }
+struct beripic_intr_arg {
+	driver_filter_t		*filter;
+	driver_intr_t		*intr;
+	void			*arg;
+	struct resource		*irq;
+#ifdef __mips__
+	mips_intrcnt_t		counter;
+#endif
 };
 
-static int
-beri_pic_intr(void *arg)
+struct beripic_cookie {
+	struct beripic_intr_arg	*bpia;
+	struct resource		*hirq;
+	void			*cookie;
+};
+
+#define	BP_CFG_MASK_E		0x80000000ull
+#define	BP_CFG_SHIFT_E		31
+#define	BP_CFG_MASK_TID		0x7FFFFF00ull	/* Depends on CPU */
+#define	BP_CFG_SHIFT_TID	8
+#define	BP_CFG_MASK_IRQ		0x0000000Full
+#define BP_CFG_SHIFT_IRQ	0
+#define	BP_CFG_VALID		(BP_CFG_MASK_E|BP_CFG_MASK_TID|BP_CFG_MASK_IRQ)
+#define	BP_CFG_RESERVED		~BP_CFG_VALID
+
+#define	BP_CFG_ENABLED(cfg)	(((cfg) & BP_CFG_MASK_E) >> BP_CFG_SHIFT_E)
+#define	BP_CFG_TID(cfg)		(((cfg) & BP_CFG_MASK_TID) >> BP_CFG_SHIFT_TID)
+#define	BP_CFG_IRQ(cfg)		(((cfg) & BP_CFG_MASK_IRQ) >> BP_CFG_SHIFT_IRQ)
+
+MALLOC_DEFINE(M_BERIPIC, "beripic", "beripic memory");
+
+static uint64_t
+bp_read_cfg(struct beripic_softc *sc, int irq)
+{
+	
+	KASSERT((irq >= 0 && irq < sc->bp_nsrcs),
+	    ("IRQ of of range %d (0-%d)", irq, sc->bp_nsrcs - 1));
+	return (bus_space_read_8(sc->bp_cfg_bst, sc->bp_cfg_bsh, irq * 8));
+}
+
+static void
+bp_write_cfg(struct beripic_softc *sc, int irq, uint64_t config)
+{
+	
+	KASSERT((irq >= 0 && irq < sc->bp_nsrcs),
+	    ("IRQ of of range %d (0-%d)", irq, sc->bp_nsrcs - 1));
+	bus_space_write_8(sc->bp_cfg_bst, sc->bp_cfg_bsh, irq * 8, config);
+}
+
+static void
+bp_detach_resources(device_t dev)
 {
 	struct beripic_softc *sc;
-	struct intr_irqsrc *isrc;
-	struct hirq *h;
-	uint64_t intr;
-	uint64_t reg;
 	int i;
 
-	h = arg;
-	sc = h->sc;
+	sc = device_get_softc(dev);
 
-	intr = bus_read_8(sc->res[BP_IP_READ], 0);
-	while ((i = fls(intr)) != 0) {
-		i--;
-		intr &= ~(1u << i);
+	if (sc->bp_cfg_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_cfg_rid,
+		    sc->bp_cfg_res);
+		sc->bp_cfg_res = NULL;
+	}
+	if (sc->bp_read_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_read_rid,
+		    sc->bp_read_res);
+		sc->bp_read_res = NULL;
+	}
+	if (sc->bp_set_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_set_rid,
+		    sc->bp_set_res);
+		sc->bp_set_res = NULL;
+	}
+	if (sc->bp_clear_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_clear_rid,
+		    sc->bp_clear_res);
+		sc->bp_clear_res = NULL;
+	}
+	for (i = sc->bp_nirqs - 1; i >= 0; i--) {
+		bus_release_resource(dev, SYS_RES_IRQ, sc->bp_irq_rids[i],
+		    sc->bp_irqs[i]);
+	}
+	sc->bp_nirqs = 0;
+}
 
-		isrc = &sc->irqs[i].isrc;
+static char *
+bp_strconfig(uint64_t config, char *configstr, size_t len)
+{
+	
+	if (snprintf(configstr, len, "%s tid: %llu hardintr %llu",
+	    BP_CFG_ENABLED(config) ? "enabled" : "disabled",
+	    BP_CFG_TID(config), BP_CFG_IRQ(config)) > len - 1)
+		return (NULL);
+	return (configstr);
+}
 
-		reg = bus_read_8(sc->res[BP_CFG], i * 8);
-		if ((reg & BP_CFG_IRQ_M) != h->irq) {
-			continue;
-		}
-		if ((reg & (BP_CFG_ENABLE)) == 0) {
-			continue;
-		}
+static void
+bp_config_source(device_t ic, int src, int enable, u_long tid, u_long irq)
+{
+	struct beripic_softc *sc;
+	uint64_t config;
 
-		if (intr_isrc_dispatch(isrc, curthread->td_intr_frame) != 0) {
-			device_printf(sc->dev, "Stray interrupt %u detected\n", i);
-		}
+	sc = device_get_softc(ic);
 
-		bus_write_8(sc->res[BP_IP_CLEAR], 0, (1 << i));
-	}
+	config = 0;
+	config |= enable << BP_CFG_SHIFT_E;
+	config |= tid << BP_CFG_SHIFT_TID;
+	config |= irq << BP_CFG_SHIFT_IRQ;
+
+	bp_write_cfg(sc, src, config);
+}
+
+#ifdef __mips__
+static void
+bp_set_counter_name(device_t ic, device_t child, int src)
+{
+	struct beripic_softc *sc;
+	char name[MAXCOMLEN + 1];
 
-	return (FILTER_HANDLED);
+	sc = device_get_softc(ic);
+
+	if (snprintf(name, sizeof(name), "bp%dsrc%d%s%s%s",
+	    device_get_unit(ic), src, src < sc->bp_nhard ? "" : "s",
+	    child == NULL ? "" : " ",
+	    child == NULL ? " " : device_get_nameunit(child)) >= sizeof(name))
+		name[sizeof(name) - 2] = '+';
+	
+	mips_intrcnt_setname(sc->bp_counters[src], name);
 }
+#endif
 
 static int
-beripic_probe(device_t dev)
+beripic_fdt_probe(device_t dev)
 {
 
 	if (!ofw_bus_status_okay(dev))
@@ -163,208 +261,443 @@ beripic_probe(device_t dev)
 		return (ENXIO);
 		
 	device_set_desc(dev, "BERI Programmable Interrupt Controller");
-
 	return (BUS_PROBE_DEFAULT);
 }
 
 static int
-beripic_attach(device_t dev)
+beripic_fdt_attach(device_t dev)
 {
+	char configstr[64];
 	struct beripic_softc *sc;
-	struct beri_pic_isrc *pic_isrc;
-	const char *name;
-	struct intr_irqsrc *isrc;
-	intptr_t xref;
-	uint32_t unit;
-	int err;
-	int i;
+	struct fdt_ic *fic;
+	pcell_t nhard, nsoft;
+	phandle_t ph;
+	int error, i, src;
+	uint64_t config;
 
 	sc = device_get_softc(dev);
-	sc->dev = dev;
+	sc->bp_dev = dev;
 
-	if (bus_alloc_resources(dev, beri_pic_spec, sc->res)) {
-		device_printf(dev, "could not allocate resources\n");
-		return (ENXIO);
+	mtx_init(&sc->bp_cfgmtx, "beripic config lock", NULL, MTX_DEF);
+
+	/*
+	 * FDT lists CONFIG, IP_READ, IP_SET, and IP_CLEAR registers as
+	 * seperate memory regions in that order.
+	 */
+	sc->bp_cfg_rid = 0;
+	sc->bp_cfg_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->bp_cfg_rid, RF_ACTIVE);
+	if (sc->bp_cfg_res == NULL) {
+		device_printf(dev, "failed to map config memory");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->bp_dev, "config region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->bp_cfg_res),
+		    (void *)(rman_get_start(sc->bp_cfg_res) +
+		    rman_get_size(sc->bp_cfg_res)));
+
+	sc->bp_read_rid = 1;
+	sc->bp_read_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->bp_read_rid, RF_ACTIVE);
+	if (sc->bp_read_res == NULL) {
+		device_printf(dev, "failed to map IP read memory");
+		error = ENXIO;
+		goto err;
 	}
+	if (bootverbose)
+		device_printf(sc->bp_dev, "IP read region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->bp_read_res),
+		    (void *)(rman_get_start(sc->bp_read_res) +
+		    rman_get_size(sc->bp_read_res)));
+
+	sc->bp_set_rid = 2;
+	sc->bp_set_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->bp_set_rid, RF_ACTIVE);
+	if (sc->bp_set_res == NULL) {
+		device_printf(dev, "failed to map IP read memory");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->bp_dev, "IP set region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->bp_set_res),
+		    (void *)(rman_get_start(sc->bp_set_res) +
+		    rman_get_size(sc->bp_set_res)));
+
+	sc->bp_clear_rid = 3;
+	sc->bp_clear_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->bp_clear_rid, RF_ACTIVE);
+	if (sc->bp_clear_res == NULL) {
+		device_printf(dev, "failed to map IP read memory");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->bp_dev, "IP clear region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->bp_clear_res),
+		    (void *)(rman_get_start(sc->bp_clear_res) +
+		    rman_get_size(sc->bp_clear_res)));
+
+	i = 0;
+	for (i = 0; i < BP_MAX_HARD_IRQS; i++) {
+		sc->bp_irq_rids[i] = i;
+		sc->bp_irqs[i] = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+		    &sc->bp_irq_rids[i], RF_ACTIVE | RF_SHAREABLE);
+		if (sc->bp_irqs[i] == NULL)
+			break;
+	}
+	if (i == 0) {
+		device_printf(dev, "failed to allocate any parent IRQs!");
+		error = ENXIO;
+		goto err;
+	}
+	sc->bp_nirqs = i;
 
-	xref = OF_xref_from_node(ofw_bus_get_node(dev));
-	name = device_get_nameunit(dev);
-	unit = device_get_unit(dev);
-	sc->nirqs = BP_NUM_IRQS;
-
-	for (i = 0; i < sc->nirqs; i++) {
-		sc->irqs[i].irq = i;
-		isrc = &sc->irqs[i].isrc;
-
-		/* Assign mips hard irq number. */
-		pic_isrc = (struct beri_pic_isrc *)isrc;
-		pic_isrc->mips_hard_irq = sc->mips_hard_irq_idx++;
-		/* Last IRQ is used for IPIs. */
-		if (sc->mips_hard_irq_idx >= (BP_NUM_HARD_IRQS - 1)) {
-			sc->mips_hard_irq_idx = 0;
-		}
+	ph = ofw_bus_gen_get_node(device_get_parent(dev), dev);
 
-		err = intr_isrc_register(isrc, sc->dev,
-		    0, "pic%d,%d", unit, i);
-		bus_write_8(sc->res[BP_CFG], i * 8, 0);
+#ifndef SMP
+	sc->bp_nthreads = 1;
+#else
+	sc->bp_nthreads = 1;
+	/* XXX: get nthreads from cpu(s) somehow */
+#endif
+
+	if (OF_getprop(ph, "hard-interrupt-sources", &nhard, sizeof(nhard))
+	    <= 0) {
+		device_printf(dev, "failed to get number of hard sources");
+		error = ENXIO;
+		goto err;
+	}
+	if (OF_getprop(ph, "soft-interrupt-sources", &nsoft, sizeof(nsoft))
+	    <= 0) {
+		device_printf(dev, "failed to get number of soft sources");
+		error = ENXIO;
+		goto err;
 	}
 
-	/*
-	 * Now, when everything is initialized, it's right time to
-	 * register interrupt controller to interrupt framefork.
-	 */
-	if (intr_pic_register(dev, xref) == NULL) {
-		device_printf(dev, "could not register PIC\n");
-		return (ENXIO);
+	sc->bp_nhard = nhard;
+	sc->bp_nsoft = nsoft;
+	sc->bp_nsrcs = sc->bp_nhard + sc->bp_nsoft;
+	/* XXX: should deal with gap between hard and soft */
+	KASSERT(sc->bp_nhard <= BP_FIRST_SOFT,
+	    ("too many hard sources"));
+	KASSERT(rman_get_size(sc->bp_cfg_res) / 8 == sc->bp_nsrcs,
+	    ("config space size does not match sources"));
+	KASSERT(sc->bp_nhard % 64 == 0,
+	    ("Non-multiple of 64 intr counts not supported"));
+	KASSERT(sc->bp_nsoft % 64 == 0,
+	    ("Non-multiple of 64 intr counts not supported"));
+	if (bootverbose)
+		device_printf(dev, "%d hard and %d soft sources\n",
+		    sc->bp_nhard, sc->bp_nsoft);
+
+#ifdef __mips__
+	sc->bp_counters = malloc(sizeof(*sc->bp_counters) * sc->bp_nsrcs,
+	    M_BERIPIC, M_WAITOK|M_ZERO);
+	for (i = 0; i < sc->bp_nsrcs; i++) {
+		sc->bp_counters[i] = mips_intrcnt_create("");
+		bp_set_counter_name(dev, NULL, i);
+	}
+#endif
+	
+	sc->bp_src_rman.rm_start = 0;
+	sc->bp_src_rman.rm_end = sc->bp_nsrcs - 1;
+	sc->bp_src_rman.rm_type = RMAN_ARRAY;
+	sc->bp_src_rman.rm_descr = "Interrupt source";
+	if (rman_init(&(sc->bp_src_rman)) != 0 ||
+	    rman_manage_region(&(sc->bp_src_rman), 0, sc->bp_nsrcs - 1) != 0) {
+		device_printf(dev, "Failed to set up sources rman");
+		error = ENXIO;
+		goto err;
 	}
 
-	/* Last IRQ is used for IPIs. */
-	for (i = 0; i < (BP_NUM_HARD_IRQS - 1); i++) {
-		sc->hirq[i].sc = sc;
-		sc->hirq[i].irq = i;
-		if (bus_setup_intr(dev, sc->res[4+i], INTR_TYPE_CLK,
-		    beri_pic_intr, NULL, &sc->hirq[i], sc->ih[i])) {
-			device_printf(dev, "could not setup irq handler\n");
-			intr_pic_deregister(dev, xref);
-			return (ENXIO);
+	sc->bp_cfg_bst = rman_get_bustag(sc->bp_cfg_res);
+	sc->bp_cfg_bsh = rman_get_bushandle(sc->bp_cfg_res);
+	sc->bp_read_bst = rman_get_bustag(sc->bp_read_res);
+	sc->bp_read_bsh = rman_get_bushandle(sc->bp_read_res);
+	sc->bp_set_bst = rman_get_bustag(sc->bp_set_res);
+	sc->bp_set_bsh = rman_get_bushandle(sc->bp_set_res);
+	sc->bp_clear_bst = rman_get_bustag(sc->bp_clear_res);
+	sc->bp_clear_bsh = rman_get_bushandle(sc->bp_clear_res);
+
+	for (src = 0; src < sc->bp_nsrcs; src++) {
+		config = bp_read_cfg(sc, src);
+		if (config == 0)
+			continue;
+
+		if (bootverbose) {
+			device_printf(dev, "initial config: src %d: %s\n", src,
+			    bp_strconfig(config, configstr, sizeof(configstr)));
+			if (config & BP_CFG_RESERVED)
+				device_printf(dev,
+				    "reserved bits not 0: 0x%016jx\n",
+				    (uintmax_t) config);
 		}
+
+		bp_config_source(dev, src, 0, 0, 0);
 	}
 
+	fic = malloc(sizeof(*fic), M_BERIPIC, M_WAITOK|M_ZERO);
+	fic->iph = ph;
+	fic->dev = dev;
+	SLIST_INSERT_HEAD(&fdt_ic_list_head, fic, fdt_ics);
+
 	return (0);
+err:
+	bp_detach_resources(dev);
+
+	return (error);
 }
 
-static void
-beri_pic_enable_intr(device_t dev, struct intr_irqsrc *isrc)
+static struct resource *
+beripic_alloc_intr(device_t ic, device_t child, int *rid, u_long irq,
+    u_int flags)
 {
-	struct beri_pic_isrc *pic_isrc;
 	struct beripic_softc *sc;
-	uint64_t reg;
+	struct resource *rv;
+
+	sc = device_get_softc(ic);
+
+	rv = rman_reserve_resource(&(sc->bp_src_rman), irq, irq, 1, flags,
+	    child);
+	if (rv == NULL)
+		 printf("%s: could not reserve source interrupt for %s\n",
+		     __func__, device_get_nameunit(child));
+	rman_set_rid(rv, *rid);
+
+	if ((flags & RF_ACTIVE) &&
+	    beripic_activate_intr(ic, rv) != 0) {
+		printf("%s: could not activate interrupt\n", __func__);
+		rman_release_resource(rv);
+		return (NULL);
+	}
 
-	sc = device_get_softc(dev);
-	pic_isrc = (struct beri_pic_isrc *)isrc;
+	return (rv);
+}
 
-	reg = BP_CFG_ENABLE;
-	reg |= (pic_isrc->mips_hard_irq << BP_CFG_IRQ_S);
-	bus_write_8(sc->res[BP_CFG], pic_isrc->irq * 8, reg);
+static int
+beripic_release_intr(device_t ic, struct resource *r)
+{
+	
+	return (rman_release_resource(r));
 }
 
-static void
-beri_pic_disable_intr(device_t dev, struct intr_irqsrc *isrc)
+static int
+beripic_activate_intr(device_t ic, struct resource *r)
 {
-	struct beri_pic_isrc *pic_isrc;
-	struct beripic_softc *sc;
-	uint64_t reg;
+	
+	return (rman_activate_resource(r));
+}
 
-	sc = device_get_softc(dev);
-	pic_isrc = (struct beri_pic_isrc *)isrc;
+static int
+beripic_deactivate_intr(device_t ic, struct resource *r)
+{
+	
+	return (rman_deactivate_resource(r));
+}
+
+static int
+beripic_config_intr(device_t dev, int irq, enum intr_trigger trig,
+   enum intr_polarity pol)
+{
+
+	if (trig != INTR_TRIGGER_CONFORM || pol != INTR_POLARITY_CONFORM)
+		return (EINVAL);
 
-	reg = bus_read_8(sc->res[BP_CFG], pic_isrc->irq * 8);
-	reg &= ~BP_CFG_ENABLE;
-	bus_write_8(sc->res[BP_CFG], pic_isrc->irq * 8, reg);
+	return (0);
 }
 
 static int
-beri_pic_map_intr(device_t dev, struct intr_map_data *data,
-    struct intr_irqsrc **isrcp)
+beripic_setup_intr(device_t ic, device_t child, struct resource *irq,
+    int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, 
+    void **cookiep)
 {
 	struct beripic_softc *sc;
-	struct intr_map_data_fdt *daf;
-	uint32_t irq;
+	struct beripic_intr_arg *bpia;
+	struct beripic_cookie *bpc;
+	int error;
+	u_long hirq, src, tid;
+
+	sc = device_get_softc(ic);
+
+	src = rman_get_start(irq);
+
+	KASSERT(src < sc->bp_nsrcs, ("source (%lu) out of range 0-%d",
+	     src, sc->bp_nsrcs - 1));
+
+	bpia = malloc(sizeof(*bpia), M_BERIPIC, M_WAITOK|M_ZERO);
+	bpia->filter = filter;
+	bpia->intr = intr;
+	bpia->arg = arg;
+	bpia->irq = irq;
+#ifdef __mips__
+	bpia->counter = sc->bp_counters[src];
+	bp_set_counter_name(ic, child, src);
+#endif
 
-	sc = device_get_softc(dev);
-	daf = (struct intr_map_data_fdt *)data;
+	bpc = malloc(sizeof(*bpc), M_BERIPIC, M_WAITOK|M_ZERO);
+	bpc->bpia = bpia;
 
-	if (data == NULL || data->type != INTR_MAP_DATA_FDT ||
-	    daf->ncells != 1 || daf->cells[0] >= sc->nirqs)
-		return (EINVAL);
+	mtx_lock(&(sc->bp_cfgmtx));
+	bpc->hirq = sc->bp_irqs[sc->bp_next_irq];
+	hirq = rman_get_start(bpc->hirq);
+	tid = sc->bp_next_tid;
+
+	error = BUS_SETUP_INTR(device_get_parent(ic), ic, bpc->hirq, flags,
+	    beripic_filter, intr == NULL ? NULL : beripic_intr, bpia,
+	    &(bpc->cookie));
+	if (error != 0)
+		goto err;
+
+#ifdef NOTYET
+#ifdef SMP
+	/* XXX: bind ithread to cpu */
+	sc->bp_next_tid++;
+	if (sc->bp_next_tid >= sc->bp_nthreads)
+		sc->bp_next_tid = 0;
+#endif
+#endif
+	if (sc->bp_next_tid == 0) {
+		sc->bp_next_irq++;
+		if (sc->bp_next_irq >= sc->bp_nirqs)
+			sc->bp_next_irq = 0;
+	}
+	mtx_unlock(&(sc->bp_cfgmtx));
 
-	irq = daf->cells[0];
+	*cookiep = bpc;
 
-	*isrcp = &sc->irqs[irq].isrc;
+	bp_config_source(ic, rman_get_start(irq), 1, tid, hirq);
 
 	return (0);
+err:
+	free(bpc, M_BERIPIC);
+	free(bpia, M_BERIPIC);
+
+	return (error);
 }
 
-static void
-beri_pic_post_ithread(device_t dev, struct intr_irqsrc *isrc)
+static int
+beripic_teardown_intr(device_t dev, device_t child, struct resource *irq,
+    void *cookie)
 {
+	struct beripic_cookie *bpc;
+	int error;
+
+	bpc = cookie;
+
+	bp_config_source(dev, rman_get_start(irq), 0, 0, 0);
+
+	free(bpc->bpia, M_BERIPIC);
+
+	error = BUS_TEARDOWN_INTR(device_get_parent(dev), dev, bpc->hirq,
+	    bpc->cookie);
 
-	beri_pic_enable_intr(dev, isrc);
+	free(bpc, M_BERIPIC);
+
+	return (error);
 }
 
-static void
-beri_pic_pre_ithread(device_t dev, struct intr_irqsrc *isrc)
+static int
+beripic_filter(void *arg)
 {
+	struct beripic_intr_arg *bpic;
 
-	beri_pic_disable_intr(dev, isrc);
+	bpic = arg;
+
+#ifdef __mips__
+	mips_intrcnt_inc(bpic->counter);
+#endif
+
+	/* XXX: Add a check that our source is high */
+
+	if (bpic->filter == NULL)
+		return (FILTER_SCHEDULE_THREAD);
+
+	return (bpic->filter(bpic->arg));
 }
 
-#ifdef SMP
-void
-beripic_setup_ipi(device_t dev, u_int tid, u_int ipi_irq)
+static void
+beripic_intr(void *arg)
 {
-	struct beripic_softc *sc;
-	uint64_t reg;
+	struct beripic_intr_arg *bpic;
 
-	sc = device_get_softc(dev);
+	bpic = arg;
 
-	reg = (BP_CFG_ENABLE);
-	reg |= (ipi_irq << BP_CFG_IRQ_S);
-	reg |= (tid << BP_CFG_TID_S);
-	bus_write_8(sc->res[BP_CFG], ((BP_FIRST_SOFT + tid) * 8), reg);
+	KASSERT(bpic->intr != NULL,
+	    ("%s installed, but no child intr", __func__));
+
+	bpic->intr(bpic->arg);
+}
+
+#ifdef SMP
+static void
+beripic_setup_ipi(device_t ic, u_int tid, u_int ipi_irq)
+{
+	
+	bp_config_source(ic, BP_FIRST_SOFT + tid, 1, tid, ipi_irq);
 }
 
-void
-beripic_send_ipi(device_t dev, u_int tid)
+static void
+beripic_send_ipi(device_t ic, u_int tid)
 {
 	struct beripic_softc *sc;
 	uint64_t bit;
 
-	sc = device_get_softc(dev);
+	sc = device_get_softc(ic);
 
-	bit = (BP_FIRST_SOFT + tid);
-	KASSERT(bit < BP_NUM_IRQS, ("tid (%d) to large\n", tid));
+	KASSERT(tid < sc->bp_nsoft, ("tid (%d) too large\n", tid));
 
-	bus_write_8(sc->res[BP_IP_SET], 0x0, (1 << bit));
+	bit = 1ULL << (tid % 64);
+	bus_space_write_8(sc->bp_set_bst, sc->bp_set_bsh, 
+	    (BP_FIRST_SOFT / 8) + (tid / 64), bit);
 }
 
-void
-beripic_clear_ipi(device_t dev, u_int tid)
+static void
+beripic_clear_ipi(device_t ic, u_int tid)
 {
 	struct beripic_softc *sc;
 	uint64_t bit;
 
-	sc = device_get_softc(dev);
+	sc = device_get_softc(ic);
 
-	bit = (BP_FIRST_SOFT + tid);
-	KASSERT(bit < BP_NUM_IRQS, ("tid (%d) to large\n", tid));
+	KASSERT(tid < sc->bp_nsoft, ("tid (%d) to large\n", tid));
 
-	bus_write_8(sc->res[BP_IP_CLEAR], 0x0, (1 << bit));
+	bit = 1ULL << (tid % 64);
+	bus_space_write_8(sc->bp_clear_bst, sc->bp_clear_bsh, 
+	    (BP_FIRST_SOFT / 8) + (tid / 64), bit);
 }
 #endif
 
+devclass_t	beripic_devclass;
+
 static device_method_t beripic_fdt_methods[] = {
 	/* Device interface */
-	DEVMETHOD(device_probe,		beripic_probe),
-	DEVMETHOD(device_attach,	beripic_attach),
+	DEVMETHOD(device_probe,		beripic_fdt_probe),
+	DEVMETHOD(device_attach,	beripic_fdt_attach),
 
-	/* Interrupt controller interface */
-	DEVMETHOD(pic_enable_intr,	beri_pic_enable_intr),
-	DEVMETHOD(pic_disable_intr,	beri_pic_disable_intr),
-	DEVMETHOD(pic_map_intr,		beri_pic_map_intr),
-	DEVMETHOD(pic_post_ithread,	beri_pic_post_ithread),
-	DEVMETHOD(pic_pre_ithread,	beri_pic_pre_ithread),
+	DEVMETHOD(fdt_ic_activate_intr,	beripic_activate_intr),
+	DEVMETHOD(fdt_ic_alloc_intr,	beripic_alloc_intr),
+	DEVMETHOD(fdt_ic_config_intr,	beripic_config_intr),
+	DEVMETHOD(fdt_ic_deactivate_intr, beripic_deactivate_intr),
+	DEVMETHOD(fdt_ic_release_intr,	beripic_release_intr),
+	DEVMETHOD(fdt_ic_setup_intr,	beripic_setup_intr),
+	DEVMETHOD(fdt_ic_teardown_intr,	beripic_teardown_intr),
 
-	DEVMETHOD_END
-};
+#ifdef SMP
+	DEVMETHOD(fdt_ic_setup_ipi,	beripic_setup_ipi),
+	DEVMETHOD(fdt_ic_clear_ipi,	beripic_clear_ipi),
+	DEVMETHOD(fdt_ic_send_ipi,	beripic_send_ipi),
+#endif
 
-devclass_t beripic_devclass;
+	{ 0, 0 },
+};
 
-static driver_t beripic_driver = {
+static driver_t beripic_fdt_driver = {
 	"beripic",
 	beripic_fdt_methods,
 	sizeof(struct beripic_softc)
 };
 
-EARLY_DRIVER_MODULE(beripic, ofwbus, beripic_driver, beripic_devclass, 0, 0,
-    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
+DRIVER_MODULE(beripic, simplebus, beripic_fdt_driver, beripic_devclass, 0, 0);
diff --git a/sys/mips/cavium/ciu.c b/sys/mips/cavium/ciu.c
index 0592e6a..b4726c5 100644
--- a/sys/mips/cavium/ciu.c
+++ b/sys/mips/cavium/ciu.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/cryptocteon/cavium_crypto.c b/sys/mips/cavium/cryptocteon/cavium_crypto.c
index 6ff0e6f..0ebab4f 100644
--- a/sys/mips/cavium/cryptocteon/cavium_crypto.c
+++ b/sys/mips/cavium/cryptocteon/cavium_crypto.c
@@ -1,9 +1,7 @@
 /*
  * vim:sw=4 ts=8
  */
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
  * Copyright (c) 2009 David McCullough <david.mccullough@securecomputing.com>
  *
  * Copyright (c) 2003-2007 Cavium Networks (support@cavium.com). All rights
diff --git a/sys/mips/cavium/cvmx_config.h b/sys/mips/cavium/cvmx_config.h
index 33720c7..e197660 100644
--- a/sys/mips/cavium/cvmx_config.h
+++ b/sys/mips/cavium/cvmx_config.h
@@ -1,6 +1,4 @@
 /***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
  * reserved.
  *
diff --git a/sys/mips/cavium/if_octm.c b/sys/mips/cavium/if_octm.c
index 4166dcc..a689a0f 100644
--- a/sys/mips/cavium/if_octm.c
+++ b/sys/mips/cavium/if_octm.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010-2011 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/obio.c b/sys/mips/cavium/obio.c
index 0d0dcb0..82e5c36 100644
--- a/sys/mips/cavium/obio.c
+++ b/sys/mips/cavium/obio.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/obiovar.h b/sys/mips/cavium/obiovar.h
index fbf33b5..3b58fe6 100644
--- a/sys/mips/cavium/obiovar.h
+++ b/sys/mips/cavium/obiovar.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octe/cavium-ethernet.h b/sys/mips/cavium/octe/cavium-ethernet.h
index 37cba4e..cc19faf 100644
--- a/sys/mips/cavium/octe/cavium-ethernet.h
+++ b/sys/mips/cavium/octe/cavium-ethernet.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-common.c b/sys/mips/cavium/octe/ethernet-common.c
index 02a9fa3..f18eabd 100644
--- a/sys/mips/cavium/octe/ethernet-common.c
+++ b/sys/mips/cavium/octe/ethernet-common.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-common.h b/sys/mips/cavium/octe/ethernet-common.h
index 33e27c9..cb5fc81 100644
--- a/sys/mips/cavium/octe/ethernet-common.h
+++ b/sys/mips/cavium/octe/ethernet-common.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-defines.h b/sys/mips/cavium/octe/ethernet-defines.h
index 308233f..10b38c8 100644
--- a/sys/mips/cavium/octe/ethernet-defines.h
+++ b/sys/mips/cavium/octe/ethernet-defines.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-headers.h b/sys/mips/cavium/octe/ethernet-headers.h
index 2a677aa..3945e13 100644
--- a/sys/mips/cavium/octe/ethernet-headers.h
+++ b/sys/mips/cavium/octe/ethernet-headers.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-mdio.c b/sys/mips/cavium/octe/ethernet-mdio.c
index e679d75..c61a2a6 100644
--- a/sys/mips/cavium/octe/ethernet-mdio.c
+++ b/sys/mips/cavium/octe/ethernet-mdio.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-mdio.h b/sys/mips/cavium/octe/ethernet-mdio.h
index d55fccb..c2c4ec6 100644
--- a/sys/mips/cavium/octe/ethernet-mdio.h
+++ b/sys/mips/cavium/octe/ethernet-mdio.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-mem.c b/sys/mips/cavium/octe/ethernet-mem.c
index 99a11c4..70c4986 100644
--- a/sys/mips/cavium/octe/ethernet-mem.c
+++ b/sys/mips/cavium/octe/ethernet-mem.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-mem.h b/sys/mips/cavium/octe/ethernet-mem.h
index 3751d99..d9058d9 100644
--- a/sys/mips/cavium/octe/ethernet-mem.h
+++ b/sys/mips/cavium/octe/ethernet-mem.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-mv88e61xx.c b/sys/mips/cavium/octe/ethernet-mv88e61xx.c
index d06b4a4..51c55f7 100644
--- a/sys/mips/cavium/octe/ethernet-mv88e61xx.c
+++ b/sys/mips/cavium/octe/ethernet-mv88e61xx.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octe/ethernet-mv88e61xx.h b/sys/mips/cavium/octe/ethernet-mv88e61xx.h
index 7ea2368..b61c054 100644
--- a/sys/mips/cavium/octe/ethernet-mv88e61xx.h
+++ b/sys/mips/cavium/octe/ethernet-mv88e61xx.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octe/ethernet-rgmii.c b/sys/mips/cavium/octe/ethernet-rgmii.c
index 530d8af..e8df9ba 100644
--- a/sys/mips/cavium/octe/ethernet-rgmii.c
+++ b/sys/mips/cavium/octe/ethernet-rgmii.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-rx.c b/sys/mips/cavium/octe/ethernet-rx.c
index 5c07da4..492d3e0 100644
--- a/sys/mips/cavium/octe/ethernet-rx.c
+++ b/sys/mips/cavium/octe/ethernet-rx.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-rx.h b/sys/mips/cavium/octe/ethernet-rx.h
index 04952cc..735d087 100644
--- a/sys/mips/cavium/octe/ethernet-rx.h
+++ b/sys/mips/cavium/octe/ethernet-rx.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-sgmii.c b/sys/mips/cavium/octe/ethernet-sgmii.c
index 4f9e24e..76fe6c9 100644
--- a/sys/mips/cavium/octe/ethernet-sgmii.c
+++ b/sys/mips/cavium/octe/ethernet-sgmii.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-spi.c b/sys/mips/cavium/octe/ethernet-spi.c
index 6296481..dc9e9cc 100644
--- a/sys/mips/cavium/octe/ethernet-spi.c
+++ b/sys/mips/cavium/octe/ethernet-spi.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-tx.c b/sys/mips/cavium/octe/ethernet-tx.c
index a444aef..b1d1f14 100644
--- a/sys/mips/cavium/octe/ethernet-tx.c
+++ b/sys/mips/cavium/octe/ethernet-tx.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-tx.h b/sys/mips/cavium/octe/ethernet-tx.h
index 749c30f..0947cde 100644
--- a/sys/mips/cavium/octe/ethernet-tx.h
+++ b/sys/mips/cavium/octe/ethernet-tx.h
@@ -1,6 +1,4 @@
 /*************************************************************************
- SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-util.h b/sys/mips/cavium/octe/ethernet-util.h
index add5f89..37b75bb 100644
--- a/sys/mips/cavium/octe/ethernet-util.h
+++ b/sys/mips/cavium/octe/ethernet-util.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet-xaui.c b/sys/mips/cavium/octe/ethernet-xaui.c
index 6e5a28d..e1854b2 100644
--- a/sys/mips/cavium/octe/ethernet-xaui.c
+++ b/sys/mips/cavium/octe/ethernet-xaui.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/ethernet.c b/sys/mips/cavium/octe/ethernet.c
index 86776b8..d473d82 100644
--- a/sys/mips/cavium/octe/ethernet.c
+++ b/sys/mips/cavium/octe/ethernet.c
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octe/mv88e61xxphy.c b/sys/mips/cavium/octe/mv88e61xxphy.c
index 123cba7..6d018c7 100644
--- a/sys/mips/cavium/octe/mv88e61xxphy.c
+++ b/sys/mips/cavium/octe/mv88e61xxphy.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octe/mv88e61xxphyreg.h b/sys/mips/cavium/octe/mv88e61xxphyreg.h
index 022e662..420741f 100644
--- a/sys/mips/cavium/octe/mv88e61xxphyreg.h
+++ b/sys/mips/cavium/octe/mv88e61xxphyreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octe/octe.c b/sys/mips/cavium/octe/octe.c
index 05c60e7..01b3152 100644
--- a/sys/mips/cavium/octe/octe.c
+++ b/sys/mips/cavium/octe/octe.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octe/octebus.c b/sys/mips/cavium/octe/octebus.c
index 41e6fcd..dde314d 100644
--- a/sys/mips/cavium/octe/octebus.c
+++ b/sys/mips/cavium/octe/octebus.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octe/octebusvar.h b/sys/mips/cavium/octe/octebusvar.h
index 53f03e3..bb488d4 100644
--- a/sys/mips/cavium/octe/octebusvar.h
+++ b/sys/mips/cavium/octe/octebusvar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octe/wrapper-cvmx-includes.h b/sys/mips/cavium/octe/wrapper-cvmx-includes.h
index 3f5bf7c..a7caf09 100644
--- a/sys/mips/cavium/octe/wrapper-cvmx-includes.h
+++ b/sys/mips/cavium/octe/wrapper-cvmx-includes.h
@@ -1,6 +1,4 @@
 /*************************************************************************
-SPDX-License-Identifier: BSD-3-Clause
-
 Copyright (c) 2003-2007  Cavium Networks (support@cavium.com). All rights
 reserved.
 
diff --git a/sys/mips/cavium/octeon_cop2.h b/sys/mips/cavium/octeon_cop2.h
index d7f852a..b7aa031 100644
--- a/sys/mips/cavium/octeon_cop2.h
+++ b/sys/mips/cavium/octeon_cop2.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_ds1337.c b/sys/mips/cavium/octeon_ds1337.c
index 349ed7a..73405a9 100644
--- a/sys/mips/cavium/octeon_ds1337.c
+++ b/sys/mips/cavium/octeon_ds1337.c
@@ -1,6 +1,4 @@
 /***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
  *  Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
  *  reserved.
  *
diff --git a/sys/mips/cavium/octeon_ebt3000_cf.c b/sys/mips/cavium/octeon_ebt3000_cf.c
index 0faf05c..987d9b4 100644
--- a/sys/mips/cavium/octeon_ebt3000_cf.c
+++ b/sys/mips/cavium/octeon_ebt3000_cf.c
@@ -1,6 +1,4 @@
 /***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
  *  Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
  *  reserved.
  *
diff --git a/sys/mips/cavium/octeon_gpio.c b/sys/mips/cavium/octeon_gpio.c
index 65a990a..58aea5a 100644
--- a/sys/mips/cavium/octeon_gpio.c
+++ b/sys/mips/cavium/octeon_gpio.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_gpiovar.h b/sys/mips/cavium/octeon_gpiovar.h
index 99a5c32..4cf007d3 100644
--- a/sys/mips/cavium/octeon_gpiovar.h
+++ b/sys/mips/cavium/octeon_gpiovar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_irq.h b/sys/mips/cavium/octeon_irq.h
index 7ffeb82..ee94956 100644
--- a/sys/mips/cavium/octeon_irq.h
+++ b/sys/mips/cavium/octeon_irq.h
@@ -1,6 +1,4 @@
 /***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2010  Cavium Networks (support@cavium.com). All rights
  * reserved.
  *
diff --git a/sys/mips/cavium/octeon_machdep.c b/sys/mips/cavium/octeon_machdep.c
index ae7926a..53a8442 100644
--- a/sys/mips/cavium/octeon_machdep.c
+++ b/sys/mips/cavium/octeon_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_mp.c b/sys/mips/cavium/octeon_mp.c
index 23534a4..783a45f 100644
--- a/sys/mips/cavium/octeon_mp.c
+++ b/sys/mips/cavium/octeon_mp.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_pci_console.c b/sys/mips/cavium/octeon_pci_console.c
index bf7640e..cc381fb 100644
--- a/sys/mips/cavium/octeon_pci_console.c
+++ b/sys/mips/cavium/octeon_pci_console.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_pcmap_regs.h b/sys/mips/cavium/octeon_pcmap_regs.h
index 6aad912..d8ef370 100644
--- a/sys/mips/cavium/octeon_pcmap_regs.h
+++ b/sys/mips/cavium/octeon_pcmap_regs.h
@@ -1,6 +1,4 @@
 /***********************license start***************
- * SPDX-License-Identifier: BSD-3-Clause
- *
  *  Copyright (c) 2003-2008 Cavium Networks (support@cavium.com). All rights
  *  reserved.
  *
diff --git a/sys/mips/cavium/octeon_pmc.c b/sys/mips/cavium/octeon_pmc.c
index 2a0885b..688b154 100644
--- a/sys/mips/cavium/octeon_pmc.c
+++ b/sys/mips/cavium/octeon_pmc.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_rnd.c b/sys/mips/cavium/octeon_rnd.c
index cf82057..ea4f041 100644
--- a/sys/mips/cavium/octeon_rnd.c
+++ b/sys/mips/cavium/octeon_rnd.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_rtc.c b/sys/mips/cavium/octeon_rtc.c
index bd4a908..b08d4db5 100644
--- a/sys/mips/cavium/octeon_rtc.c
+++ b/sys/mips/cavium/octeon_rtc.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octeon_wdog.c b/sys/mips/cavium/octeon_wdog.c
index 93658e2..d01cd90 100644
--- a/sys/mips/cavium/octeon_wdog.c
+++ b/sys/mips/cavium/octeon_wdog.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * Copyright (c) 2010-2011, Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/mips/cavium/octopci.c b/sys/mips/cavium/octopci.c
index ad1d2ea..48ef7e1 100644
--- a/sys/mips/cavium/octopci.c
+++ b/sys/mips/cavium/octopci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010-2011 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octopci_bus_space.c b/sys/mips/cavium/octopci_bus_space.c
index 3fc5497..9c5b367 100644
--- a/sys/mips/cavium/octopci_bus_space.c
+++ b/sys/mips/cavium/octopci_bus_space.c
@@ -2,8 +2,6 @@
 /*-
  * $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $
  *
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/octopcireg.h b/sys/mips/cavium/octopcireg.h
index e053ef8..2250309 100644
--- a/sys/mips/cavium/octopcireg.h
+++ b/sys/mips/cavium/octopcireg.h
@@ -1,6 +1,4 @@
 /***********************license start************************************
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2005-2007 Cavium Networks (support@cavium.com). All rights
  * reserved.
  *
diff --git a/sys/mips/cavium/octopcivar.h b/sys/mips/cavium/octopcivar.h
index 35e3b13..026e45a 100644
--- a/sys/mips/cavium/octopcivar.h
+++ b/sys/mips/cavium/octopcivar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/uart_bus_octeonusart.c b/sys/mips/cavium/uart_bus_octeonusart.c
index 95deae8..4284c1b 100644
--- a/sys/mips/cavium/uart_bus_octeonusart.c
+++ b/sys/mips/cavium/uart_bus_octeonusart.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/uart_cpu_octeonusart.c b/sys/mips/cavium/uart_cpu_octeonusart.c
index c81c274..1fd1e00 100644
--- a/sys/mips/cavium/uart_cpu_octeonusart.c
+++ b/sys/mips/cavium/uart_cpu_octeonusart.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/mips/cavium/uart_dev_oct16550.c b/sys/mips/cavium/uart_dev_oct16550.c
index 2c3772a..cfb347f 100644
--- a/sys/mips/cavium/uart_dev_oct16550.c
+++ b/sys/mips/cavium/uart_dev_oct16550.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause
- *
  * Copyright (c) 2003 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/mips/cavium/usb/octusb.c b/sys/mips/cavium/usb/octusb.c
index 5675797..c4d4ac7 100644
--- a/sys/mips/cavium/usb/octusb.c
+++ b/sys/mips/cavium/usb/octusb.c
@@ -2,8 +2,6 @@
 __FBSDID("$FreeBSD$");
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/cavium/usb/octusb.h b/sys/mips/cavium/usb/octusb.h
index b584653..8b8a5e2 100644
--- a/sys/mips/cavium/usb/octusb.h
+++ b/sys/mips/cavium/usb/octusb.h
@@ -1,8 +1,6 @@
 /* $FreeBSD$ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/cavium/usb/octusb_octeon.c b/sys/mips/cavium/usb/octusb_octeon.c
index 88270dc..5852e14 100644
--- a/sys/mips/cavium/usb/octusb_octeon.c
+++ b/sys/mips/cavium/usb/octusb_octeon.c
@@ -2,8 +2,6 @@
 __FBSDID("$FreeBSD$");
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/gxemul/gxemul_machdep.c b/sys/mips/gxemul/gxemul_machdep.c
index f0fa38b..a068efc 100644
--- a/sys/mips/gxemul/gxemul_machdep.c
+++ b/sys/mips/gxemul/gxemul_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/gxemul/mpreg.h b/sys/mips/gxemul/mpreg.h
index 8197e97..f562d07 100644
--- a/sys/mips/gxemul/mpreg.h
+++ b/sys/mips/gxemul/mpreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004-2012 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/idt/idt_machdep.c b/sys/mips/idt/idt_machdep.c
index f8976b5..b489319 100644
--- a/sys/mips/idt/idt_machdep.c
+++ b/sys/mips/idt/idt_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/idt/idtpci.c b/sys/mips/idt/idtpci.c
index f43ba5c..98d1996 100644
--- a/sys/mips/idt/idtpci.c
+++ b/sys/mips/idt/idtpci.c
@@ -1,8 +1,6 @@
 /* $NetBSD: idtpci.c,v 1.1 2007/03/20 08:52:02 dyoung Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2007 David Young.
  * Copyright (c) 2007 Oleskandr Tymoshenko.  All rights reserved.
  *
diff --git a/sys/mips/idt/idtreg.h b/sys/mips/idt/idtreg.h
index e04bb7f..3a088e7 100644
--- a/sys/mips/idt/idtreg.h
+++ b/sys/mips/idt/idtreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/idt/if_kr.c b/sys/mips/idt/if_kr.c
index 9d6d499..4b5d3bf 100644
--- a/sys/mips/idt/if_kr.c
+++ b/sys/mips/idt/if_kr.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (C) 2007 
  *	Oleksandr Tymoshenko <gonzo@freebsd.org>. All rights reserved.
  *
diff --git a/sys/mips/idt/if_krreg.h b/sys/mips/idt/if_krreg.h
index 59a2913..b20900a 100644
--- a/sys/mips/idt/if_krreg.h
+++ b/sys/mips/idt/if_krreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (C) 2007 
  *	Oleksandr Tymoshenko <gonzo@freebsd.org>. All rights reserved.
  *
diff --git a/sys/mips/idt/obio.c b/sys/mips/idt/obio.c
index 3c3d281..54abbb1 100644
--- a/sys/mips/idt/obio.c
+++ b/sys/mips/idt/obio.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2007, Oleksandr Tymoshenko <gonzo@freebsd.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/idt/obiovar.h b/sys/mips/idt/obiovar.h
index b5b6392..526efac 100644
--- a/sys/mips/idt/obiovar.h
+++ b/sys/mips/idt/obiovar.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/idt/uart_bus_rc32434.c b/sys/mips/idt/uart_bus_rc32434.c
index 15f3c1f..40e4770 100644
--- a/sys/mips/idt/uart_bus_rc32434.c
+++ b/sys/mips/idt/uart_bus_rc32434.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2007 Bruce M. Simpson.
  * All rights reserved.
  *
diff --git a/sys/mips/idt/uart_cpu_rc32434.c b/sys/mips/idt/uart_cpu_rc32434.c
index 52fa702..51be944 100644
--- a/sys/mips/idt/uart_cpu_rc32434.c
+++ b/sys/mips/idt/uart_cpu_rc32434.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/include/_align.h b/sys/mips/include/_align.h
index 67585a4..f945164 100644
--- a/sys/mips/include/_align.h
+++ b/sys/mips/include/_align.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: param.h,v 1.11 1998/08/30 22:05:35 millert Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/include/_bus.h b/sys/mips/include/_bus.h
index 866c19f..b701802 100644
--- a/sys/mips/include/_bus.h
+++ b/sys/mips/include/_bus.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 M. Warner Losh.
  * All rights reserved.
  *
diff --git a/sys/mips/include/_inttypes.h b/sys/mips/include/_inttypes.h
index 2f95e3b..7bea164 100644
--- a/sys/mips/include/_inttypes.h
+++ b/sys/mips/include/_inttypes.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/include/_limits.h b/sys/mips/include/_limits.h
index c0ba430..8755908 100644
--- a/sys/mips/include/_limits.h
+++ b/sys/mips/include/_limits.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/_stdint.h b/sys/mips/include/_stdint.h
index 83455b7..ebf6eb5 100644
--- a/sys/mips/include/_stdint.h
+++ b/sys/mips/include/_stdint.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h
index 1f654c4..d37b1bc 100644
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/include/asm.h b/sys/mips/include/asm.h
index 1712f1b..8a7d640 100644
--- a/sys/mips/include/asm.h
+++ b/sys/mips/include/asm.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: asm.h,v 1.29 2000/12/14 21:29:51 jeffs Exp $	*/
 
 /*
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/atomic.h b/sys/mips/include/atomic.h
index d299fb4..79f6dfe 100644
--- a/sys/mips/include/atomic.h
+++ b/sys/mips/include/atomic.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 1998 Doug Rabson
  * All rights reserved.
  *
diff --git a/sys/mips/include/bootinfo.h b/sys/mips/include/bootinfo.h
index 05d1787..38225a2 100644
--- a/sys/mips/include/bootinfo.h
+++ b/sys/mips/include/bootinfo.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2013 Robert N. M. Watson
  * Copyright (C) 1994 by Rodney W. Grimes, Milwaukie, Oregon  97222
  * All rights reserved.
diff --git a/sys/mips/include/bus.h b/sys/mips/include/bus.h
index 9a3de38..5e85b17 100644
--- a/sys/mips/include/bus.h
+++ b/sys/mips/include/bus.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/include/bus_dma.h b/sys/mips/include/bus_dma.h
index 2a9fc81..35dfba2 100644
--- a/sys/mips/include/bus_dma.h
+++ b/sys/mips/include/bus_dma.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Scott Long
  * All rights reserved.
  *
diff --git a/sys/mips/include/cache.h b/sys/mips/include/cache.h
index 2a02832..9fc9159 100644
--- a/sys/mips/include/cache.h
+++ b/sys/mips/include/cache.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: cache.h,v 1.6 2003/02/17 11:35:01 simonb Exp $	*/
 
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/include/cache_mipsNN.h b/sys/mips/include/cache_mipsNN.h
index 80af7b0..200e685 100644
--- a/sys/mips/include/cache_mipsNN.h
+++ b/sys/mips/include/cache_mipsNN.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: cache_mipsNN.h,v 1.4 2003/02/17 11:35:02 simonb Exp $	*/
 
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/include/cache_r4k.h b/sys/mips/include/cache_r4k.h
index e01be24..0ab504e 100644
--- a/sys/mips/include/cache_r4k.h
+++ b/sys/mips/include/cache_r4k.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: cache_r4k.h,v 1.10 2003/03/08 04:43:26 rafal Exp $	*/
 
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/include/counter.h b/sys/mips/include/counter.h
index 4f75781..b293b29 100644
--- a/sys/mips/include/counter.h
+++ b/sys/mips/include/counter.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/include/cpu.h b/sys/mips/include/cpu.h
index 4056368..2691cf2 100644
--- a/sys/mips/include/cpu.h
+++ b/sys/mips/include/cpu.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: cpu.h,v 1.4 1998/09/15 10:50:12 pefo Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/cpufunc.h b/sys/mips/include/cpufunc.h
index 8f28009..3ebb8c1 100644
--- a/sys/mips/include/cpufunc.h
+++ b/sys/mips/include/cpufunc.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: pio.h,v 1.2 1998/09/15 10:50:12 pefo Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-4-Clause
- *
  * Copyright (c) 2002-2004 Juli Mallett.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/cpuinfo.h b/sys/mips/include/cpuinfo.h
index 29643a7..deeb93b 100644
--- a/sys/mips/include/cpuinfo.h
+++ b/sys/mips/include/cpuinfo.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: cpu.h,v 1.70 2003/01/17 23:36:08 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/cpuregs.h b/sys/mips/include/cpuregs.h
index d1bcb6e..a1d9bc0 100644
--- a/sys/mips/include/cpuregs.h
+++ b/sys/mips/include/cpuregs.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: cpuregs.h,v 1.70 2006/05/15 02:26:54 simonb Exp $	*/
 
 /*
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/db_machdep.h b/sys/mips/include/db_machdep.h
index 3039b64..a495955 100644
--- a/sys/mips/include/db_machdep.h
+++ b/sys/mips/include/db_machdep.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: db_machdep.h,v 1.2 1998/09/15 10:50:12 pefo Exp $ */
 
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/elf.h b/sys/mips/include/elf.h
index 1944000..26c4799 100644
--- a/sys/mips/include/elf.h
+++ b/sys/mips/include/elf.h
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
+/*
  * Copyright (c) 2013 M. Warner Losh. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/endian.h b/sys/mips/include/endian.h
index 09aaa7a..ead6dc4 100644
--- a/sys/mips/include/endian.h
+++ b/sys/mips/include/endian.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1987, 1991 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/mips/include/exec.h b/sys/mips/include/exec.h
index 35ab6ed..4650090 100644
--- a/sys/mips/include/exec.h
+++ b/sys/mips/include/exec.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/fdt.h b/sys/mips/include/fdt.h
index ef92de8..62356b8 100644
--- a/sys/mips/include/fdt.h
+++ b/sys/mips/include/fdt.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
diff --git a/sys/mips/include/float.h b/sys/mips/include/float.h
index 0410d8c..86efd02 100644
--- a/sys/mips/include/float.h
+++ b/sys/mips/include/float.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/mips/include/floatingpoint.h b/sys/mips/include/floatingpoint.h
index b7c1547..cda9e46 100644
--- a/sys/mips/include/floatingpoint.h
+++ b/sys/mips/include/floatingpoint.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1993 Andrew Moore, Talke Studio
  * All rights reserved.
  *
diff --git a/sys/mips/include/frame.h b/sys/mips/include/frame.h
index 726b129..c04888e 100644
--- a/sys/mips/include/frame.h
+++ b/sys/mips/include/frame.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: frame.h,v 1.3 1998/09/15 10:50:12 pefo Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/gdb_machdep.h b/sys/mips/include/gdb_machdep.h
index ee81255..a76a824 100644
--- a/sys/mips/include/gdb_machdep.h
+++ b/sys/mips/include/gdb_machdep.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/mips/include/hwfunc.h b/sys/mips/include/hwfunc.h
index f1ac555..5c797fc 100644
--- a/sys/mips/include/hwfunc.h
+++ b/sys/mips/include/hwfunc.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2004 Juli Mallett.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/include/ieee.h b/sys/mips/include/ieee.h
index 02c5aaf..a7411dd 100644
--- a/sys/mips/include/ieee.h
+++ b/sys/mips/include/ieee.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: ieee754.h,v 1.4 2003/10/27 02:30:26 simonb Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/in_cksum.h b/sys/mips/include/in_cksum.h
index d55b838..72edfba 100644
--- a/sys/mips/include/in_cksum.h
+++ b/sys/mips/include/in_cksum.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/mips/include/intr_machdep.h b/sys/mips/include/intr_machdep.h
index 767b952..7c1d976 100644
--- a/sys/mips/include/intr_machdep.h
+++ b/sys/mips/include/intr_machdep.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/include/kdb.h b/sys/mips/include/kdb.h
index 33e54bc..6ca6654 100644
--- a/sys/mips/include/kdb.h
+++ b/sys/mips/include/kdb.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/mips/include/limits.h b/sys/mips/include/limits.h
index 0272414..2381553 100644
--- a/sys/mips/include/limits.h
+++ b/sys/mips/include/limits.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/md_var.h b/sys/mips/include/md_var.h
index 7fa2286..622781d 100644
--- a/sys/mips/include/md_var.h
+++ b/sys/mips/include/md_var.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1995 Bruce D. Evans.
  * All rights reserved.
  *
diff --git a/sys/mips/include/memdev.h b/sys/mips/include/memdev.h
index b08bae9..f30945d 100644
--- a/sys/mips/include/memdev.h
+++ b/sys/mips/include/memdev.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004 Mark R V Murray
  * All rights reserved.
  *
diff --git a/sys/mips/include/metadata.h b/sys/mips/include/metadata.h
index 6200172..779c2f6 100644
--- a/sys/mips/include/metadata.h
+++ b/sys/mips/include/metadata.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003 Peter Wemm <peter@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/include/minidump.h b/sys/mips/include/minidump.h
index a4ceb02..b2d75d8 100644
--- a/sys/mips/include/minidump.h
+++ b/sys/mips/include/minidump.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Peter Wemm
  * All rights reserved.
  *
diff --git a/sys/mips/include/mips_opcode.h b/sys/mips/include/mips_opcode.h
index df1faa8..fd0e976 100644
--- a/sys/mips/include/mips_opcode.h
+++ b/sys/mips/include/mips_opcode.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: mips_opcode.h,v 1.2 1999/01/27 04:46:05 imp Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/octeon_cop2.h b/sys/mips/include/octeon_cop2.h
index 9bba74d..d5161dc 100644
--- a/sys/mips/include/octeon_cop2.h
+++ b/sys/mips/include/octeon_cop2.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/include/ofw_machdep.h b/sys/mips/include/ofw_machdep.h
index 1f73f67..f14cfdf 100644
--- a/sys/mips/include/ofw_machdep.h
+++ b/sys/mips/include/ofw_machdep.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2001 by Thomas Moestl <tmm@FreeBSD.org>.
  * All rights reserved.
  *
diff --git a/sys/mips/include/param.h b/sys/mips/include/param.h
index 1dc3112..7c5e667 100644
--- a/sys/mips/include/param.h
+++ b/sys/mips/include/param.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: param.h,v 1.11 1998/08/30 22:05:35 millert Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/include/pcb.h b/sys/mips/include/pcb.h
index ec96f39..fa84a7d 100644
--- a/sys/mips/include/pcb.h
+++ b/sys/mips/include/pcb.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: pcb.h,v 1.3 1998/09/15 10:50:12 pefo Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/include/pcpu.h b/sys/mips/include/pcpu.h
index 683a68a..f4be33d 100644
--- a/sys/mips/include/pcpu.h
+++ b/sys/mips/include/pcpu.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
  * Copyright (c) Peter Wemm <peter@netplex.com.au>
  * All rights reserved.
diff --git a/sys/mips/include/pmap.h b/sys/mips/include/pmap.h
index 6d6cc3a..0354119 100644
--- a/sys/mips/include/pmap.h
+++ b/sys/mips/include/pmap.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/mips/include/proc.h b/sys/mips/include/proc.h
index b0d2c63..da88d2a 100644
--- a/sys/mips/include/proc.h
+++ b/sys/mips/include/proc.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: proc.h,v 1.2 1998/09/15 10:50:12 pefo Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/profile.h b/sys/mips/include/profile.h
index 17cc85b..aac6e5d 100644
--- a/sys/mips/include/profile.h
+++ b/sys/mips/include/profile.h
@@ -1,7 +1,5 @@
 /*	$OpenBSD: profile.h,v 1.2 1999/01/27 04:46:05 imp Exp $ */
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/pte.h b/sys/mips/include/pte.h
index 3dbf9d8..4b628db 100644
--- a/sys/mips/include/pte.h
+++ b/sys/mips/include/pte.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/include/ptrace.h b/sys/mips/include/ptrace.h
index 137f85c..a34b6f9 100644
--- a/sys/mips/include/ptrace.h
+++ b/sys/mips/include/ptrace.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/reg.h b/sys/mips/include/reg.h
index 69b2263..0dc36c6 100644
--- a/sys/mips/include/reg.h
+++ b/sys/mips/include/reg.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: reg.h,v 1.1 1998/01/28 11:14:53 pefo Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/include/regdef.h b/sys/mips/include/regdef.h
index 5a6b57f..b55db56 100644
--- a/sys/mips/include/regdef.h
+++ b/sys/mips/include/regdef.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: regdef.h,v 1.12 2005/12/11 12:18:09 christos Exp $	*/
 
 /*
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/regnum.h b/sys/mips/include/regnum.h
index 1ce21e0..829ca46 100644
--- a/sys/mips/include/regnum.h
+++ b/sys/mips/include/regnum.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: regnum.h,v 1.3 1999/01/27 04:46:06 imp Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/include/reloc.h b/sys/mips/include/reloc.h
index 7b5610b..113745f 100644
--- a/sys/mips/include/reloc.h
+++ b/sys/mips/include/reloc.h
@@ -1,6 +1,4 @@
 /*
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
  *
diff --git a/sys/mips/include/runq.h b/sys/mips/include/runq.h
index d3207b3..56d6e2f 100644
--- a/sys/mips/include/runq.h
+++ b/sys/mips/include/runq.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/include/sc_machdep.h b/sys/mips/include/sc_machdep.h
index 61a2a86..4f3526f 100644
--- a/sys/mips/include/sc_machdep.h
+++ b/sys/mips/include/sc_machdep.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003 Jake Burkholder.
  * All rights reserved.
  *
diff --git a/sys/mips/include/sf_buf.h b/sys/mips/include/sf_buf.h
index 2705167..d61bc91 100644
--- a/sys/mips/include/sf_buf.h
+++ b/sys/mips/include/sf_buf.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
  * All rights reserved.
  *
diff --git a/sys/mips/include/sigframe.h b/sys/mips/include/sigframe.h
index 03f55bc..69c7c02 100644
--- a/sys/mips/include/sigframe.h
+++ b/sys/mips/include/sigframe.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1999 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/mips/include/signal.h b/sys/mips/include/signal.h
index 81e4169..5107af0 100644
--- a/sys/mips/include/signal.h
+++ b/sys/mips/include/signal.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: signal.h,v 1.2 1999/01/27 04:10:03 imp Exp $	*/
 
 /*
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/sysarch.h b/sys/mips/include/sysarch.h
index effcc72..350ad95 100644
--- a/sys/mips/include/sysarch.h
+++ b/sys/mips/include/sysarch.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1993 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/mips/include/tlb.h b/sys/mips/include/tlb.h
index 24a1813..c3baf78 100644
--- a/sys/mips/include/tlb.h
+++ b/sys/mips/include/tlb.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/include/tls.h b/sys/mips/include/tls.h
index e7b80c7..97e0903 100644
--- a/sys/mips/include/tls.h
+++ b/sys/mips/include/tls.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Oleksandr Tymoshenko
  * All rights reserved.
  *
diff --git a/sys/mips/include/trap.h b/sys/mips/include/trap.h
index 8d0838d..32bf1a8 100644
--- a/sys/mips/include/trap.h
+++ b/sys/mips/include/trap.h
@@ -1,8 +1,6 @@
 /*	$OpenBSD: trap.h,v 1.3 1999/01/27 04:46:06 imp Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/include/ucontext.h b/sys/mips/include/ucontext.h
index 821be94..2b1a952 100644
--- a/sys/mips/include/ucontext.h
+++ b/sys/mips/include/ucontext.h
@@ -1,6 +1,4 @@
 /*
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/include/varargs.h b/sys/mips/include/varargs.h
index 3998122..c916f33 100644
--- a/sys/mips/include/varargs.h
+++ b/sys/mips/include/varargs.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: varargs.h,v 1.16 1999/01/22 14:19:54 mycroft Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
diff --git a/sys/mips/include/vdso.h b/sys/mips/include/vdso.h
index b4771e6..082df1a 100644
--- a/sys/mips/include/vdso.h
+++ b/sys/mips/include/vdso.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
  * All rights reserved.
  *
diff --git a/sys/mips/include/vm.h b/sys/mips/include/vm.h
index 5a7565e..658eb1c 100644
--- a/sys/mips/include/vm.h
+++ b/sys/mips/include/vm.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
  * All rights reserved.
  *
diff --git a/sys/mips/include/vmparam.h b/sys/mips/include/vmparam.h
index df0b60e..020d0ac 100644
--- a/sys/mips/include/vmparam.h
+++ b/sys/mips/include/vmparam.h
@@ -2,8 +2,6 @@
 /*	$NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $	*/
 
 /*
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c
index e56df25..8874643 100644
--- a/sys/mips/malta/gt.c
+++ b/sys/mips/malta/gt.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Olivier Houchard.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c
index 0ea6e78..643943d 100644
--- a/sys/mips/malta/gt_pci.c
+++ b/sys/mips/malta/gt_pci.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: gt_pci.c,v 1.4 2003/07/15 00:24:54 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/malta/gt_pci_bus_space.c b/sys/mips/malta/gt_pci_bus_space.c
index 861d42a..63eaabe 100644
--- a/sys/mips/malta/gt_pci_bus_space.c
+++ b/sys/mips/malta/gt_pci_bus_space.c
@@ -2,8 +2,6 @@
 /*-
  * $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $
  *
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/malta/gt_pci_bus_space.h b/sys/mips/malta/gt_pci_bus_space.h
index 963808b..77392f5 100644
--- a/sys/mips/malta/gt_pci_bus_space.h
+++ b/sys/mips/malta/gt_pci_bus_space.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/malta/gtreg.h b/sys/mips/malta/gtreg.h
index 5237409..726f5fe 100644
--- a/sys/mips/malta/gtreg.h
+++ b/sys/mips/malta/gtreg.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: gtreg.h,v 1.2 2005/12/24 20:07:03 perry Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/malta/gtvar.h b/sys/mips/malta/gtvar.h
index ac937fe..f7830ef 100644
--- a/sys/mips/malta/gtvar.h
+++ b/sys/mips/malta/gtvar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Olivier Houchard.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/malta/malta_machdep.c b/sys/mips/malta/malta_machdep.c
index 081384f..b31ba2f 100644
--- a/sys/mips/malta/malta_machdep.c
+++ b/sys/mips/malta/malta_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/malta/maltareg.h b/sys/mips/malta/maltareg.h
index 6b97af3..c311d30 100644
--- a/sys/mips/malta/maltareg.h
+++ b/sys/mips/malta/maltareg.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: maltareg.h,v 1.1 2002/03/07 14:44:04 simonb Exp $	*/
 
-/*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
+/*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/malta/obio.c b/sys/mips/malta/obio.c
index 89169a8..64ac9c7 100644
--- a/sys/mips/malta/obio.c
+++ b/sys/mips/malta/obio.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/malta/obiovar.h b/sys/mips/malta/obiovar.h
index cf8ccb9..801d461 100644
--- a/sys/mips/malta/obiovar.h
+++ b/sys/mips/malta/obiovar.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/malta/uart_bus_maltausart.c b/sys/mips/malta/uart_bus_maltausart.c
index 738785e..e075fff 100644
--- a/sys/mips/malta/uart_bus_maltausart.c
+++ b/sys/mips/malta/uart_bus_maltausart.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/malta/uart_cpu_maltausart.c b/sys/mips/malta/uart_cpu_maltausart.c
index be5edfd..07ea548 100644
--- a/sys/mips/malta/uart_cpu_maltausart.c
+++ b/sys/mips/malta/uart_cpu_maltausart.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/malta/yamon.c b/sys/mips/malta/yamon.c
index d2a30f2..e669bfe 100644
--- a/sys/mips/malta/yamon.c
+++ b/sys/mips/malta/yamon.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006-2008 Bruce M. Simpson
  * All rights reserved.
  *
diff --git a/sys/mips/malta/yamon.h b/sys/mips/malta/yamon.h
index aa2ee1a..f039ae8 100644
--- a/sys/mips/malta/yamon.h
+++ b/sys/mips/malta/yamon.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/autoconf.c b/sys/mips/mips/autoconf.c
index da30ed6..e16c05c 100644
--- a/sys/mips/mips/autoconf.c
+++ b/sys/mips/mips/autoconf.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/bus_space_generic.c b/sys/mips/mips/bus_space_generic.c
index 6ec9890..b57a739 100644
--- a/sys/mips/mips/bus_space_generic.c
+++ b/sys/mips/mips/bus_space_generic.c
@@ -2,8 +2,6 @@
 /*-
  * $Id: bus.h,v 1.6 2007/08/09 11:23:32 katta Exp $
  *
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD AND BSD-4-Clause
- *
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/busdma_machdep.c b/sys/mips/mips/busdma_machdep.c
index e7e5b0e..bd2cada 100644
--- a/sys/mips/mips/busdma_machdep.c
+++ b/sys/mips/mips/busdma_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Oleksandr Tymoshenko
  * All rights reserved.
  *
diff --git a/sys/mips/mips/cache.c b/sys/mips/mips/cache.c
index 210462e..534e6cd 100644
--- a/sys/mips/mips/cache.c
+++ b/sys/mips/mips/cache.c
@@ -1,8 +1,6 @@
 /*      $NetBSD: cache.c,v 1.33 2005/12/24 23:24:01 perry Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
- *
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/cache_mipsNN.c b/sys/mips/mips/cache_mipsNN.c
index 7b1a035..50eb76b 100644
--- a/sys/mips/mips/cache_mipsNN.c
+++ b/sys/mips/mips/cache_mipsNN.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: cache_mipsNN.c,v 1.10 2005/12/24 20:07:19 perry Exp $	*/
 
 /*
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/cpu.c b/sys/mips/mips/cpu.c
index 113b752..60fe134 100644
--- a/sys/mips/mips/cpu.c
+++ b/sys/mips/mips/cpu.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004 Juli Mallett.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/mips/db_disasm.c b/sys/mips/mips/db_disasm.c
index 8a31a2d..108c9dd 100644
--- a/sys/mips/mips/db_disasm.c
+++ b/sys/mips/mips/db_disasm.c
@@ -1,7 +1,5 @@
 /*	$OpenBSD: db_disasm.c,v 1.1 1998/03/16 09:03:24 pefo Exp $	*/
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/mips/mips/db_interface.c b/sys/mips/mips/db_interface.c
index a9c84e3..b3da6f2 100644
--- a/sys/mips/mips/db_interface.c
+++ b/sys/mips/mips/db_interface.c
@@ -1,8 +1,6 @@
 /*	$OpenBSD: db_machdep.c,v 1.2 1998/09/15 10:50:13 pefo Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/mips/db_trace.c b/sys/mips/mips/db_trace.c
index ce16dd3..1359a53 100644
--- a/sys/mips/mips/db_trace.c
+++ b/sys/mips/mips/db_trace.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004-2005, Juniper Networks, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/dump_machdep.c b/sys/mips/mips/dump_machdep.c
index 2e85401..18ea63e 100644
--- a/sys/mips/mips/dump_machdep.c
+++ b/sys/mips/mips/dump_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2002 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/mips/mips/elf_machdep.c b/sys/mips/mips/elf_machdep.c
index b0cd441..b332bf3 100644
--- a/sys/mips/mips/elf_machdep.c
+++ b/sys/mips/mips/elf_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 1996-1998 John D. Polstra.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/elf_trampoline.c b/sys/mips/mips/elf_trampoline.c
index bd96de1..7be26bb 100644
--- a/sys/mips/mips/elf_trampoline.c
+++ b/sys/mips/mips/elf_trampoline.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Olivier Houchard.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/mips/mips/freebsd32_machdep.c b/sys/mips/mips/freebsd32_machdep.c
index f79b017..4ed58e21 100644
--- a/sys/mips/mips/freebsd32_machdep.c
+++ b/sys/mips/mips/freebsd32_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/mips/gdb_machdep.c b/sys/mips/mips/gdb_machdep.c
index 63ae215..6737856 100644
--- a/sys/mips/mips/gdb_machdep.c
+++ b/sys/mips/mips/gdb_machdep.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: kgdb_machdep.c,v 1.11 2005/12/24 22:45:35 perry Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
- *
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/mips/mips/genassym.c b/sys/mips/mips/genassym.c
index 502c6e9..3c0c1cc 100644
--- a/sys/mips/mips/genassym.c
+++ b/sys/mips/mips/genassym.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/in_cksum.c b/sys/mips/mips/in_cksum.c
index 8f9a2d9..31bcd3e 100644
--- a/sys/mips/mips/in_cksum.c
+++ b/sys/mips/mips/in_cksum.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1988, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1996
diff --git a/sys/mips/mips/intr_machdep.c b/sys/mips/mips/intr_machdep.c
index c4c6661..e8423f6 100644
--- a/sys/mips/mips/intr_machdep.c
+++ b/sys/mips/mips/intr_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Oleksandr Tymoshenko
  * Copyright (c) 2002-2004 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/mips/mips/libkern_machdep.c b/sys/mips/mips/libkern_machdep.c
index 2ff3608..6548bed 100644
--- a/sys/mips/mips/libkern_machdep.c
+++ b/sys/mips/mips/libkern_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2012 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/mips/machdep.c b/sys/mips/mips/machdep.c
index 29e58db..3d44cda 100644
--- a/sys/mips/mips/machdep.c
+++ b/sys/mips/mips/machdep.c
@@ -1,8 +1,6 @@
     /*	$OpenBSD: machdep.c,v 1.33 1998/09/15 10:58:54 pefo Exp $	*/
 /* tracked to 1.38 */
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/mips/mem.c b/sys/mips/mips/mem.c
index d11f8a1..30f4b34 100644
--- a/sys/mips/mips/mem.c
+++ b/sys/mips/mips/mem.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
diff --git a/sys/mips/mips/minidump_machdep.c b/sys/mips/mips/minidump_machdep.c
index 784bc76..8281eae 100644
--- a/sys/mips/mips/minidump_machdep.c
+++ b/sys/mips/mips/minidump_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Oleksandr Tymoshenko <gonzo@freebsd.org>
  * Copyright (c) 2008 Semihalf, Grzegorz Bernacki
  * All rights reserved.
diff --git a/sys/mips/mips/mp_machdep.c b/sys/mips/mips/mp_machdep.c
index 88f3453..9f98909 100644
--- a/sys/mips/mips/mp_machdep.c
+++ b/sys/mips/mips/mp_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Neelkanth Natu
  * All rights reserved.
  *
diff --git a/sys/mips/mips/octeon_cop2.c b/sys/mips/mips/octeon_cop2.c
index ab7308c..c85522d 100644
--- a/sys/mips/mips/octeon_cop2.c
+++ b/sys/mips/mips/octeon_cop2.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2011, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/mips/pm_machdep.c b/sys/mips/mips/pm_machdep.c
index 9c20f94..2b02ba9 100644
--- a/sys/mips/mips/pm_machdep.c
+++ b/sys/mips/mips/pm_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1992 Terrence R. Lambert.
  * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
  * All rights reserved.
diff --git a/sys/mips/mips/pmap.c b/sys/mips/mips/pmap.c
index 47ac4a6..2e191b5 100644
--- a/sys/mips/mips/pmap.c
+++ b/sys/mips/mips/pmap.c
@@ -1,6 +1,4 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
+/*
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
  * Copyright (c) 1994 John S. Dyson
diff --git a/sys/mips/mips/ptrace_machdep.c b/sys/mips/mips/ptrace_machdep.c
index 372995c..2c268d8 100644
--- a/sys/mips/mips/ptrace_machdep.c
+++ b/sys/mips/mips/ptrace_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 M. Warner Losh.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/sc_machdep.c b/sys/mips/mips/sc_machdep.c
index 8a77cef..a81ffdd 100644
--- a/sys/mips/mips/sc_machdep.c
+++ b/sys/mips/mips/sc_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003 Jake Burkholder.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/stack_machdep.c b/sys/mips/mips/stack_machdep.c
index 24e173e..0f7c4bb 100644
--- a/sys/mips/mips/stack_machdep.c
+++ b/sys/mips/mips/stack_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2005 Antoine Brodin
  * All rights reserved.
  *
diff --git a/sys/mips/mips/stdatomic.c b/sys/mips/mips/stdatomic.c
index d1cc6b4..a3f3135 100644
--- a/sys/mips/mips/stdatomic.c
+++ b/sys/mips/mips/stdatomic.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2013 Ed Schouten <ed@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/mips/sys_machdep.c b/sys/mips/mips/sys_machdep.c
index 24f8dbc..5cd5366 100644
--- a/sys/mips/mips/sys_machdep.c
+++ b/sys/mips/mips/sys_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
- *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c
index c415d7d..8bcc534 100644
--- a/sys/mips/mips/tick.c
+++ b/sys/mips/mips/tick.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006-2007 Bruce M. Simpson.
  * Copyright (c) 2003-2004 Juli Mallett.
  * All rights reserved.
diff --git a/sys/mips/mips/tlb.c b/sys/mips/mips/tlb.c
index 6a908de..f554faa 100644
--- a/sys/mips/mips/tlb.c
+++ b/sys/mips/mips/tlb.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2004-2010 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c
index e9aebeb..af2904f 100644
--- a/sys/mips/mips/trap.c
+++ b/sys/mips/mips/trap.c
@@ -1,8 +1,6 @@
 /*	$OpenBSD: trap.c,v 1.19 1998/09/30 12:40:41 pefo Exp $	*/
 /* tracked to 1.23 */
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/mips/uio_machdep.c b/sys/mips/mips/uio_machdep.c
index 55dbff6..d6db1f1 100644
--- a/sys/mips/mips/uio_machdep.c
+++ b/sys/mips/mips/uio_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
  * Copyright (c) 1982, 1986, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/sys/mips/mips/uma_machdep.c b/sys/mips/mips/uma_machdep.c
index 571651c..3bc7d5a 100644
--- a/sys/mips/mips/uma_machdep.c
+++ b/sys/mips/mips/uma_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
  * All rights reserved.
  *
diff --git a/sys/mips/mips/vm_machdep.c b/sys/mips/mips/vm_machdep.c
index f8e5443..34f06a8 100644
--- a/sys/mips/mips/vm_machdep.c
+++ b/sys/mips/mips/vm_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * Copyright (c) 1989, 1990 William Jolitz
  * Copyright (c) 1994 John Dyson
diff --git a/sys/mips/nlm/board.c b/sys/mips/nlm/board.c
index bf42bca..bb335bf 100644
--- a/sys/mips/nlm/board.c
+++ b/sys/mips/nlm/board.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/board.h b/sys/mips/nlm/board.h
index 17f9c04..3143d64 100644
--- a/sys/mips/nlm/board.h
+++ b/sys/mips/nlm/board.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/board_cpld.c b/sys/mips/nlm/board_cpld.c
index e1a3a2c..aa138af 100644
--- a/sys/mips/nlm/board_cpld.c
+++ b/sys/mips/nlm/board_cpld.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/board_eeprom.c b/sys/mips/nlm/board_eeprom.c
index d4fe1cb..c202acf 100644
--- a/sys/mips/nlm/board_eeprom.c
+++ b/sys/mips/nlm/board_eeprom.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/bus_space_rmi.c b/sys/mips/nlm/bus_space_rmi.c
index 87e0594..af1af69 100644
--- a/sys/mips/nlm/bus_space_rmi.c
+++ b/sys/mips/nlm/bus_space_rmi.c
@@ -1,6 +1,4 @@
 /*
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/bus_space_rmi_pci.c b/sys/mips/nlm/bus_space_rmi_pci.c
index 7b5f487..e7ec449 100644
--- a/sys/mips/nlm/bus_space_rmi_pci.c
+++ b/sys/mips/nlm/bus_space_rmi_pci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/clock.h b/sys/mips/nlm/clock.h
index b36823f..7a2be07 100644
--- a/sys/mips/nlm/clock.h
+++ b/sys/mips/nlm/clock.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/cms.c b/sys/mips/nlm/cms.c
index 197e989..02431d6 100644
--- a/sys/mips/nlm/cms.c
+++ b/sys/mips/nlm/cms.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/dev/net/mdio.c b/sys/mips/nlm/dev/net/mdio.c
index 7cf8224..0db5476 100644
--- a/sys/mips/nlm/dev/net/mdio.c
+++ b/sys/mips/nlm/dev/net/mdio.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/net/nae.c b/sys/mips/nlm/dev/net/nae.c
index 0b55fe7..3fbcbb7 100644
--- a/sys/mips/nlm/dev/net/nae.c
+++ b/sys/mips/nlm/dev/net/nae.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/net/sgmii.c b/sys/mips/nlm/dev/net/sgmii.c
index 8c51ddf..1d7d741 100644
--- a/sys/mips/nlm/dev/net/sgmii.c
+++ b/sys/mips/nlm/dev/net/sgmii.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/net/ucore/ucore.h b/sys/mips/nlm/dev/net/ucore/ucore.h
index 6826656..7d791fb 100644
--- a/sys/mips/nlm/dev/net/ucore/ucore.h
+++ b/sys/mips/nlm/dev/net/ucore/ucore.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/net/ucore/ucore_app.c b/sys/mips/nlm/dev/net/ucore/ucore_app.c
index 4a9f970c..71f2805 100644
--- a/sys/mips/nlm/dev/net/ucore/ucore_app.c
+++ b/sys/mips/nlm/dev/net/ucore/ucore_app.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/net/xaui.c b/sys/mips/nlm/dev/net/xaui.c
index aaf65e7..ebefa66 100644
--- a/sys/mips/nlm/dev/net/xaui.c
+++ b/sys/mips/nlm/dev/net/xaui.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/net/xlpge.c b/sys/mips/nlm/dev/net/xlpge.c
index 32b0f1c..4f3aeb0 100644
--- a/sys/mips/nlm/dev/net/xlpge.c
+++ b/sys/mips/nlm/dev/net/xlpge.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/net/xlpge.h b/sys/mips/nlm/dev/net/xlpge.h
index 5aabc68..027e1cf 100644
--- a/sys/mips/nlm/dev/net/xlpge.h
+++ b/sys/mips/nlm/dev/net/xlpge.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/sec/nlmrsa.c b/sys/mips/nlm/dev/sec/nlmrsa.c
index 2c67267..8710dd9 100644
--- a/sys/mips/nlm/dev/sec/nlmrsa.c
+++ b/sys/mips/nlm/dev/sec/nlmrsa.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/sec/nlmrsalib.h b/sys/mips/nlm/dev/sec/nlmrsalib.h
index c3e155d..6a29f37 100644
--- a/sys/mips/nlm/dev/sec/nlmrsalib.h
+++ b/sys/mips/nlm/dev/sec/nlmrsalib.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/sec/nlmsec.c b/sys/mips/nlm/dev/sec/nlmsec.c
index 43be89c..78fc961 100644
--- a/sys/mips/nlm/dev/sec/nlmsec.c
+++ b/sys/mips/nlm/dev/sec/nlmsec.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/sec/nlmseclib.c b/sys/mips/nlm/dev/sec/nlmseclib.c
index 01210c0..f953025 100644
--- a/sys/mips/nlm/dev/sec/nlmseclib.c
+++ b/sys/mips/nlm/dev/sec/nlmseclib.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/sec/nlmseclib.h b/sys/mips/nlm/dev/sec/nlmseclib.h
index fdf9b00..038b0ae 100644
--- a/sys/mips/nlm/dev/sec/nlmseclib.h
+++ b/sys/mips/nlm/dev/sec/nlmseclib.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/dev/sec/rsa_ucode.h b/sys/mips/nlm/dev/sec/rsa_ucode.h
index 057a219..4a4f3ef 100644
--- a/sys/mips/nlm/dev/sec/rsa_ucode.h
+++ b/sys/mips/nlm/dev/sec/rsa_ucode.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/bridge.h b/sys/mips/nlm/hal/bridge.h
index 9374a7c..0598809 100644
--- a/sys/mips/nlm/hal/bridge.h
+++ b/sys/mips/nlm/hal/bridge.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/cop2.h b/sys/mips/nlm/hal/cop2.h
index 80ec474..9cbd266 100644
--- a/sys/mips/nlm/hal/cop2.h
+++ b/sys/mips/nlm/hal/cop2.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/cpucontrol.h b/sys/mips/nlm/hal/cpucontrol.h
index 2328bad..1d08eb0 100644
--- a/sys/mips/nlm/hal/cpucontrol.h
+++ b/sys/mips/nlm/hal/cpucontrol.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/fmn.c b/sys/mips/nlm/hal/fmn.c
index 5e568e2..8ebc7537 100644
--- a/sys/mips/nlm/hal/fmn.c
+++ b/sys/mips/nlm/hal/fmn.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/fmn.h b/sys/mips/nlm/hal/fmn.h
index 6054872..0f5a033 100644
--- a/sys/mips/nlm/hal/fmn.h
+++ b/sys/mips/nlm/hal/fmn.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/gbu.h b/sys/mips/nlm/hal/gbu.h
index adb67bb..61d624f 100644
--- a/sys/mips/nlm/hal/gbu.h
+++ b/sys/mips/nlm/hal/gbu.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/haldefs.h b/sys/mips/nlm/hal/haldefs.h
index 44890a1..40a6e84 100644
--- a/sys/mips/nlm/hal/haldefs.h
+++ b/sys/mips/nlm/hal/haldefs.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/interlaken.h b/sys/mips/nlm/hal/interlaken.h
index b967b8b..e89a9a5 100644
--- a/sys/mips/nlm/hal/interlaken.h
+++ b/sys/mips/nlm/hal/interlaken.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/iomap.h b/sys/mips/nlm/hal/iomap.h
index c5ebb68..7d9ae10 100644
--- a/sys/mips/nlm/hal/iomap.h
+++ b/sys/mips/nlm/hal/iomap.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/mdio.h b/sys/mips/nlm/hal/mdio.h
index c4f3e8c..465fbf1 100644
--- a/sys/mips/nlm/hal/mdio.h
+++ b/sys/mips/nlm/hal/mdio.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/mips-extns.h b/sys/mips/nlm/hal/mips-extns.h
index 93c9db5..d4801e7 100644
--- a/sys/mips/nlm/hal/mips-extns.h
+++ b/sys/mips/nlm/hal/mips-extns.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/mmu.h b/sys/mips/nlm/hal/mmu.h
index 7c72d05..2b8554a 100644
--- a/sys/mips/nlm/hal/mmu.h
+++ b/sys/mips/nlm/hal/mmu.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/nae.h b/sys/mips/nlm/hal/nae.h
index a2a3756..f4169c0 100644
--- a/sys/mips/nlm/hal/nae.h
+++ b/sys/mips/nlm/hal/nae.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/nlm_hal.c b/sys/mips/nlm/hal/nlm_hal.c
index aa4bf5e..65aa323 100644
--- a/sys/mips/nlm/hal/nlm_hal.c
+++ b/sys/mips/nlm/hal/nlm_hal.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/nlmsaelib.h b/sys/mips/nlm/hal/nlmsaelib.h
index 230b374..c61ace8 100644
--- a/sys/mips/nlm/hal/nlmsaelib.h
+++ b/sys/mips/nlm/hal/nlmsaelib.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/pcibus.h b/sys/mips/nlm/hal/pcibus.h
index e6e0a3c..a11aadb 100644
--- a/sys/mips/nlm/hal/pcibus.h
+++ b/sys/mips/nlm/hal/pcibus.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/pic.h b/sys/mips/nlm/hal/pic.h
index c36e713..1229cf5 100644
--- a/sys/mips/nlm/hal/pic.h
+++ b/sys/mips/nlm/hal/pic.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/poe.h b/sys/mips/nlm/hal/poe.h
index 688d476..b60ee74 100644
--- a/sys/mips/nlm/hal/poe.h
+++ b/sys/mips/nlm/hal/poe.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/sgmii.h b/sys/mips/nlm/hal/sgmii.h
index 2059a40..c2f2580 100644
--- a/sys/mips/nlm/hal/sgmii.h
+++ b/sys/mips/nlm/hal/sgmii.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/sys.h b/sys/mips/nlm/hal/sys.h
index 39fda2b..078e63d 100644
--- a/sys/mips/nlm/hal/sys.h
+++ b/sys/mips/nlm/hal/sys.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/uart.h b/sys/mips/nlm/hal/uart.h
index 4783ccd..e7e68d0 100644
--- a/sys/mips/nlm/hal/uart.h
+++ b/sys/mips/nlm/hal/uart.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/ucore_loader.h b/sys/mips/nlm/hal/ucore_loader.h
index 95f2caf..7ac1ed6 100644
--- a/sys/mips/nlm/hal/ucore_loader.h
+++ b/sys/mips/nlm/hal/ucore_loader.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/hal/usb.h b/sys/mips/nlm/hal/usb.h
index 3101a2e..476af91 100644
--- a/sys/mips/nlm/hal/usb.h
+++ b/sys/mips/nlm/hal/usb.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/hal/xaui.h b/sys/mips/nlm/hal/xaui.h
index db42284..ffd39da 100644
--- a/sys/mips/nlm/hal/xaui.h
+++ b/sys/mips/nlm/hal/xaui.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/nlm/interrupt.h b/sys/mips/nlm/interrupt.h
index ba502f3..cf0a7ab 100644
--- a/sys/mips/nlm/interrupt.h
+++ b/sys/mips/nlm/interrupt.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/intr_machdep.c b/sys/mips/nlm/intr_machdep.c
index b66118c..db15e30 100644
--- a/sys/mips/nlm/intr_machdep.c
+++ b/sys/mips/nlm/intr_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/msgring.h b/sys/mips/nlm/msgring.h
index deef221..5366b7f 100644
--- a/sys/mips/nlm/msgring.h
+++ b/sys/mips/nlm/msgring.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/tick.c b/sys/mips/nlm/tick.c
index 5993c89..bba4bde 100644
--- a/sys/mips/nlm/tick.c
+++ b/sys/mips/nlm/tick.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/uart_cpu_xlp.c b/sys/mips/nlm/uart_cpu_xlp.c
index 773cf28..67627ac 100644
--- a/sys/mips/nlm/uart_cpu_xlp.c
+++ b/sys/mips/nlm/uart_cpu_xlp.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/usb_init.c b/sys/mips/nlm/usb_init.c
index 29e397d..5bcc805 100644
--- a/sys/mips/nlm/usb_init.c
+++ b/sys/mips/nlm/usb_init.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/xlp.h b/sys/mips/nlm/xlp.h
index 2ace311..69faacd 100644
--- a/sys/mips/nlm/xlp.h
+++ b/sys/mips/nlm/xlp.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/xlp_machdep.c b/sys/mips/nlm/xlp_machdep.c
index 1237000..5f93d6c 100644
--- a/sys/mips/nlm/xlp_machdep.c
+++ b/sys/mips/nlm/xlp_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright 2003-2011 Netlogic Microsystems (Netlogic). All rights
  * reserved.
  *
diff --git a/sys/mips/nlm/xlp_pci.c b/sys/mips/nlm/xlp_pci.c
index 35be81e..51ae2b7 100644
--- a/sys/mips/nlm/xlp_pci.c
+++ b/sys/mips/nlm/xlp_pci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2003-2012 Broadcom Corporation
  * All Rights Reserved
  *
diff --git a/sys/mips/rmi/board.c b/sys/mips/rmi/board.c
index b035ba2..7572a69 100644
--- a/sys/mips/rmi/board.c
+++ b/sys/mips/rmi/board.c
@@ -1,6 +1,4 @@
 /*********************************************************************
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  *
  * Copyright 2003-2006 Raza Microelectronics, Inc. (RMI). All rights
  * reserved.
diff --git a/sys/mips/rmi/board.h b/sys/mips/rmi/board.h
index 2544e5b..7d664fe 100644
--- a/sys/mips/rmi/board.h
+++ b/sys/mips/rmi/board.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/bus_space_rmi.c b/sys/mips/rmi/bus_space_rmi.c
index ccaae62..b2daeb4 100644
--- a/sys/mips/rmi/bus_space_rmi.c
+++ b/sys/mips/rmi/bus_space_rmi.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/bus_space_rmi_pci.c b/sys/mips/rmi/bus_space_rmi_pci.c
index ae485c3..ebd70c1 100644
--- a/sys/mips/rmi/bus_space_rmi_pci.c
+++ b/sys/mips/rmi/bus_space_rmi_pci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/iic/at24co2n.c b/sys/mips/rmi/dev/iic/at24co2n.c
index a313fc3..48f1880 100644
--- a/sys/mips/rmi/dev/iic/at24co2n.c
+++ b/sys/mips/rmi/dev/iic/at24co2n.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/iic/max6657.c b/sys/mips/rmi/dev/iic/max6657.c
index 0d69dc4..8d7006f 100644
--- a/sys/mips/rmi/dev/iic/max6657.c
+++ b/sys/mips/rmi/dev/iic/max6657.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c
index 011572e..ff4810c 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.c
+++ b/sys/mips/rmi/dev/nlge/if_nlge.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.h b/sys/mips/rmi/dev/nlge/if_nlge.h
index a713f96..680b8d9 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.h
+++ b/sys/mips/rmi/dev/nlge/if_nlge.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/sec/desc.h b/sys/mips/rmi/dev/sec/desc.h
index fe17b8e..1238d00 100644
--- a/sys/mips/rmi/dev/sec/desc.h
+++ b/sys/mips/rmi/dev/sec/desc.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/sec/rmilib.c b/sys/mips/rmi/dev/sec/rmilib.c
index 9451c18..f90123d 100644
--- a/sys/mips/rmi/dev/sec/rmilib.c
+++ b/sys/mips/rmi/dev/sec/rmilib.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/sec/rmilib.h b/sys/mips/rmi/dev/sec/rmilib.h
index 691b455..00106f9 100644
--- a/sys/mips/rmi/dev/sec/rmilib.h
+++ b/sys/mips/rmi/dev/sec/rmilib.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/sec/rmisec.c b/sys/mips/rmi/dev/sec/rmisec.c
index bc41744..31098bc 100644
--- a/sys/mips/rmi/dev/sec/rmisec.c
+++ b/sys/mips/rmi/dev/sec/rmisec.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/dev/xlr/debug.h b/sys/mips/rmi/dev/xlr/debug.h
index 9e0dd6b..53f1cb2 100644
--- a/sys/mips/rmi/dev/xlr/debug.h
+++ b/sys/mips/rmi/dev/xlr/debug.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/fmn.c b/sys/mips/rmi/fmn.c
index 0f44ab5..b9c5965 100644
--- a/sys/mips/rmi/fmn.c
+++ b/sys/mips/rmi/fmn.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/interrupt.h b/sys/mips/rmi/interrupt.h
index ccb66f0..76bbe5a 100644
--- a/sys/mips/rmi/interrupt.h
+++ b/sys/mips/rmi/interrupt.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/intr_machdep.c b/sys/mips/rmi/intr_machdep.c
index 435bc35b..c606548 100644
--- a/sys/mips/rmi/intr_machdep.c
+++ b/sys/mips/rmi/intr_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006-2009 RMI Corporation
  * Copyright (c) 2002-2004 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/mips/rmi/iodi.c b/sys/mips/rmi/iodi.c
index 3634240..d1f74e1 100644
--- a/sys/mips/rmi/iodi.c
+++ b/sys/mips/rmi/iodi.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/iomap.h b/sys/mips/rmi/iomap.h
index 0395a77..72756d2 100644
--- a/sys/mips/rmi/iomap.h
+++ b/sys/mips/rmi/iomap.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/msgring.h b/sys/mips/rmi/msgring.h
index 5cc9072..6110f5f 100644
--- a/sys/mips/rmi/msgring.h
+++ b/sys/mips/rmi/msgring.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/pcibus.h b/sys/mips/rmi/pcibus.h
index b80b795..7d1e923 100644
--- a/sys/mips/rmi/pcibus.h
+++ b/sys/mips/rmi/pcibus.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 1998 Doug Rabson
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/pic.h b/sys/mips/rmi/pic.h
index 42013c0..d7e3add 100644
--- a/sys/mips/rmi/pic.h
+++ b/sys/mips/rmi/pic.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/rmi_boot_info.h b/sys/mips/rmi/rmi_boot_info.h
index a4fa28b..38c81bd 100644
--- a/sys/mips/rmi/rmi_boot_info.h
+++ b/sys/mips/rmi/rmi_boot_info.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/rmi_mips_exts.h b/sys/mips/rmi/rmi_mips_exts.h
index d1da62d..fb2f886 100644
--- a/sys/mips/rmi/rmi_mips_exts.h
+++ b/sys/mips/rmi/rmi_mips_exts.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/tick.c b/sys/mips/rmi/tick.c
index f557ce7..3b22795 100644
--- a/sys/mips/rmi/tick.c
+++ b/sys/mips/rmi/tick.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006-2007 Bruce M. Simpson.
  * Copyright (c) 2003-2004 Juli Mallett.
  * All rights reserved.
diff --git a/sys/mips/rmi/uart_bus_xlr_iodi.c b/sys/mips/rmi/uart_bus_xlr_iodi.c
index d49f3e3..8b87262 100644
--- a/sys/mips/rmi/uart_bus_xlr_iodi.c
+++ b/sys/mips/rmi/uart_bus_xlr_iodi.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Raza Microelectronics
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/uart_cpu_mips_xlr.c b/sys/mips/rmi/uart_cpu_mips_xlr.c
index 407023e..816dec2 100644
--- a/sys/mips/rmi/uart_cpu_mips_xlr.c
+++ b/sys/mips/rmi/uart_cpu_mips_xlr.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/xlr_i2c.c b/sys/mips/rmi/xlr_i2c.c
index 69bd58e..337d606 100644
--- a/sys/mips/rmi/xlr_i2c.c
+++ b/sys/mips/rmi/xlr_i2c.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/xlr_machdep.c b/sys/mips/rmi/xlr_machdep.c
index 212a938..ad3d073 100644
--- a/sys/mips/rmi/xlr_machdep.c
+++ b/sys/mips/rmi/xlr_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006-2009 RMI Corporation
  * Copyright (c) 2002-2004 Juli Mallett <jmallett@FreeBSD.org>
  * All rights reserved.
diff --git a/sys/mips/rmi/xlr_pci.c b/sys/mips/rmi/xlr_pci.c
index 5832e27..3d98503 100644
--- a/sys/mips/rmi/xlr_pci.c
+++ b/sys/mips/rmi/xlr_pci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/xlr_pcmcia.c b/sys/mips/rmi/xlr_pcmcia.c
index 1c51001..8632266 100644
--- a/sys/mips/rmi/xlr_pcmcia.c
+++ b/sys/mips/rmi/xlr_pcmcia.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 2003-2009 RMI Corporation
  * All rights reserved.
  *
diff --git a/sys/mips/rmi/xls_ehci.c b/sys/mips/rmi/xls_ehci.c
index d0cff83..00183f7 100644
--- a/sys/mips/rmi/xls_ehci.c
+++ b/sys/mips/rmi/xls_ehci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/obio.c b/sys/mips/rt305x/obio.c
index 1004a01..79d7504 100644
--- a/sys/mips/rt305x/obio.c
+++ b/sys/mips/rt305x/obio.c
@@ -1,8 +1,6 @@
 /*	$NetBSD: obio.c,v 1.11 2003/07/15 00:25:05 lukem Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/obiovar.h b/sys/mips/rt305x/obiovar.h
index 002194a..e1742e8 100644
--- a/sys/mips/rt305x/obiovar.h
+++ b/sys/mips/rt305x/obiovar.h
@@ -1,8 +1,6 @@
 /*	$NetBSD: obiovar.h,v 1.4 2003/06/16 17:40:53 thorpej Exp $	*/
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-NetBSD
- *
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/rt305x_dotg.c b/sys/mips/rt305x/rt305x_dotg.c
index 73c9a2d..b39046f 100644
--- a/sys/mips/rt305x/rt305x_dotg.c
+++ b/sys/mips/rt305x/rt305x_dotg.c
@@ -2,8 +2,6 @@
 __FBSDID("$FreeBSD$");
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2015 Stanislav Galabov. All rights reserved.
  * Copyright (c) 2010,2011 Aleksandr Rybalko. All rights reserved.
  * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.
diff --git a/sys/mips/rt305x/rt305x_gpio.c b/sys/mips/rt305x/rt305x_gpio.c
index 326dfcc..56b734a 100644
--- a/sys/mips/rt305x/rt305x_gpio.c
+++ b/sys/mips/rt305x/rt305x_gpio.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010-2011, Aleksandr Rybalko <ray@ddteam.net>
  * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@FreeBSD.org>
  * Copyright (c) 2009, Luiz Otavio O Souza. 
diff --git a/sys/mips/rt305x/rt305x_gpio.h b/sys/mips/rt305x/rt305x_gpio.h
index 45d5072..8ce3ab5 100644
--- a/sys/mips/rt305x/rt305x_gpio.h
+++ b/sys/mips/rt305x/rt305x_gpio.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/rt305x_gpiovar.h b/sys/mips/rt305x/rt305x_gpiovar.h
index 0eab1a7..d486838 100644
--- a/sys/mips/rt305x/rt305x_gpiovar.h
+++ b/sys/mips/rt305x/rt305x_gpiovar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/rt305x_ic.c b/sys/mips/rt305x/rt305x_ic.c
index 28f61c9..8bddd41 100644
--- a/sys/mips/rt305x/rt305x_ic.c
+++ b/sys/mips/rt305x/rt305x_ic.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/rt305x_icvar.h b/sys/mips/rt305x/rt305x_icvar.h
index 4dcc88f..4d969c8 100644
--- a/sys/mips/rt305x/rt305x_icvar.h
+++ b/sys/mips/rt305x/rt305x_icvar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/rt305x_machdep.c b/sys/mips/rt305x/rt305x_machdep.c
index f1b0b2c6..edeb40c 100644
--- a/sys/mips/rt305x/rt305x_machdep.c
+++ b/sys/mips/rt305x/rt305x_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (C) 2010-2011 by Aleksandr Rybalko. All rights reserved.
  * Copyright (C) 2007 by Oleksandr Tymoshenko. All rights reserved.
  *
diff --git a/sys/mips/rt305x/rt305x_sysctl.c b/sys/mips/rt305x/rt305x_sysctl.c
index 6a86374..077ccad 100644
--- a/sys/mips/rt305x/rt305x_sysctl.c
+++ b/sys/mips/rt305x/rt305x_sysctl.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/rt305x_sysctlvar.h b/sys/mips/rt305x/rt305x_sysctlvar.h
index 71553df..91a5282 100644
--- a/sys/mips/rt305x/rt305x_sysctlvar.h
+++ b/sys/mips/rt305x/rt305x_sysctlvar.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/rt305xreg.h b/sys/mips/rt305x/rt305xreg.h
index 2629236..458e1c9 100644
--- a/sys/mips/rt305x/rt305xreg.h
+++ b/sys/mips/rt305x/rt305xreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2015 Stanislav Galabov.
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
diff --git a/sys/mips/rt305x/rt_swreg.h b/sys/mips/rt305x/rt_swreg.h
index 9690953..ab382b9 100644
--- a/sys/mips/rt305x/rt_swreg.h
+++ b/sys/mips/rt305x/rt_swreg.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/uart_bus_rt305x.c b/sys/mips/rt305x/uart_bus_rt305x.c
index fdd4cab..8b10080 100644
--- a/sys/mips/rt305x/uart_bus_rt305x.c
+++ b/sys/mips/rt305x/uart_bus_rt305x.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2007 Bruce M. Simpson.
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/uart_cpu_rt305x.c b/sys/mips/rt305x/uart_cpu_rt305x.c
index 0a6c4e4..345db46 100644
--- a/sys/mips/rt305x/uart_cpu_rt305x.c
+++ b/sys/mips/rt305x/uart_cpu_rt305x.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/mips/rt305x/uart_dev_rt305x.c b/sys/mips/rt305x/uart_dev_rt305x.c
index e52c4e4..5d23b1e 100644
--- a/sys/mips/rt305x/uart_dev_rt305x.c
+++ b/sys/mips/rt305x/uart_dev_rt305x.c
@@ -1,8 +1,6 @@
 /* $NetBSD: uart.c,v 1.2 2007/03/23 20:05:47 dogcow Exp $ */
 
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * Copyright (c) 2007 Oleksandr Tymoshenko.
diff --git a/sys/mips/rt305x/uart_dev_rt305x.h b/sys/mips/rt305x/uart_dev_rt305x.h
index 203a8d1..c24b339 100644
--- a/sys/mips/rt305x/uart_dev_rt305x.h
+++ b/sys/mips/rt305x/uart_dev_rt305x.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Aleksandr Rybalko.
  * All rights reserved.
  *
diff --git a/sys/mips/sibyte/ata_zbbus.c b/sys/mips/sibyte/ata_zbbus.c
index 84d0d51..7f47063 100644
--- a/sys/mips/sibyte/ata_zbbus.c
+++ b/sys/mips/sibyte/ata_zbbus.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Neelkanth Natu
  * All rights reserved.
  *
diff --git a/sys/mips/sibyte/sb_bus_space.h b/sys/mips/sibyte/sb_bus_space.h
index 3e9dbee..f3364f0 100644
--- a/sys/mips/sibyte/sb_bus_space.h
+++ b/sys/mips/sibyte/sb_bus_space.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2010 Neelkanth Natu
  * All rights reserved.
  *
diff --git a/sys/mips/sibyte/sb_machdep.c b/sys/mips/sibyte/sb_machdep.c
index 11a23a1..5e7c2fd 100644
--- a/sys/mips/sibyte/sb_machdep.c
+++ b/sys/mips/sibyte/sb_machdep.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2007 Bruce M. Simpson.
  * All rights reserved.
  *
diff --git a/sys/mips/sibyte/sb_scd.c b/sys/mips/sibyte/sb_scd.c
index 366d728..50b9987 100644
--- a/sys/mips/sibyte/sb_scd.c
+++ b/sys/mips/sibyte/sb_scd.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Neelkanth Natu
  * All rights reserved.
  *
diff --git a/sys/mips/sibyte/sb_scd.h b/sys/mips/sibyte/sb_scd.h
index 91e082f..f8bb6e4 100644
--- a/sys/mips/sibyte/sb_scd.h
+++ b/sys/mips/sibyte/sb_scd.h
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Neelkanth Natu
  * All rights reserved.
  *
diff --git a/sys/mips/sibyte/sb_zbbus.c b/sys/mips/sibyte/sb_zbbus.c
index aec8839..f87b6b8 100644
--- a/sys/mips/sibyte/sb_zbbus.c
+++ b/sys/mips/sibyte/sb_zbbus.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Neelkanth Natu
  * All rights reserved.
  *
diff --git a/sys/mips/sibyte/sb_zbpci.c b/sys/mips/sibyte/sb_zbpci.c
index 26ca29b..952fea8 100644
--- a/sys/mips/sibyte/sb_zbpci.c
+++ b/sys/mips/sibyte/sb_zbpci.c
@@ -1,6 +1,4 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
  * Copyright (c) 2009 Neelkanth Natu
  * All rights reserved.
  *