From a98732282112644f0abc46445d02688d0dbefd07 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.org>
Date: Tue, 14 Jan 2020 15:29:20 +0000
Subject: [PATCH] rpi-eeprom-config: Fix padding calculation

---
 rpi-eeprom-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpi-eeprom-config b/rpi-eeprom-config
index ae7c385..9e96573 100755
--- a/rpi-eeprom-config
+++ b/rpi-eeprom-config
@@ -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')