[coreboot-gerrit] Patch set updated for coreboot: lb_tables: make lb_mainboard and lb_strings records 64-bit aligned

[Ronald G. Minnich (rminnich@gmail.com)]

Ronald G. Minnich (rminnich at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18165

-gerrit

commit afcc97e48585110615cd75083d1b669d05925532
Author: Ronald G. Minnich <rminnich at gmail.com>
Date:   Tue Jan 17 23:20:48 2017 -0800

    lb_tables: make lb_mainboard and lb_strings records 64-bit aligned
    
    Change-Id: I494b942c4866a7912fb48a53f9524db20ac53a8c
    Signed-off-by: Ronald G. Minnich <rminnich at gmail.com>
---
 src/lib/coreboot_table.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index f8da658..332d1d5 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -46,6 +46,7 @@
 #if CONFIG_ARCH_X86
 #include <cpu/x86/mtrr.h>
 #endif
+#include <commonlib/helpers.h>
 
 static struct lb_header *lb_table_init(unsigned long addr)
 {
@@ -348,10 +349,9 @@ static struct lb_mainboard *lb_mainboard(struct lb_header *header)
 	mainboard = (struct lb_mainboard *)rec;
 	mainboard->tag = LB_TAG_MAINBOARD;
 
-	mainboard->size = (sizeof(*mainboard) +
+	mainboard->size = ALIGN_UP(sizeof(*mainboard) +
 		strlen(mainboard_vendor) + 1 +
-		strlen(mainboard_part_number) + 1 +
-		3) & ~3;
+		strlen(mainboard_part_number) + 1, 8);
 
 	mainboard->vendor_idx = 0;
 	mainboard->part_number_idx = strlen(mainboard_vendor) + 1;
@@ -402,7 +402,7 @@ static void lb_strings(struct lb_header *header)
 		rec = (struct lb_string *)lb_new_record(header);
 		len = strlen(strings[i].string);
 		rec->tag = strings[i].tag;
-		rec->size = (sizeof(*rec) + len + 1 + 3) & ~3;
+		rec->size = ALIGN_UP(sizeof(*rec) + len + 1, 8);
 		memcpy(rec->string, strings[i].string, len+1);
 	}