summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2013-05-28 16:15:01 -0500
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-11-25 23:40:46 +0100
commit7ae7fc081b3832f1f6ba80eac8c92f788cbdd554 (patch)
treeb627b992f6dc25cc7fbe5aeab82d1f9cc74563ed /src/arch/x86
parent680b0ab72a1db04d4ce5be52131869e3d5d0135f (diff)
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@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/56844 Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-by: David James <davidjames@chromium.org> Reviewed-on: http://review.coreboot.org/4207 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/boot/boot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/x86/boot/boot.c b/src/arch/x86/boot/boot.c
index 7fc433db22..1b28a4c50c 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
);
}