[PATCH 3/8] Consolidate BOOTLOADER defines

[Jeremy Kerr]

The BOOTLOADER and BOOTLOADER_VERSION #defines are repeated in multiple
files. This change removes the unnecessary definition of these, and
keeps the kexec/kexec.h as the main source.

Signed-off-by: Jeremy Kerr <jk at ozlabs.org>

---
 kexec/arch/i386/kexec-multiboot-x86.c |    2 --
 kexec/arch/ppc/kexec-dol-ppc.c        |    2 --
 kexec/arch/ppc/kexec-elf-ppc.c        |    2 --
 kexec/arch/ppc64/kexec-elf-ppc64.c    |    3 ---
 4 files changed, 9 deletions(-)

diff --git a/kexec/arch/i386/kexec-multiboot-x86.c b/kexec/arch/i386/kexec-multiboot-x86.c
index 8ec8bba..5ad279a 100644
--- a/kexec/arch/i386/kexec-multiboot-x86.c
+++ b/kexec/arch/i386/kexec-multiboot-x86.c
@@ -61,8 +61,6 @@
 static char headerbuf[MULTIBOOT_SEARCH];
 static struct multiboot_header *mbh = NULL;
 
-#define BOOTLOADER "kexec"
-#define BOOTLOADER_VERSION VERSION
 #define MIN(_x,_y) (((_x)<=(_y))?(_x):(_y))
 
 
diff --git a/kexec/arch/ppc/kexec-dol-ppc.c b/kexec/arch/ppc/kexec-dol-ppc.c
index 1b34f2a..5e7e078 100644
--- a/kexec/arch/ppc/kexec-dol-ppc.c
+++ b/kexec/arch/ppc/kexec-dol-ppc.c
@@ -90,8 +90,6 @@ typedef struct {
 #define PAGE_MASK		(~((1 << PAGE_SHIFT) - 1))
 #define PAGE_ALIGN(addr)	(((addr) + PAGE_SIZE - 1) & PAGE_MASK)
 
-#define BOOTLOADER         "kexec"
-#define BOOTLOADER_VERSION VERSION
 #define MAX_COMMAND_LINE   256
 
 #define UPSZ(X) ((sizeof(X) + 3) & ~3)
diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c
index e5e5ebd..241c803 100644
--- a/kexec/arch/ppc/kexec-elf-ppc.c
+++ b/kexec/arch/ppc/kexec-elf-ppc.c
@@ -27,8 +27,6 @@
 
 static const int probe_debug = 0;
 
-#define BOOTLOADER         "kexec"
-#define BOOTLOADER_VERSION VERSION
 #define MAX_COMMAND_LINE   256
 
 #define UPSZ(X) ((sizeof(X) + 3) & ~3)
diff --git a/kexec/arch/ppc64/kexec-elf-ppc64.c b/kexec/arch/ppc64/kexec-elf-ppc64.c
index 165a0f6..a8df885 100644
--- a/kexec/arch/ppc64/kexec-elf-ppc64.c
+++ b/kexec/arch/ppc64/kexec-elf-ppc64.c
@@ -39,9 +39,6 @@
 #include "crashdump-ppc64.h"
 #include <arch/options.h>
 
-#define BOOTLOADER         "kexec"
-#define BOOTLOADER_VERSION VERSION
-
 uint64_t initrd_base, initrd_size;
 unsigned char reuse_initrd = 0;
 const char *ramdisk;