Merge branch 'master' into debian/buster

2026-01-20 21:13:36 +08:00 · 2020-01-14 16:12:37 +00:00
parent e31833a78a a141add21c
commit 69f89ac00f
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@@ -48,8 +48,8 @@ class BootloaderImage(object):
                if name.decode('utf-8') == 'bootconf.txt':
                    return (offset, length)

-            offset += 4 + length
-            offset += 8 - (offset % 8) # Pad
+            offset += 8 + length # length + type
+            offset = (offset + 7) & ~7

        raise Exception('Bootloader config not found')