[PATCH 1/3] linux16: fix cmd_tbl_t as struct command

[PATCH 1/3] linux16: fix cmd_tbl_t as struct command

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 commands/linux16.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/commands/linux16.c b/commands/linux16.c
index b15812f..918c937 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;
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] x86: add 64bit host build support

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 arch/x86/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 57c5dbc..8ab40b6 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
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] x86: fix out of tree build support

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 scripts/setupmbr/setupmbr.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setupmbr/setupmbr.c b/scripts/setupmbr/setupmbr.c
index 3cfec97..dd7f38c 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
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox