diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-11-17 10:46:47 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-11-17 10:46:47 +1100 |
| commit | 31d20fc02c8ee7c12d84bc28ce732bbc362ce369 (patch) | |
| tree | 221d56d8256df3406b1972b5f76fe6c852e6ab89 | |
| parent | 1a29692c6f3d8d12cefd8e22028cfbd6d3f5b935 (diff) | |
| download | blackbird-skiboot-31d20fc02c8ee7c12d84bc28ce732bbc362ce369.tar.gz blackbird-skiboot-31d20fc02c8ee7c12d84bc28ce732bbc362ce369.zip | |
Quote built-in kernel path from Makefile
Otherwise, if your path contains something like "linux-foo" then the "linux"
part gets replaced by the preprocessor due to stupid built-ins.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | Makefile.main | 2 | ||||
| -rw-r--r-- | asm/kernel-wrapper.S | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.main b/Makefile.main index 68f8a387..4df3cfd1 100644 --- a/Makefile.main +++ b/Makefile.main @@ -75,7 +75,7 @@ CFLAGS += -mno-multiple #CFLAGS += -mno-update ifneq ($(KERNEL),) -CPPFLAGS += -DBUILTIN_KERNEL="$(KERNEL)" +CPPFLAGS += -DBUILTIN_KERNEL="\"$(KERNEL)\"" endif .SECONDARY: diff --git a/asm/kernel-wrapper.S b/asm/kernel-wrapper.S index a9dc3d61..2ab4d671 100644 --- a/asm/kernel-wrapper.S +++ b/asm/kernel-wrapper.S @@ -15,12 +15,8 @@ */ -#define stringify(expr) stringify_1(expr) -/* Double-indirection required to stringify expansions */ -#define stringify_1(expr) #expr - .section ".builtin_kernel","a" .balign 0x10000 #ifdef BUILTIN_KERNEL - .incbin stringify(BUILTIN_KERNEL) + .incbin BUILTIN_KERNEL #endif |
