diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-23 13:38:39 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-23 13:38:39 +0200 |
commit | 6b8503baabb5a55dc6e21c80d02ac8729149525e (patch) | |
tree | d5d5ae95990164e0cee130a629dabb9ba8226a8b /arch/sandbox | |
parent | 9a5898e524437495cfdbcb84521136d2bb7ddf2d (diff) | |
parent | dac6e90115de9b47295fc5289a26f686bcae4d35 (diff) | |
download | barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.gz barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'arch/sandbox')
-rw-r--r-- | arch/sandbox/Makefile | 1 | ||||
-rw-r--r-- | arch/sandbox/os/Makefile | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index ed1194c3e6..b88f1f60f8 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -10,7 +10,6 @@ lds-y := $(BOARD)/barebox.lds TEXT_BASE = $(CONFIG_TEXT_BASE) -CPPFLAGS += -P CFLAGS += -Dmalloc=barebox_malloc \ -Dfree=barebox_free -Drealloc=barebox_realloc \ -Dread=barebox_read -Dwrite=barebox_write \ diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile index 2980301e15..dc211d94cd 100644 --- a/arch/sandbox/os/Makefile +++ b/arch/sandbox/os/Makefile @@ -8,7 +8,6 @@ else CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs)) endif -CPPFLAGS += -P CFLAGS := -Wall NOSTDINC_FLAGS := |