board: ti: sec-cfg.yaml: Fix OTP write_host_id order

The write_host_id is the last element here and order does matter. This
may have gone unnoticed before as by default all elements are 0, but
if this is updated to a different host, it will not work. Update
the order so write_host_id is the last element in all current secure
board configs.

Reported-by: Prashant Shivhare <p-shivhare@ti.com>
Signed-off-by: Andrew Davis <afd@ti.com>

diff --git a/board/beagle/beagleplay/sec-cfg.yaml b/board/beagle/beagleplay/sec-cfg.yaml
index 088b2dbaf113db951f9230de45f5aa657ca1dd7e..3686ddf6bdf2ec13ff544b116124b715355c4ab2 100644 (file)
--- a/board/beagle/beagleplay/sec-cfg.yaml
+++ b/board/beagle/beagleplay/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/beagle/beagley-ai/sec-cfg.yaml b/board/beagle/beagley-ai/sec-cfg.yaml
index a41374b30c9b5de6638a08fd69572e10801f2f67..e9a9d526cfb7a9318d0ef7708fa2787cd59234b6 100644 (file)
--- a/board/beagle/beagley-ai/sec-cfg.yaml
+++ b/board/beagle/beagley-ai/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/phytec/phycore_am62ax/sec-cfg.yaml b/board/phytec/phycore_am62ax/sec-cfg.yaml
index ae6939eee9a021993401595707867e9c4a284e27..ce7a1d66dc5fdc000fc4f78bb71af9ff2b787e9d 100644 (file)
--- a/board/phytec/phycore_am62ax/sec-cfg.yaml
+++ b/board/phytec/phycore_am62ax/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/phytec/phycore_am62x/sec-cfg.yaml b/board/phytec/phycore_am62x/sec-cfg.yaml
index 088b2dbaf113db951f9230de45f5aa657ca1dd7e..3686ddf6bdf2ec13ff544b116124b715355c4ab2 100644 (file)
--- a/board/phytec/phycore_am62x/sec-cfg.yaml
+++ b/board/phytec/phycore_am62x/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/phytec/phycore_am64x/sec-cfg.yaml b/board/phytec/phycore_am64x/sec-cfg.yaml
index b61551c3208ca8e1ba5c7d821a48e44c0c0530ad..2cb1298c4a62e0419356a4b117200f092dda40db 100644 (file)
--- a/board/phytec/phycore_am64x/sec-cfg.yaml
+++ b/board/phytec/phycore_am64x/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
                 subhdr:
                         magic: 0x4081
                         size: 69
-                write_host_id: 0
                 otp_entry:
                         -  # 1
                                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
                         -  # 32
                                 host_id: 0
                                 host_perms: 0
+                write_host_id: 0
         dkek_config:
                 subhdr:
                         magic: 0x5170

diff --git a/board/ti/am62ax/sec-cfg.yaml b/board/ti/am62ax/sec-cfg.yaml
index ae6939eee9a021993401595707867e9c4a284e27..ce7a1d66dc5fdc000fc4f78bb71af9ff2b787e9d 100644 (file)
--- a/board/ti/am62ax/sec-cfg.yaml
+++ b/board/ti/am62ax/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/ti/am62px/sec-cfg.yaml b/board/ti/am62px/sec-cfg.yaml
index 46be354972afc11e2df08cec9b479546216e43de..bfd6a4e5dbdd31f50cf9e5b3ab2f910f95902d18 100644 (file)
--- a/board/ti/am62px/sec-cfg.yaml
+++ b/board/ti/am62px/sec-cfg.yaml
@@ -247,7 +247,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -345,6 +344,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/ti/am62x/sec-cfg.yaml b/board/ti/am62x/sec-cfg.yaml
index 088b2dbaf113db951f9230de45f5aa657ca1dd7e..3686ddf6bdf2ec13ff544b116124b715355c4ab2 100644 (file)
--- a/board/ti/am62x/sec-cfg.yaml
+++ b/board/ti/am62x/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/ti/am64x/sec-cfg.yaml b/board/ti/am64x/sec-cfg.yaml
index b61551c3208ca8e1ba5c7d821a48e44c0c0530ad..2cb1298c4a62e0419356a4b117200f092dda40db 100644 (file)
--- a/board/ti/am64x/sec-cfg.yaml
+++ b/board/ti/am64x/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
                 subhdr:
                         magic: 0x4081
                         size: 69
-                write_host_id: 0
                 otp_entry:
                         -  # 1
                                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
                         -  # 32
                                 host_id: 0
                                 host_perms: 0
+                write_host_id: 0
         dkek_config:
                 subhdr:
                         magic: 0x5170

diff --git a/board/ti/am65x/sec-cfg.yaml b/board/ti/am65x/sec-cfg.yaml
index 2ee503bace3d6de8fa2e1f43bbf64296159d2ecc..4e1abb774c906a7a8bbb3a7df8a44e40a1c6cf3f 100644 (file)
--- a/board/ti/am65x/sec-cfg.yaml
+++ b/board/ti/am65x/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/ti/j7200/sec-cfg.yaml b/board/ti/j7200/sec-cfg.yaml
index 4726ac24a38ce32aa8a43155a9f2eb4157bde97d..36ba89410ce83382fdc2036999fa943e48eb29ce 100644 (file)
--- a/board/ti/j7200/sec-cfg.yaml
+++ b/board/ti/j7200/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
                 subhdr:
                         magic: 0x4081
                         size: 69
-                write_host_id: 0
                 otp_entry:
                         -  # 1
                                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
                         -  # 32
                                 host_id: 0
                                 host_perms: 0
+                write_host_id: 0
         dkek_config:
                 subhdr:
                         magic: 0x5170

diff --git a/board/ti/j721s2/sec-cfg.yaml b/board/ti/j721s2/sec-cfg.yaml
index d0f3a161a7ddb95d8bb6b2457b62f1b201b8f5ec..020299186131eda0c44e74987d209dc54e73aecc 100644 (file)
--- a/board/ti/j721s2/sec-cfg.yaml
+++ b/board/ti/j721s2/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/ti/j722s/sec-cfg.yaml b/board/ti/j722s/sec-cfg.yaml
index a41374b30c9b5de6638a08fd69572e10801f2f67..e9a9d526cfb7a9318d0ef7708fa2787cd59234b6 100644 (file)
--- a/board/ti/j722s/sec-cfg.yaml
+++ b/board/ti/j722s/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/ti/j784s4/sec-cfg.yaml b/board/ti/j784s4/sec-cfg.yaml
index 9a1c1ef2201f98cf7d256eb6692149abd3a54751..b744777db2d87aac8204812e37ceb7886e63dabd 100644 (file)
--- a/board/ti/j784s4/sec-cfg.yaml
+++ b/board/ti/j784s4/sec-cfg.yaml
@@ -249,7 +249,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -347,6 +346,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170

diff --git a/board/toradex/verdin-am62/sec-cfg.yaml b/board/toradex/verdin-am62/sec-cfg.yaml
index 088b2dbaf113db951f9230de45f5aa657ca1dd7e..3686ddf6bdf2ec13ff544b116124b715355c4ab2 100644 (file)
--- a/board/toradex/verdin-am62/sec-cfg.yaml
+++ b/board/toradex/verdin-am62/sec-cfg.yaml
@@ -248,7 +248,6 @@ sec-cfg:
         subhdr:
             magic: 0x4081
             size: 69
-        write_host_id: 0
         otp_entry:
             -  # 1
                 host_id: 0
@@ -346,6 +345,7 @@ sec-cfg:
             -  # 32
                 host_id: 0
                 host_perms: 0
+        write_host_id: 0
     dkek_config:
         subhdr:
             magic: 0x5170