5 files changed, 56 insertions, 45 deletions

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index dbe8dd2fe247..5b016e2498f3 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -35,19 +35,22 @@ setup-y		+= video-vesa.o
 setup-y         += video-bios.o
 
 targets         += $(setup-y)
-hostprogs-y     := mkcpustr tools/build
+hostprogs-y     := tools/build
+hostprogs-$(CONFIG_X86_FEATURE_NAMES) += mkcpustr
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include \
                     -include include/generated/autoconf.h \
                     -D__EXPORTED_HEADERS__
 
+ifdef CONFIG_X86_FEATURE_NAMES
 $(obj)/cpu.o: $(obj)/cpustr.h
 
 quiet_cmd_cpustr = CPUSTR  $@
       cmd_cpustr = $(obj)/mkcpustr > $@
-targets         += cpustr.h
+targets += cpustr.h
 $(obj)/cpustr.h: $(obj)/mkcpustr FORCE
         $(call if_changed,cpustr)
+endif
 
 # ---------------------------------------------------------------------------
 
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 7a801a310e37..20db5b3609de 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -26,18 +26,19 @@ LDFLAGS_vmlinux := -T
 hostprogs-y     := mkpiggy
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
-VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
-        $(obj)/string.o $(obj)/cmdline.o $(obj)/early_serial_console.o \
-        $(obj)/piggy.o $(obj)/cpuflags.o $(obj)/aslr.o
+vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
+        $(obj)/string.o $(obj)/cmdline.o \
+        $(obj)/piggy.o $(obj)/cpuflags.o
+
+vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o
+vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/aslr.o
 
 $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
 
-ifeq ($(CONFIG_EFI_STUB), y)
-        VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \
-                                $(objtree)/drivers/firmware/efi/libstub/lib.a
-endif
+vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \
+        $(objtree)/drivers/firmware/efi/libstub/lib.a
 
-$(obj)/vmlinux: $(VMLINUX_OBJS) FORCE
+$(obj)/vmlinux: $(vmlinux-objs-y) FORCE
         $(call if_changed,ld)
         @:
 
@@ -45,7 +46,7 @@ OBJCOPYFLAGS_vmlinux.bin :=  -R .comment -S
 $(obj)/vmlinux.bin: vmlinux FORCE
         $(call if_changed,objcopy)
 
-targets += $(patsubst $(obj)/%,%,$(VMLINUX_OBJS)) vmlinux.bin.all vmlinux.relocs
+targets += $(patsubst $(obj)/%,%,$(vmlinux-objs-y)) vmlinux.bin.all vmlinux.relocs
 
 CMD_RELOCS = arch/x86/tools/relocs
 quiet_cmd_relocs = RELOCS  $@
diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c
index fc6091abedb7..913c999b0045 100644
--- a/arch/x86/boot/compressed/aslr.c
+++ b/arch/x86/boot/compressed/aslr.c
@@ -1,6 +1,5 @@
 #include "misc.h"
 
-#ifdef CONFIG_RANDOMIZE_BASE
 #include <asm/msr.h>
 #include <asm/archrandom.h>
 #include <asm/e820.h>
@@ -320,5 +319,3 @@ unsigned char *choose_kernel_location(unsigned char *input,
 out:
         return (unsigned char *)choice;
 }
-
-#endif /* CONFIG_RANDOMIZE_BASE */
diff --git a/arch/x86/boot/compressed/early_serial_console.c b/arch/x86/boot/compressed/early_serial_console.c
index d3d003cb5481..261e81fb9582 100644
--- a/arch/x86/boot/compressed/early_serial_console.c
+++ b/arch/x86/boot/compressed/early_serial_console.c
@@ -1,9 +1,5 @@
 #include "misc.h"
 
-#ifdef CONFIG_EARLY_PRINTK
-
 int early_serial_base;
 
 #include "../early_serial_console.c"
-
-#endif
diff --git a/arch/x86/boot/cpu.c b/arch/x86/boot/cpu.c
index 6ec6bb6e9957..29207f69ae8c 100644
--- a/arch/x86/boot/cpu.c
+++ b/arch/x86/boot/cpu.c
@@ -16,7 +16,9 @@
  */
 
 #include "boot.h"
+#ifdef CONFIG_X86_FEATURE_NAMES
 #include "cpustr.h"
+#endif
 
 static char *cpu_name(int level)
 {
@@ -32,11 +34,48 @@ static char *cpu_name(int level)
         }
 }
 
+static void show_cap_strs(u32 *err_flags)
+{
+        int i, j;
+#ifdef CONFIG_X86_FEATURE_NAMES
+        const unsigned char *msg_strs = (const unsigned char *)x86_cap_strs;
+        for (i = 0; i < NCAPINTS; i++) {
+                u32 e = err_flags[i];
+                for (j = 0; j < 32; j++) {
+                        if (msg_strs[0] < i ||
+                            (msg_strs[0] == i && msg_strs[1] < j)) {
+                                /* Skip to the next string */
+                                msg_strs += 2;
+                                while (*msg_strs++)
+                                        ;
+                        }
+                        if (e & 1) {
+                                if (msg_strs[0] == i &&
+                                    msg_strs[1] == j &&
+                                    msg_strs[2])
+                                        printf("%s ", msg_strs+2);
+                                else
+                                        printf("%d:%d ", i, j);
+                        }
+                        e >>= 1;
+                }
+        }
+#else
+        for (i = 0; i < NCAPINTS; i++) {
+                u32 e = err_flags[i];
+                for (j = 0; j < 32; j++) {
+                        if (e & 1)
+                                printf("%d:%d ", i, j);
+                        e >>= 1;
+                }
+        }
+#endif
+}
+
 int validate_cpu(void)
 {
         u32 *err_flags;
         int cpu_level, req_level;
-        const unsigned char *msg_strs;
 
         check_cpu(&cpu_level, &req_level, &err_flags);
 
@@ -49,34 +88,9 @@ int validate_cpu(void)
         }
 
         if (err_flags) {
-                int i, j;
                 puts("This kernel requires the following features "
                      "not present on the CPU:\n");
-
-                msg_strs = (const unsigned char *)x86_cap_strs;
-
-                for (i = 0; i < NCAPINTS; i++) {
-                        u32 e = err_flags[i];
-
-                        for (j = 0; j < 32; j++) {
-                                if (msg_strs[0] < i ||
-                                    (msg_strs[0] == i && msg_strs[1] < j)) {
-                                        /* Skip to the next string */
-                                        msg_strs += 2;
-                                        while (*msg_strs++)
-                                                ;
-                                }
-                                if (e & 1) {
-                                        if (msg_strs[0] == i &&
-                                            msg_strs[1] == j &&
-                                            msg_strs[2])
-                                                printf("%s ", msg_strs+2);
-                                        else
-                                                printf("%d:%d ", i, j);
-                                }
-                                e >>= 1;
-                        }
-                }
+                show_cap_strs(err_flags);
                 putchar('\n');
                 return -1;
         } else {