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 /Makefile | |
| parent | 9a5898e524437495cfdbcb84521136d2bb7ddf2d (diff) | |
| parent | dac6e90115de9b47295fc5289a26f686bcae4d35 (diff) | |
| download | barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.gz barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -825,7 +825,7 @@ prepare prepare-all: prepare0 # Leave this as default for preprocessing barebox.lds.S, which is now # done in arch/$(ARCH)/kernel/Makefile -export CPPFLAGS_barebox.lds += -P -C -U$(ARCH) +export CPPFLAGS_barebox.lds += -C -U$(ARCH) # FIXME: The asm symlink changes when $(ARCH) changes. That's # hard to detect, but I suppose "make mrproper" is a good idea |