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 088b2db..3686ddf 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 a41374b..e9a9d52 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 ae6939e..ce7a1d6 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 088b2db..3686ddf 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 b61551c..2cb1298 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 ae6939e..ce7a1d6 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 46be354..bfd6a4e 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 088b2db..3686ddf 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 b61551c..2cb1298 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 2ee503b..4e1abb7 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 4726ac2..36ba894 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 d0f3a16..0202991 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 a41374b..e9a9d52 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 9a1c1ef..b744777 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 088b2db..3686ddf 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