diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-17 10:23:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-17 10:23:48 +0100 |
| commit | 7e7ca7cb3a7ff663fc2ba5dc8ebfacdacb2b5ec4 (patch) | |
| tree | ec0b75bbc1bf4186b671eeb4c9870c09838d413f | |
| parent | c22da7e05d3938dff232c85c230cbbd6f7d28e3a (diff) | |
| parent | 88426746374fba2e2d1c9b03d80e2a1c7b6fb317 (diff) | |
| download | barebox-7e7ca7cb3a7ff663fc2ba5dc8ebfacdacb2b5ec4.tar.gz barebox-7e7ca7cb3a7ff663fc2ba5dc8ebfacdacb2b5ec4.tar.xz | |
Merge branch 'x86' of git://git.jcrosoft.org/barebox
| -rw-r--r-- | arch/x86/Makefile | 3 | ||||
| -rw-r--r-- | commands/linux16.c | 2 | ||||
| -rw-r--r-- | scripts/setupmbr/setupmbr.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 57c5dbc3b0..8ab40b6459 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -5,7 +5,8 @@ machine-y := i386 TEXT_BASE = $(CONFIG_TEXT_BASE) -CPPFLAGS += -march=i386 -DTEXT_BASE=$(TEXT_BASE) -P +CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE) -P +LDFLAGS += -m elf_i386 ifndef CONFIG_MODULES # Add cleanup flags diff --git a/commands/linux16.c b/commands/linux16.c index ec859a73ab..5f412e29d3 100644 --- a/commands/linux16.c +++ b/commands/linux16.c @@ -150,7 +150,7 @@ struct linux_kernel_header { * (setup = 'real mode code' and kernel = 'protected mode code') to their * default locations, switches back to real mode and runs the setup code. */ -static int do_linux16(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_linux16(struct command *cmdtp, int argc, char *argv[]) { struct linux_kernel_header *lh = NULL; int rc; diff --git a/scripts/setupmbr/setupmbr.c b/scripts/setupmbr/setupmbr.c index 3cfec97aa0..dd7f38ccb2 100644 --- a/scripts/setupmbr/setupmbr.c +++ b/scripts/setupmbr/setupmbr.c @@ -42,8 +42,8 @@ #include <assert.h> /* include the info from this barebox release */ -#include "include/generated/utsrelease.h" -#include "arch/x86/include/asm/barebox.lds.h" +#include "../../include/generated/utsrelease.h" +#include "../../arch/x86/include/asm/barebox.lds.h" /** define to disable integrity tests and debug messages */ #define NDEBUG |