From 8f10ba6d251ac05b54f183cb98bf5310a0675338 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt.fleming@linux.intel.com>
Date: Thu, 14 Apr 2011 00:59:12 +0100
Subject: [PATCH] elflink: Delete core-elf.h

This header file really just duplicates code that is available in
other header files. It has no reason to exist.

Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
---
 com32/elflink/ldlinux/cli.c        |  1 -
 com32/elflink/ldlinux/colors.c     |  1 -
 com32/elflink/ldlinux/execute.c    |  7 +------
 com32/elflink/ldlinux/kernel.c     |  1 -
 com32/elflink/ldlinux/ldlinux.c    |  1 -
 com32/elflink/ldlinux/readconfig.c |  1 -
 core/elflink/core-elf.h            | 29 -----------------------------
 core/elflink/load_env32.c          |  1 -
 8 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 core/elflink/core-elf.h

diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c
index 3026cac..4749dda 100644
--- a/com32/elflink/ldlinux/cli.c
+++ b/com32/elflink/ldlinux/cli.c
@@ -12,7 +12,6 @@
 #include <linux/list.h>
 #include <sys/exec.h>
 #include <sys/module.h>
-#include <core-elf.h>
 #include <dprintf.h>
 
 #include "getkey.h"
diff --git a/com32/elflink/ldlinux/colors.c b/com32/elflink/ldlinux/colors.c
index c1ef390..68732bd 100644
--- a/com32/elflink/ldlinux/colors.c
+++ b/com32/elflink/ldlinux/colors.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <colortbl.h>
-#include <core-elf.h>
 #include "menu.h"
 
 /*
diff --git a/com32/elflink/ldlinux/execute.c b/com32/elflink/ldlinux/execute.c
index f67d707..a00a5b1 100644
--- a/com32/elflink/ldlinux/execute.c
+++ b/com32/elflink/ldlinux/execute.c
@@ -18,7 +18,7 @@
 #include <com32.h>
 #include <sys/exec.h>
 #include "core.h"
-#include "core-elf.h"
+#include "menu.h"
 
 /* Must match enum kernel_type */
 const char *const kernel_types[] = {
@@ -36,11 +36,6 @@ const char *const kernel_types[] = {
     NULL
 };
 
-static inline int my_isspace(char c)
-{
-    return (unsigned char)c <= ' ';
-}
-
 void execute(const char *cmdline, enum kernel_type type)
 {
 	const char *p, *const *pp;
diff --git a/com32/elflink/ldlinux/kernel.c b/com32/elflink/ldlinux/kernel.c
index 3ce2358..2438d11 100644
--- a/com32/elflink/ldlinux/kernel.c
+++ b/com32/elflink/ldlinux/kernel.c
@@ -8,7 +8,6 @@
 #include <syslinux/linux.h>
 #include <syslinux/pxe.h>
 #include "core.h"
-#include "core-elf.h"
 
 const char *globaldefault = NULL;
 const char *append = NULL;
diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c
index 5f4b058..9ba1aeb 100644
--- a/com32/elflink/ldlinux/ldlinux.c
+++ b/com32/elflink/ldlinux/ldlinux.c
@@ -2,7 +2,6 @@
 #include <sys/times.h>
 #include <stdbool.h>
 #include <core.h>
-#include <core-elf.h>
 #include "cli.h"
 #include "console.h"
 #include "com32.h"
diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c
index d78c015..441651e 100644
--- a/com32/elflink/ldlinux/readconfig.c
+++ b/com32/elflink/ldlinux/readconfig.c
@@ -22,7 +22,6 @@
 #include <com32.h>
 #include <syslinux/adv.h>
 #include <syslinux/config.h>
-#include <core-elf.h>
 #include <dprintf.h>
 
 #include "menu.h"
diff --git a/core/elflink/core-elf.h b/core/elflink/core-elf.h
deleted file mode 100644
index dcca900..0000000
--- a/core/elflink/core-elf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _CORE_ELF_H
-#define _coRE_ELF_H
-
-enum kernel_type {
-    /* Meta-types for internal use */
-    KT_NONE,
-    KT_LOCALBOOT,
-
-    /* The ones we can pass off to SYSLINUX, in order */
-    KT_KERNEL,			/* Undefined type */
-    KT_LINUX,			/* Linux kernel */
-    KT_BOOT,			/* Bootstrap program */
-    KT_BSS,			/* Boot sector with patch */
-    KT_PXE,			/* PXE NBP */
-    KT_FDIMAGE,			/* Floppy disk image */
-    KT_COMBOOT,			/* COMBOOT image */
-    KT_COM32,			/* COM32 image */
-    KT_CONFIG,			/* Configuration file */
-};
-
-extern const char *append;
-extern char *ippappend;
-extern const char *globaldefault;
-extern short onerrorlen;
-
-extern int new_linux_kernel(char *okernel, char *ocmdline);
-
-extern void start_ui(char *config_file);
-#endif
diff --git a/core/elflink/load_env32.c b/core/elflink/load_env32.c
index 8a71634..16b21a6 100644
--- a/core/elflink/load_env32.c
+++ b/core/elflink/load_env32.c
@@ -16,7 +16,6 @@
 #include <sys/module.h>
 #include "common.h"
 #include "menu.h"
-#include "core-elf.h"
 
 #define LDLINUX	"ldlinux.c32"
 
-- 
2.7.4