diff --git a/src/arm/am335x-abbbi.dts b/src/arm/am335x-abbbi.dts
index 6bc4a01ab72272f198f1cfd4476548aeab26cdc6..f1ca91f9e918912e774259b7a1d46e24fc838816 100644
--- a/src/arm/am335x-abbbi.dts
+++ b/src/arm/am335x-abbbi.dts
@@ -1,20 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
  * Copyright 2015 Konsulko Group
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
 #include "am33xx.dtsi"
 #include "am335x-bone-common.dtsi"
 
-
 / {
 	model = "Arrow BeagleBone Black Industrial";
 	compatible = "arrow,am335x-abbbi", "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-abbbi.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &sgx {
@@ -133,16 +134,16 @@
 
 / {
 	clk_mcasp0_fixed: clk_mcasp0_fixed {
-	      #clock-cells = <0>;
-	      compatible = "fixed-clock";
-	      clock-frequency = <24576000>;
+		#clock-cells = <0>;
+		compatible = "fixed-clock";
+		clock-frequency = <24576000>;
 	};
 
 	clk_mcasp0: clk_mcasp0 {
-	      #clock-cells = <0>;
-	      compatible = "gpio-gate-clock";
-	      clocks = <&clk_mcasp0_fixed>;
-	      enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
+		#clock-cells = <0>;
+		compatible = "gpio-gate-clock";
+		clocks = <&clk_mcasp0_fixed>;
+		enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
 	};
 
 	hdmi_audio: hdmi_audio@0 {
diff --git a/src/arm/am335x-bone-common-no-capemgr.dtsi b/src/arm/am335x-bone-common-no-capemgr.dtsi
index 5c8c7bd9a1fa18b90e3242c0c6a0f8b46977fa57..9c39b27e27b1a1c1ac1b680f54941853427ea919 100644
--- a/src/arm/am335x-bone-common-no-capemgr.dtsi
+++ b/src/arm/am335x-bone-common-no-capemgr.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 / {
diff --git a/src/arm/am335x-bone-common-univ.dtsi b/src/arm/am335x-bone-common-univ.dtsi
index 510305f0b5dd0f0d689856e48211eb7f349412b9..a168b3266088f2bf26d30af6c9dc0be37de58e90 100644
--- a/src/arm/am335x-bone-common-univ.dtsi
+++ b/src/arm/am335x-bone-common-univ.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 &am33xx_pinmux {
diff --git a/src/arm/am335x-bone-common.dtsi b/src/arm/am335x-bone-common.dtsi
index ea7fd0339292a44416c8d2735105e2faf564f078..092eb91cbb229f5b8b9d27de9ef9fbe82c441d3a 100644
--- a/src/arm/am335x-bone-common.dtsi
+++ b/src/arm/am335x-bone-common.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 / {
diff --git a/src/arm/am335x-bone-jtag.dtsi b/src/arm/am335x-bone-jtag.dtsi
index 603ef0a4d7b26a722f573cf56725ef4a870adb96..44e3d8b58b2ebd2e6a78160cbdc83c24d10607a7 100644
--- a/src/arm/am335x-bone-jtag.dtsi
+++ b/src/arm/am335x-bone-jtag.dtsi
@@ -1,11 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Device Tree Source for bone jtag
- *
  * Copyright (C) 2015 Robert Nelson <robertcnelson@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 &am33xx_pinmux {
diff --git a/src/arm/am335x-bone-uboot-univ.dts b/src/arm/am335x-bone-uboot-univ.dts
index 6847a848baef93202e849bc8ee91319ba78fea7b..b31b0988e8553d91cdb6ef5612a690b5168b5641 100644
--- a/src/arm/am335x-bone-uboot-univ.dts
+++ b/src/arm/am335x-bone-uboot-univ.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -14,6 +11,11 @@
 / {
 	model = "TI AM335x BeagleBone";
 	compatible = "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-bone-uboot-univ.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &sgx {
diff --git a/src/arm/am335x-bone.dts b/src/arm/am335x-bone.dts
index 84121aab44f4ed27d745bc9e09027ec964653353..e09a54f18582ed341d9be1cde49ccd077e8715a6 100644
--- a/src/arm/am335x-bone.dts
+++ b/src/arm/am335x-bone.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -14,6 +11,11 @@
 / {
 	model = "TI AM335x BeagleBone";
 	compatible = "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-bone.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &ldo3_reg {
diff --git a/src/arm/am335x-boneblack-common.dtsi b/src/arm/am335x-boneblack-common.dtsi
index 325daae40278a11fca64fa96d74fd64e991da546..990140c5dfdcd57f9ea58deedef4ba1f99584ea8 100644
--- a/src/arm/am335x-boneblack-common.dtsi
+++ b/src/arm/am335x-boneblack-common.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include <dt-bindings/display/tda998x.h>
diff --git a/src/arm/am335x-boneblack-uboot-univ.dts b/src/arm/am335x-boneblack-uboot-univ.dts
index 1e279a06da23e8a255aba3f388fdfa7ea2abe6d2..2dd94e621ac6583f89ee142d68581191fe5be2fd 100644
--- a/src/arm/am335x-boneblack-uboot-univ.dts
+++ b/src/arm/am335x-boneblack-uboot-univ.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -14,6 +11,11 @@
 / {
 	model = "TI AM335x BeagleBone Black";
 	compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-boneblack-uboot-univ.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &sgx {
@@ -22,10 +24,10 @@
 
 &cpu0_opp_table {
 	/*
-	* All PG 2.0 silicon may not support 1GHz but some of the early
-	* BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-	* to support 1GHz OPP so enable it for PG 2.0 on this board.
-	*/
+	 * All PG 2.0 silicon may not support 1GHz but some of the early
+	 * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
+	 * to support 1GHz OPP so enable it for PG 2.0 on this board.
+	 */
 	oppnitro-1000000000 {
 		opp-supported-hw = <0x06 0x0100>;
 	};
diff --git a/src/arm/am335x-boneblack-uboot.dts b/src/arm/am335x-boneblack-uboot.dts
index 539b8033c57541f17fe58efa5031ec69de09c0d9..6d87fc84e4c4de1265584ab060ec90f13bdeab56 100644
--- a/src/arm/am335x-boneblack-uboot.dts
+++ b/src/arm/am335x-boneblack-uboot.dts
@@ -1,18 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
 #include "am33xx.dtsi"
 #include "am335x-bone-common.dtsi"
 
+/* #include "am335x-bone-jtag.dtsi" */
+
 / {
 	model = "TI AM335x BeagleBone Black";
 	compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-boneblack-uboot.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &sgx {
@@ -21,10 +25,10 @@
 
 &cpu0_opp_table {
 	/*
-	* All PG 2.0 silicon may not support 1GHz but some of the early
-	* BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-	* to support 1GHz OPP so enable it for PG 2.0 on this board.
-	*/
+	 * All PG 2.0 silicon may not support 1GHz but some of the early
+	 * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
+	 * to support 1GHz OPP so enable it for PG 2.0 on this board.
+	 */
 	oppnitro-1000000000 {
 		opp-supported-hw = <0x06 0x0100>;
 	};
diff --git a/src/arm/am335x-boneblack-wireless.dts b/src/arm/am335x-boneblack-wireless.dts
index b0610e2c64d3af4eac7f08fc6e1025d107a23ed2..5f308e74d6bc6ac5a6b9a41b252d1d768b939803 100644
--- a/src/arm/am335x-boneblack-wireless.dts
+++ b/src/arm/am335x-boneblack-wireless.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -17,6 +14,11 @@
 	model = "TI AM335x BeagleBone Black Wireless";
 	compatible = "ti,am335x-bone-black-wireless", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
 
+	chosen {
+		base_dtb = "am335x-boneblack-wireless.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
+
 	wlan_en_reg: fixedregulator@2 {
 		compatible = "regulator-fixed";
 		regulator-name = "wlan-en-regulator";
diff --git a/src/arm/am335x-boneblack.dts b/src/arm/am335x-boneblack.dts
index 6664d9372f4d0fb77c1a9ae22e2a5eb3102b7cb9..7bcf13bad47dd2e46b1e0c75f7e70259cbd60bc9 100644
--- a/src/arm/am335x-boneblack.dts
+++ b/src/arm/am335x-boneblack.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -15,6 +12,11 @@
 / {
 	model = "TI AM335x BeagleBone Black";
 	compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-boneblack.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &sgx {
diff --git a/src/arm/am335x-boneblue.dts b/src/arm/am335x-boneblue.dts
index 936513434266b59113510adb714da5f5eabc1b59..08da9d112d4d0b24c84b33f6e50e71cb99b46f92 100644
--- a/src/arm/am335x-boneblue.dts
+++ b/src/arm/am335x-boneblue.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -15,6 +12,11 @@
 	model = "TI AM335x BeagleBone Blue";
 	compatible = "ti,am335x-bone-blue", "ti,am33xx";
 
+	chosen {
+		base_dtb = "am335x-boneblue.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
+
 	cpus {
 		cpu@0 {
 			cpu0-supply = <&dcdc2_reg>;
@@ -168,9 +170,13 @@
 
 &cpu0_opp_table {
 	/*
-	* All PG 2.0 silicon may not support 1GHz but some of the early
-	* BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-	* to support 1GHz OPP so enable it for PG 2.0 on this board.
+	* Octavo Systems:
+	* The EFUSE_SMA register is not programmed for any of the AM335x wafers
+	* we get and we are not programming them during our production test.
+	* Therefore, from a DEVICE_ID revision point of view, the silicon looks
+	* like it is Revision 2.1.  However, from an EFUSE_SMA point of view for
+	* the HW OPP table, the silicon looks like it is Revision 1.0 (ie the
+	* EFUSE_SMA register reads as all zeros).
 	*/
 	oppnitro-1000000000 {
 		opp-supported-hw = <0x06 0x0100>;
diff --git a/src/arm/am335x-bonegreen-common.dtsi b/src/arm/am335x-bonegreen-common.dtsi
index 853e6d3a028dc4c4eb31c23712a808d35e49ee78..ededf1e6491c445d895c610393c52a80ff1605ea 100644
--- a/src/arm/am335x-bonegreen-common.dtsi
+++ b/src/arm/am335x-bonegreen-common.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 &ldo3_reg {
diff --git a/src/arm/am335x-bonegreen-wireless-common-univ.dtsi b/src/arm/am335x-bonegreen-wireless-common-univ.dtsi
index 455a8fa5f68b2b2d75f8451851271087285ae0b6..e6f28c969b752c38e39e048253851b4d1bc4cc50 100644
--- a/src/arm/am335x-bonegreen-wireless-common-univ.dtsi
+++ b/src/arm/am335x-bonegreen-wireless-common-univ.dtsi
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 &am33xx_pinmux {
diff --git a/src/arm/am335x-bonegreen-wireless-uboot-univ.dts b/src/arm/am335x-bonegreen-wireless-uboot-univ.dts
index a4c5744c06a9751c3edbe2db5b5c42594ab80ca5..3adb9721f9f7baf34433e3f6da1406fef4c1e1ca 100644
--- a/src/arm/am335x-bonegreen-wireless-uboot-univ.dts
+++ b/src/arm/am335x-bonegreen-wireless-uboot-univ.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -14,13 +11,17 @@
 / {
 	model = "TI AM335x BeagleBone Green Wireless";
 	compatible = "ti,am335x-bone-green-wireless", "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-bonegreen-wireless-uboot-univ.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &sgx {
 	status = "okay";
 };
 
-
 &ldo3_reg {
 	regulator-min-microvolt = <1800000>;
 	regulator-max-microvolt = <1800000>;
diff --git a/src/arm/am335x-bonegreen-wireless.dts b/src/arm/am335x-bonegreen-wireless.dts
index 0d6b359b69a9b32a8b0bf806099dc50b4bd6721f..49d76698ccc272ae439a8123d398147c969ab81a 100644
--- a/src/arm/am335x-bonegreen-wireless.dts
+++ b/src/arm/am335x-bonegreen-wireless.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -17,6 +14,11 @@
 	model = "TI AM335x BeagleBone Green Wireless";
 	compatible = "ti,am335x-bone-green-wireless", "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
 
+	chosen {
+		base_dtb = "am335x-bonegreen-wireless.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
+
 	wlan_en_reg: fixedregulator@2 {
 		compatible = "regulator-fixed";
 		regulator-name = "wlan-en-regulator";
diff --git a/src/arm/am335x-bonegreen.dts b/src/arm/am335x-bonegreen.dts
index d444999153bd5e144d8d781e594789ef6a801390..dc6f69a85bf083eec6323b2a46756fa929f856c7 100644
--- a/src/arm/am335x-bonegreen.dts
+++ b/src/arm/am335x-bonegreen.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -15,6 +12,11 @@
 / {
 	model = "TI AM335x BeagleBone Green";
 	compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-bonegreen.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &sgx {
diff --git a/src/arm/am335x-pocketbeagle-common.dtsi b/src/arm/am335x-pocketbeagle-common.dtsi
index b003198377bdde80237ffdafb2117ce5c1462145..fcac7f2ae66d572a691e6d059a76217e2c7e1b0f 100644
--- a/src/arm/am335x-pocketbeagle-common.dtsi
+++ b/src/arm/am335x-pocketbeagle-common.dtsi
@@ -25,6 +25,8 @@
 
 	chosen {
 		stdout-path = &uart0;
+		base_dtb = "am335x-pocketbeagle.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
 	};
 
 	leds {
diff --git a/src/arm/am335x-pocketbeagle.dts b/src/arm/am335x-pocketbeagle.dts
index 056be4d2ebf3e357be7b62ac7d28d6dceebae25e..ccb9bd9aee8eb7a5aa232a1926c5112650279b9e 100644
--- a/src/arm/am335x-pocketbeagle.dts
+++ b/src/arm/am335x-pocketbeagle.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * Author: Robert Nelson <robertcnelson@gmail.com>
  */
 /dts-v1/;
 
diff --git a/src/arm/am335x-sancloud-bbe.dts b/src/arm/am335x-sancloud-bbe.dts
index bcfb3e184b16dfd5ba3f83dfbf794e9d138f990e..da976dd0a34f2c09b7fae69609cc271a8bee82a9 100644
--- a/src/arm/am335x-sancloud-bbe.dts
+++ b/src/arm/am335x-sancloud-bbe.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 /dts-v1/;
 
@@ -11,11 +8,15 @@
 #include "am335x-bone-common.dtsi"
 #include "am335x-boneblack-common.dtsi"
 #include <dt-bindings/interrupt-controller/irq.h>
-/* #include "am335x-bone-jtag.dtsi" */
 
 / {
 	model = "SanCloud BeagleBone Enhanced";
 	compatible = "sancloud,am335x-boneenhanced", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
+
+	chosen {
+		base_dtb = "am335x-sancloud-bbe.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &sgx {
diff --git a/src/arm/am5729-beagleboneai-roboticscape.dts b/src/arm/am5729-beagleboneai-roboticscape.dts
index 778235ffbd4942b33f5d117a9b1b99b086e6aa25..3bf365ea42c379e5d965d59c8472a1fa09181802 100644
--- a/src/arm/am5729-beagleboneai-roboticscape.dts
+++ b/src/arm/am5729-beagleboneai-roboticscape.dts
@@ -8,6 +8,11 @@
 #include "am5729-beagleboneai.dts"
 
 / {
+	chosen {
+		base_dtb = "am5729-beagleboneai-roboticscape.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
+
 	rcleds {
 		compatible = "gpio-leds";
 		pinctrl-names = "default";
diff --git a/src/arm/am5729-beagleboneai.dts b/src/arm/am5729-beagleboneai.dts
index 764d6d2e5199946b00164436704725d009ecc110..dbedcb6ee6fb832388509843cba787d9cfcf325e 100644
--- a/src/arm/am5729-beagleboneai.dts
+++ b/src/arm/am5729-beagleboneai.dts
@@ -26,6 +26,8 @@
 
 	chosen {
 		stdout-path = &uart1;
+		base_dtb = "am5729-beagleboneai.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
 	};
 
 	memory@0 {
diff --git a/src/arm/am57xx-beagle-x15-revb1.dts b/src/arm/am57xx-beagle-x15-revb1.dts
index 472dc34002c4b70bf69ebb215ab8f194d0d9b127..318c2c6724c533a096366bf15b4cac683b5fcacd 100644
--- a/src/arm/am57xx-beagle-x15-revb1.dts
+++ b/src/arm/am57xx-beagle-x15-revb1.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014-2016 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include "am57xx-beagle-x15-common.dtsi"
@@ -11,6 +8,11 @@
 
 / {
 	model = "TI AM5728 BeagleBoard-X15 rev B1";
+
+	chosen {
+		base_dtb = "am57xx-beagle-x15-revb1.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &tpd12s015 {
diff --git a/src/arm/am57xx-beagle-x15-revc.dts b/src/arm/am57xx-beagle-x15-revc.dts
index f554bb433f701dbae261ba0e3a3a872c33dc1d40..ace38636db86d824f992f7a3960fa45fbb99946a 100644
--- a/src/arm/am57xx-beagle-x15-revc.dts
+++ b/src/arm/am57xx-beagle-x15-revc.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014-2017 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include "am57xx-beagle-x15-common.dtsi"
@@ -11,6 +8,11 @@
 
 / {
 	model = "TI AM5728 BeagleBoard-X15 rev C";
+
+	chosen {
+		base_dtb = "am57xx-beagle-x15-revc.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &tpd12s015 {
diff --git a/src/arm/am57xx-beagle-x15.dts b/src/arm/am57xx-beagle-x15.dts
index 32608461161ebfc0e7a298350724b6bc11282f57..01b635ca07e804cad28846c81260724d242a1dd5 100644
--- a/src/arm/am57xx-beagle-x15.dts
+++ b/src/arm/am57xx-beagle-x15.dts
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2014-2016 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #include "am57xx-beagle-x15-common.dtsi"
@@ -12,6 +9,11 @@
 / {
 	/* NOTE: This describes the "original" pre-production A2 revision */
 	model = "TI AM5728 BeagleBoard-X15";
+
+	chosen {
+		base_dtb = "am57xx-beagle-x15.dts";
+		base_dtb_timestamp = __TIMESTAMP__;
+	};
 };
 
 &tpd12s015 {