From 31d20fc02c8ee7c12d84bc28ce732bbc362ce369 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 17 Nov 2014 10:46:47 +1100 Subject: 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 --- Makefile.main | 2 +- asm/kernel-wrapper.S | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile.main b/Makefile.main index 68f8a38..4df3cfd 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 a9dc3d6..2ab4d67 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 -- cgit v1.1