summaryrefslogtreecommitdiffstats
path: root/arch/sandbox/os
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-10-22 14:21:29 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-10-22 14:21:29 +0200
commitb4521685bf00398a4db0d3abe28376bd8f1b31ed (patch)
tree91c2097bc5f467c15ff8b404b288b8f916d80541 /arch/sandbox/os
parente2a7b79cfc63c8a5bdafb6f333fedf35b6b8a380 (diff)
downloadbarebox-b4521685bf00398a4db0d3abe28376bd8f1b31ed.tar.gz
barebox-b4521685bf00398a4db0d3abe28376bd8f1b31ed.tar.xz
[SANDBOX] Move include/asm-sandbox/arch-* to arch/sandbox/*/include/mach
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/sandbox/os')
-rw-r--r--arch/sandbox/os/Makefile12
-rw-r--r--arch/sandbox/os/common.c4
2 files changed, 13 insertions, 3 deletions
diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile
index 117f05eba0..2980301e15 100644
--- a/arch/sandbox/os/Makefile
+++ b/arch/sandbox/os/Makefile
@@ -1,4 +1,14 @@
-CPPFLAGS := -Iinclude/asm/arch -P
+machine-y := sandbox
+
+machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y))
+
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS := $(patsubst %,-I%include,$(machdirs))
+else
+CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs))
+endif
+
+CPPFLAGS += -P
CFLAGS := -Wall
NOSTDINC_FLAGS :=
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index 72e4c8d702..e89d8a6d36 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -47,8 +47,8 @@
/*
* ...except the ones needed to connect with U-Boot
*/
-#include <linux.h>
-#include <hostfile.h>
+#include <mach/linux.h>
+#include <mach/hostfile.h>
static struct termios term_orig, term_vi;
static char erase_char; /* the users erase character */