diff options
-rw-r--r-- | arch/sandbox/Makefile | 26 | ||||
-rw-r--r-- | arch/sandbox/mach-sandbox/include/mach/hostfile.h (renamed from include/asm-sandbox/arch-sandbox/hostfile.h) | 0 | ||||
-rw-r--r-- | arch/sandbox/mach-sandbox/include/mach/linux.h (renamed from include/asm-sandbox/arch-sandbox/linux.h) | 0 | ||||
-rw-r--r-- | arch/sandbox/os/Makefile | 12 | ||||
-rw-r--r-- | arch/sandbox/os/common.c | 4 | ||||
-rw-r--r-- | board/sandbox/board.c | 2 | ||||
-rw-r--r-- | board/sandbox/clock.c | 2 | ||||
-rw-r--r-- | board/sandbox/console.c | 2 | ||||
-rw-r--r-- | board/sandbox/hostfile.c | 4 | ||||
-rw-r--r-- | drivers/net/tap.c | 2 | ||||
-rw-r--r-- | drivers/serial/linux_console.c | 2 |
11 files changed, 27 insertions, 29 deletions
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index 5501b104ba..57fac202f6 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -1,7 +1,7 @@ CPPFLAGS += -fno-strict-aliasing -machine-y := sandbox +machine-y := sandbox board-y := sandbox lds-y := board/sandbox/u-boot.lds @@ -22,10 +22,13 @@ CFLAGS += -Dmalloc=u_boot_malloc \ -Dglob=u_boot_glob -Dglobfree=u_boot_globfree \ -Dioctl=u_boot_ioctl -ifeq ($(incdir-y),) -incdir-y := $(machine-y) +machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y)) + +ifeq ($(KBUILD_SRC),) +CPPFLAGS += $(patsubst %,-I%include,$(machdirs)) +else +CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) endif -INCDIR := arch-$(incdir-y) SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ @@ -50,24 +53,10 @@ endif CPPFLAGS += -DELF_CLASS="$(ELF_CLASS)" export ELF_FORMAT ELF_ARCH SUBARCH ELF_CLASS -# Update machine arch and proc symlinks if something which affects -# them changed. We use .arch to indicate when they were updated -# last, otherwise make uses the target directory mtime. - -include/asm-sandbox/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-sandbox/arch -> include/asm-sandbox/$(INCDIR)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-sandbox - $(Q)ln -fsn $(srctree)/include/asm-sandbox/$(INCDIR) include/asm-sandbox/arch -else - $(Q)ln -fsn $(INCDIR) include/asm-sandbox/arch -endif - @touch $@ archprepare: maketools PHONY += maketools -maketools: include/asm-sandbox/.arch cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \ -Wl,--start-group $(uboot-common) -Wl,--end-group \ @@ -76,4 +65,3 @@ cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \ common-y += board/sandbox/ arch/sandbox/os/ CLEAN_FILES += board/sandbox/u-boot.lds -MRPROPER_FILES += include/asm-sandbox/arch diff --git a/include/asm-sandbox/arch-sandbox/hostfile.h b/arch/sandbox/mach-sandbox/include/mach/hostfile.h index 30f9499c03..30f9499c03 100644 --- a/include/asm-sandbox/arch-sandbox/hostfile.h +++ b/arch/sandbox/mach-sandbox/include/mach/hostfile.h diff --git a/include/asm-sandbox/arch-sandbox/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h index 09376413e9..09376413e9 100644 --- a/include/asm-sandbox/arch-sandbox/linux.h +++ b/arch/sandbox/mach-sandbox/include/mach/linux.h 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 */ diff --git a/board/sandbox/board.c b/board/sandbox/board.c index a3f64983c4..84017eb50d 100644 --- a/board/sandbox/board.c +++ b/board/sandbox/board.c @@ -23,7 +23,7 @@ #include <common.h> #include <driver.h> #include <malloc.h> -#include <asm/arch/linux.h> +#include <mach/linux.h> #include <init.h> #include <errno.h> diff --git a/board/sandbox/clock.c b/board/sandbox/clock.c index 27ae7e234c..7ad1f53e15 100644 --- a/board/sandbox/clock.c +++ b/board/sandbox/clock.c @@ -23,7 +23,7 @@ #include <common.h> #include <init.h> #include <clock.h> -#include <asm/arch/linux.h> +#include <mach/linux.h> static uint64_t linux_clocksource_read(void) { diff --git a/board/sandbox/console.c b/board/sandbox/console.c index 7b429df8b3..094521678a 100644 --- a/board/sandbox/console.c +++ b/board/sandbox/console.c @@ -22,7 +22,7 @@ #include <common.h> #include <driver.h> -#include <asm/arch/linux.h> +#include <mach/linux.h> #include <xfuncs.h> int u_boot_register_console(char *name, int stdinfd, int stdoutfd) diff --git a/board/sandbox/hostfile.c b/board/sandbox/hostfile.c index eb3b08ff76..f91601febb 100644 --- a/board/sandbox/hostfile.c +++ b/board/sandbox/hostfile.c @@ -23,10 +23,10 @@ #include <common.h> #include <driver.h> #include <malloc.h> -#include <asm/arch/linux.h> +#include <mach/linux.h> #include <init.h> #include <errno.h> -#include <asm/arch/hostfile.h> +#include <mach/hostfile.h> #include <xfuncs.h> struct hf_priv { diff --git a/drivers/net/tap.c b/drivers/net/tap.c index e09c136ecf..7070cc6b41 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -25,7 +25,7 @@ #include <malloc.h> #include <net.h> #include <init.h> -#include <asm/arch/linux.h> +#include <mach/linux.h> struct tap_priv { int fd; diff --git a/drivers/serial/linux_console.c b/drivers/serial/linux_console.c index 39ff862729..c792b501a0 100644 --- a/drivers/serial/linux_console.c +++ b/drivers/serial/linux_console.c @@ -23,7 +23,7 @@ #include <common.h> #include <driver.h> #include <init.h> -#include <asm/arch/linux.h> +#include <mach/linux.h> #include <malloc.h> #include <console.h> #include <xfuncs.h> |