[coreboot-gerrit] Patch set updated for coreboot: da581be x86: fix compile error for !CONFIG_MULTIBOOT

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Wed Nov 20 01:50:35 CET 2013


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4207

-gerrit

commit da581be286afa538acbf5e62d001fae651b6f2fb
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Tue May 28 16:15:01 2013 -0500

    x86: fix compile error for !CONFIG_MULTIBOOT
    
    Some code was previously removed regarding elf notes. However,
    that code left a dangling comma under !CONFIG_MULTIBOOT
    configs for inline assembly constraints. Instead, place the comma
    within the #ifdef stanza.
    
    Change-Id: I805453ef57d34fbfb904b4d145d8874921d8d660
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Reviewed-on: https://gerrit.chromium.org/gerrit/56844
    Reviewed-by: Duncan Laurie <dlaurie at chromium.org>
    Reviewed-by: David James <davidjames at chromium.org>
---
 src/arch/x86/boot/boot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/arch/x86/boot/boot.c b/src/arch/x86/boot/boot.c
index 7fc433d..1b28a4c 100644
--- a/src/arch/x86/boot/boot.c
+++ b/src/arch/x86/boot/boot.c
@@ -20,9 +20,9 @@ void jmp_to_elf_entry(void *entry, unsigned long unused1, unsigned long unused2)
 		"	cld	\n\t"
 
 		::
-		"r" (entry),
+		"r" (entry)
 #if CONFIG_MULTIBOOT
-		"b"(mbi), "a" (MB_MAGIC2)
+		, "b"(mbi), "a" (MB_MAGIC2)
 #endif
 		);
 }



More information about the coreboot-gerrit mailing list