aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--com32/elflink/ldlinux/cli.c1
-rw-r--r--com32/elflink/ldlinux/colors.c1
-rw-r--r--com32/elflink/ldlinux/execute.c7
-rw-r--r--com32/elflink/ldlinux/kernel.c1
-rw-r--r--com32/elflink/ldlinux/ldlinux.c1
-rw-r--r--com32/elflink/ldlinux/readconfig.c1
-rw-r--r--core/elflink/core-elf.h29
-rw-r--r--core/elflink/load_env32.c1
8 files changed, 1 insertions, 41 deletions
diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c
index 3026cac2..4749ddad 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 c1ef3904..68732bdb 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 f67d707b..a00a5b16 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 3ce2358d..2438d116 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 5f4b058b..9ba1aeb4 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 d78c0151..441651ed 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 dcca9002..00000000
--- 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 8a71634d..16b21a60 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"