aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/compressed/Makefile
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-03-10 16:26:10 -0400
committerJosh Triplett <josh@joshtriplett.org>2014-08-17 17:58:24 -0400
commit3afed06a355b5525d9a87bcb76567ef2e2e7b3a2 (patch)
tree6f3521a41627db95cd9cccae44921bb26787ae35 /arch/x86/boot/compressed/Makefile
parent9e6abd2a98ca599e0efb8c46acc17f17dc1a6fe9 (diff)
x86, boot: Don't compile early_serial_console.c when !CONFIG_EARLY_PRINTK
All the code in early_serial_console.c gets compiled out if !CONFIG_EARLY_PRINTK, but early_serial_console.o itself still gets compiled in. Eliminate it from the compile entirely in that case. This does not change the generated code at all, in either case. Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'arch/x86/boot/compressed/Makefile')
-rw-r--r--arch/x86/boot/compressed/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 3b9b00c68fd8..20db5b3609de 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -27,9 +27,10 @@ hostprogs-y := mkpiggy
27HOST_EXTRACFLAGS += -I$(srctree)/tools/include 27HOST_EXTRACFLAGS += -I$(srctree)/tools/include
28 28
29vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ 29vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
30 $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \ 30 $(obj)/string.o $(obj)/cmdline.o \
31 $(obj)/piggy.o $(obj)/cpuflags.o 31 $(obj)/piggy.o $(obj)/cpuflags.o
32 32
33vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o
33vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o 34vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o
34 35
35$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone 36$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone