diff --git a/deployments/attestation/config/default-opteesp/default_attestation.dts.in b/deployments/attestation/config/default-opteesp/default_attestation.dts.in
index 70f99ec..6c55a86 100644
--- a/deployments/attestation/config/default-opteesp/default_attestation.dts.in
+++ b/deployments/attestation/config/default-opteesp/default_attestation.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/attestation/config/default-sp/default_attestation.dts.in b/deployments/attestation/config/default-sp/default_attestation.dts.in
index 393ea52..caae751 100644
--- a/deployments/attestation/config/default-sp/default_attestation.dts.in
+++ b/deployments/attestation/config/default-sp/default_attestation.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/block-storage/config/cfi-flash-optee/default_block-storage.dts.in b/deployments/block-storage/config/cfi-flash-optee/default_block-storage.dts.in
index bc65a37..27a1f5a 100644
--- a/deployments/block-storage/config/cfi-flash-optee/default_block-storage.dts.in
+++ b/deployments/block-storage/config/cfi-flash-optee/default_block-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/block-storage/config/default-opteesp/default_block-storage.dts.in b/deployments/block-storage/config/default-opteesp/default_block-storage.dts.in
index bc65a37..27a1f5a 100644
--- a/deployments/block-storage/config/default-opteesp/default_block-storage.dts.in
+++ b/deployments/block-storage/config/default-opteesp/default_block-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/block-storage/config/default-sp/default_block-storage.dts.in b/deployments/block-storage/config/default-sp/default_block-storage.dts.in
index b7b10e5..606d92d 100644
--- a/deployments/block-storage/config/default-sp/default_block-storage.dts.in
+++ b/deployments/block-storage/config/default-sp/default_block-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/block-storage/config/edk2-secure-flash-opteesp/default_block-storage.dts.in b/deployments/block-storage/config/edk2-secure-flash-opteesp/default_block-storage.dts.in
index bc65a37..27a1f5a 100644
--- a/deployments/block-storage/config/edk2-secure-flash-opteesp/default_block-storage.dts.in
+++ b/deployments/block-storage/config/edk2-secure-flash-opteesp/default_block-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/block-storage/config/encrypted-ram-opteesp/default_block-storage.dts.in b/deployments/block-storage/config/encrypted-ram-opteesp/default_block-storage.dts.in
index e9dff5f..5028d95 100644
--- a/deployments/block-storage/config/encrypted-ram-opteesp/default_block-storage.dts.in
+++ b/deployments/block-storage/config/encrypted-ram-opteesp/default_block-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/block-storage/config/encrypted-ram-sp/default_block-storage.dts.in b/deployments/block-storage/config/encrypted-ram-sp/default_block-storage.dts.in
index cea46ab..19c343e 100644
--- a/deployments/block-storage/config/encrypted-ram-sp/default_block-storage.dts.in
+++ b/deployments/block-storage/config/encrypted-ram-sp/default_block-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/block-storage/config/semihosted-opteesp/default_block-storage.dts.in b/deployments/block-storage/config/semihosted-opteesp/default_block-storage.dts.in
index bc65a37..27a1f5a 100644
--- a/deployments/block-storage/config/semihosted-opteesp/default_block-storage.dts.in
+++ b/deployments/block-storage/config/semihosted-opteesp/default_block-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/crypto/config/default-opteesp/default_crypto.dts.in b/deployments/crypto/config/default-opteesp/default_crypto.dts.in
index 68dbb48..ee98b01 100644
--- a/deployments/crypto/config/default-opteesp/default_crypto.dts.in
+++ b/deployments/crypto/config/default-opteesp/default_crypto.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/crypto/config/default-sp/default_crypto.dts.in b/deployments/crypto/config/default-sp/default_crypto.dts.in
index 6c44a0c..45fb791 100644
--- a/deployments/crypto/config/default-sp/default_crypto.dts.in
+++ b/deployments/crypto/config/default-sp/default_crypto.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/env-test/config/baremetal-fvp_base_revc-opteesp/default_env-test.dts.in b/deployments/env-test/config/baremetal-fvp_base_revc-opteesp/default_env-test.dts.in
index 33a20e1..1b624e4 100644
--- a/deployments/env-test/config/baremetal-fvp_base_revc-opteesp/default_env-test.dts.in
+++ b/deployments/env-test/config/baremetal-fvp_base_revc-opteesp/default_env-test.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/env-test/config/baremetal-fvp_base_revc-sp/default_env-test.dts.in b/deployments/env-test/config/baremetal-fvp_base_revc-sp/default_env-test.dts.in
index 5dd3060..869a3c7 100644
--- a/deployments/env-test/config/baremetal-fvp_base_revc-sp/default_env-test.dts.in
+++ b/deployments/env-test/config/baremetal-fvp_base_revc-sp/default_env-test.dts.in
@@ -13,7 +13,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	memory-regions {
diff --git a/deployments/env-test/config/n1sdp-opteesp/default_env-test.dts.in b/deployments/env-test/config/n1sdp-opteesp/default_env-test.dts.in
index 39d2fb2..f54ac1c 100644
--- a/deployments/env-test/config/n1sdp-opteesp/default_env-test.dts.in
+++ b/deployments/env-test/config/n1sdp-opteesp/default_env-test.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/ftpm/config/default-opteesp/default_ftpm.dts.in b/deployments/ftpm/config/default-opteesp/default_ftpm.dts.in
index 15b32ed..74a0d3e 100644
--- a/deployments/ftpm/config/default-opteesp/default_ftpm.dts.in
+++ b/deployments/ftpm/config/default-opteesp/default_ftpm.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/ftpm/config/default-sp/default_ftpm.dts.in b/deployments/ftpm/config/default-sp/default_ftpm.dts.in
index b0a6237..d3c6857 100644
--- a/deployments/ftpm/config/default-sp/default_ftpm.dts.in
+++ b/deployments/ftpm/config/default-sp/default_ftpm.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/fwu/config/default-opteesp/default_fwu.dts.in b/deployments/fwu/config/default-opteesp/default_fwu.dts.in
index 21fb51f..f96e8a0 100644
--- a/deployments/fwu/config/default-opteesp/default_fwu.dts.in
+++ b/deployments/fwu/config/default-opteesp/default_fwu.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/fwu/config/default-sp/default_fwu.dts.in b/deployments/fwu/config/default-sp/default_fwu.dts.in
index 83249d9..8b5a0e5 100644
--- a/deployments/fwu/config/default-sp/default_fwu.dts.in
+++ b/deployments/fwu/config/default-sp/default_fwu.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/internal-trusted-storage/config/default-opteesp/default_internal-trusted-storage.dts.in b/deployments/internal-trusted-storage/config/default-opteesp/default_internal-trusted-storage.dts.in
index fa3db83..233aa2a 100644
--- a/deployments/internal-trusted-storage/config/default-opteesp/default_internal-trusted-storage.dts.in
+++ b/deployments/internal-trusted-storage/config/default-opteesp/default_internal-trusted-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/internal-trusted-storage/config/default-sp/default_internal-trusted-storage.dts.in b/deployments/internal-trusted-storage/config/default-sp/default_internal-trusted-storage.dts.in
index 87b8051..3921b60 100644
--- a/deployments/internal-trusted-storage/config/default-sp/default_internal-trusted-storage.dts.in
+++ b/deployments/internal-trusted-storage/config/default-sp/default_internal-trusted-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/internal-trusted-storage/config/shared-flash-opteesp/default_internal-trusted-storage.dts.in b/deployments/internal-trusted-storage/config/shared-flash-opteesp/default_internal-trusted-storage.dts.in
index fa3db83..233aa2a 100644
--- a/deployments/internal-trusted-storage/config/shared-flash-opteesp/default_internal-trusted-storage.dts.in
+++ b/deployments/internal-trusted-storage/config/shared-flash-opteesp/default_internal-trusted-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/logging/config/default-opteesp/default_logging.dts.in b/deployments/logging/config/default-opteesp/default_logging.dts.in
index 6013d29..f3bcf0e 100644
--- a/deployments/logging/config/default-opteesp/default_logging.dts.in
+++ b/deployments/logging/config/default-opteesp/default_logging.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/logging/config/default-sp/default_logging.dts.in b/deployments/logging/config/default-sp/default_logging.dts.in
index 0cc45c3..d9bff6a 100644
--- a/deployments/logging/config/default-sp/default_logging.dts.in
+++ b/deployments/logging/config/default-sp/default_logging.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/protected-storage/config/default-opteesp/default_protected-storage.dts.in b/deployments/protected-storage/config/default-opteesp/default_protected-storage.dts.in
index c8d86d6..6b198cf 100644
--- a/deployments/protected-storage/config/default-opteesp/default_protected-storage.dts.in
+++ b/deployments/protected-storage/config/default-opteesp/default_protected-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/protected-storage/config/default-sp/default_protected-storage.dts.in b/deployments/protected-storage/config/default-sp/default_protected-storage.dts.in
index 971a3b5..d84b177 100644
--- a/deployments/protected-storage/config/default-sp/default_protected-storage.dts.in
+++ b/deployments/protected-storage/config/default-sp/default_protected-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/protected-storage/config/shared-flash-opteesp/default_protected-storage.dts.in b/deployments/protected-storage/config/shared-flash-opteesp/default_protected-storage.dts.in
index c8d86d6..6b198cf 100644
--- a/deployments/protected-storage/config/shared-flash-opteesp/default_protected-storage.dts.in
+++ b/deployments/protected-storage/config/shared-flash-opteesp/default_protected-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in b/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in
index 823043d..704943b 100644
--- a/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in
+++ b/deployments/se-proxy/config/corstone1000-opteesp/default_se-proxy.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/se-proxy/config/default-opteesp/default_se-proxy.dts.in b/deployments/se-proxy/config/default-opteesp/default_se-proxy.dts.in
index 9ef01a9..673037b 100644
--- a/deployments/se-proxy/config/default-opteesp/default_se-proxy.dts.in
+++ b/deployments/se-proxy/config/default-opteesp/default_se-proxy.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/se-proxy/config/default-sp/default_se-proxy.dts.in b/deployments/se-proxy/config/default-sp/default_se-proxy.dts.in
index e964909..bc9124d 100644
--- a/deployments/se-proxy/config/default-sp/default_se-proxy.dts.in
+++ b/deployments/se-proxy/config/default-sp/default_se-proxy.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/se-proxy/config/rd1ae-opteesp/default_se-proxy.dts.in b/deployments/se-proxy/config/rd1ae-opteesp/default_se-proxy.dts.in
index c71eee1..981f9e9 100644
--- a/deployments/se-proxy/config/rd1ae-opteesp/default_se-proxy.dts.in
+++ b/deployments/se-proxy/config/rd1ae-opteesp/default_se-proxy.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/smm-gateway/config/default-opteesp/default_smm-gateway.dts.in b/deployments/smm-gateway/config/default-opteesp/default_smm-gateway.dts.in
index 611bfd6..4caffd7 100644
--- a/deployments/smm-gateway/config/default-opteesp/default_smm-gateway.dts.in
+++ b/deployments/smm-gateway/config/default-opteesp/default_smm-gateway.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/smm-gateway/config/default-sp/default_smm-gateway.dts.in b/deployments/smm-gateway/config/default-sp/default_smm-gateway.dts.in
index 0d6df35..dd1323c 100644
--- a/deployments/smm-gateway/config/default-sp/default_smm-gateway.dts.in
+++ b/deployments/smm-gateway/config/default-sp/default_smm-gateway.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 
diff --git a/deployments/spm-test1/opteesp/default_spm_test1.dts.in b/deployments/spm-test1/opteesp/default_spm_test1.dts.in
index 8ade9fd..0d93de4 100644
--- a/deployments/spm-test1/opteesp/default_spm_test1.dts.in
+++ b/deployments/spm-test1/opteesp/default_spm_test1.dts.in
@@ -17,7 +17,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AARCH64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/spm-test2/opteesp/default_spm_test2.dts.in b/deployments/spm-test2/opteesp/default_spm_test2.dts.in
index 034fe22..48e7460 100644
--- a/deployments/spm-test2/opteesp/default_spm_test2.dts.in
+++ b/deployments/spm-test2/opteesp/default_spm_test2.dts.in
@@ -18,7 +18,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AARCH64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/spm-test3/opteesp/default_spm_test3.dts.in b/deployments/spm-test3/opteesp/default_spm_test3.dts.in
index 2f7605b..d4080b0 100644
--- a/deployments/spm-test3/opteesp/default_spm_test3.dts.in
+++ b/deployments/spm-test3/opteesp/default_spm_test3.dts.in
@@ -17,7 +17,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AARCH64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;
diff --git a/deployments/spm-test4/opteesp/default_spm_test4.dts.in b/deployments/spm-test4/opteesp/default_spm_test4.dts.in
index 093c4e4..5226d2e 100644
--- a/deployments/spm-test4/opteesp/default_spm_test4.dts.in
+++ b/deployments/spm-test4/opteesp/default_spm_test4.dts.in
@@ -17,7 +17,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AARCH64 */
 	xlat-granule = <0>; /* 4KiB */
-	boot-order = /bits/ 16 <@EXPORT_SP_BOOT_ORDER@>;
+	boot-order = <@EXPORT_SP_BOOT_ORDER@>;
 	messaging-method = <3>; /* Direct messaging only */
 	ns-interrupts-action = <2>; /* Non-secure interrupts are signaled */
 	elf-format = <1>;