commit 44b8a0d1993cc7d2c5d09c9ddb309b3581c8b340
author Jordan Yates <jordan.yates@data61.csiro.au> Wed Oct 20 20:29:10 2021 +1000
committer Carles Cufí <carles.cufi@nordicsemi.no> Tue Nov 16 10:41:59 2021 +0100
tree 9ae2be7c5657a23aeff73d0b13767432ba2bda59
parent 28b2e5532190653d1daf441c89e62b2eaf69c9dd

scripts: gen_handles.py: remove size restrictions

With `gen_handles.py` now running on the first pre-built image,
`zephyr_pre0.elf` there is no requirement for the device handle arrays
to remain the same size after processing.

Remove the padding generated in `gen_handles.py`, as well as the
temporary option `CONFIG_DEVICE_HANDLE_PADDING` which was added to work
around this issue.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>

scripts/gen_handles.py

diff --git a/scripts/gen_handles.py b/scripts/gen_handles.py
index 558ce82..ddd47b4 100755
--- a/scripts/gen_handles.py
+++ b/scripts/gen_handles.py
@@ -306,21 +306,8 @@
                 hdls.append(DEVICE_HANDLE_SEP)
                 hdls.extend(hs.ext_deps)
 
-            # When CONFIG_USERSPACE is enabled the pre-built elf is
-            # also used to get hashes that identify kernel objects by
-            # address. We can't allow the size of any object in the
-            # final elf to change. We also must make sure at least one
-            # DEVICE_HANDLE_ENDS is inserted.
-            padding = len(hs.handles) - len(hdls)
-            assert padding > 0, \
-                (f"device {dev.sym.name}: "
-                 "linker pass 1 left no room to insert DEVICE_HANDLE_ENDS. "
-                 "To work around, increase CONFIG_DEVICE_HANDLE_PADDING by " +
-                 str(1 + (-padding)))
-            while padding > 0:
-                hdls.append(DEVICE_HANDLE_ENDS)
-                padding -= 1
-            assert len(hdls) == len(hs.handles), "%s handle overflow" % (dev.sym.name,)
+            # Terminate the array with the end symbol
+            hdls.append(DEVICE_HANDLE_ENDS)
 
             lines = [
                 '',