commit ed30b6c7493cff4c2d29064f75b037f5677ddb67
author Jens Wiklander <jens.wiklander@linaro.org> Thu Oct 15 13:02:18 2020 +0200
committer Jérôme Forissier <jerome@forissier.org> Fri Oct 16 17:03:14 2020 +0200
tree afa8f074712eb3285424be1e9b4e36b7a1453874
parent c4def2a8262a03244d9a88461699b9b8e43c6b55

early_ta: use scattered array helpers

Simplifies the core linker script by replacing the hard coded
.rodata.early_ta section with use of SCATTERED_ARRAY_DEFINE_PG_ITEM()
instead.

Reviewed-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

scripts/ta_bin_to_c.py

diff --git a/scripts/ta_bin_to_c.py b/scripts/ta_bin_to_c.py
index c715a32..2b45fa6 100755
--- a/scripts/ta_bin_to_c.py
+++ b/scripts/ta_bin_to_c.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: BSD-2-Clause
 #
-# Copyright (c) 2017, Linaro Limited
+# Copyright (c) 2017, 2020, Linaro Limited
 #
 
 import argparse
@@ -74,11 +74,22 @@
     f = open(args.out, 'w')
     f.write('/* Generated from ' + args.ta + ' by ' +
             os.path.basename(__file__) + ' */\n\n')
-    f.write('#include <compiler.h>\n')
     f.write('#include <kernel/early_ta.h>\n\n')
-    f.write('__extension__ const struct early_ta __early_ta_' +
-            ta_uuid.hex +
-            '\n__early_ta __aligned(__alignof__(struct early_ta)) = {\n')
+    f.write('#include <scattered_array.h>\n\n')
+    f.write('const uint8_t ta_bin_' + ta_uuid.hex + '[] = {\n')
+    i = 0
+    while i < size:
+        if i % 8 == 0:
+            f.write('\t\t')
+        f.write(hex(bytes[i]) + ',')
+        i = i + 1
+        if i % 8 == 0 or i == size:
+            f.write('\n')
+        else:
+            f.write(' ')
+    f.write('};\n')
+
+    f.write('SCATTERED_ARRAY_DEFINE_PG_ITEM(early_tas, struct early_ta) = {\n')
     f.write('\t.flags = 0x{:04x},\n'.format(ta_get_flags(args.ta)))
     f.write('\t.uuid = {\n')
     f.write('\t\t.timeLow = 0x{:08x},\n'.format(ta_uuid.time_low))
@@ -91,22 +102,12 @@
     f.write('\t\t\t')
     f.write(', '.join('0x' + csn[i:i + 2] for i in range(0, len(csn), 2)))
     f.write('\n\t\t},\n\t},\n')
-    f.write('\t.size = {:d},\n'.format(size))
+    f.write('\t.size = sizeof(ta_bin_' + ta_uuid.hex +
+            '), /* {:d} */\n'.format(size))
+    f.write('\t.ta = ta_bin_' + ta_uuid.hex + ',\n')
     if args.compress:
         f.write('\t.uncompressed_size = '
                 '{:d},\n'.format(uncompressed_size))
-    f.write('\t.ta = {\n')
-    i = 0
-    while i < size:
-        if i % 8 == 0:
-            f.write('\t\t')
-        f.write(hex(bytes[i]) + ',')
-        i = i + 1
-        if i % 8 == 0 or i == size:
-            f.write('\n')
-        else:
-            f.write(' ')
-    f.write('\t},\n')
     f.write('};\n')
     f.close()