ldlinux: Stop using the internal KT_* image types

The KT_* image types were never meant to be used outside of
com32/menu, so use the external image types from syslinux/boot.h

Signed-off-by: Matt Fleming <matt.fleming@intel.com>

2 files changed, 10 insertions, 7 deletions

diff --git a/com32/include/menu.h b/com32/include/menu.h
index a3e9cd62..5a4c901e 100644
--- a/com32/include/menu.h
+++ b/com32/include/menu.h
@@ -92,10 +92,6 @@ enum kernel_type {
     KT_CONFIG,			/* Configuration file */
 };
 
-extern const char *const kernel_types[];
-
-extern enum kernel_type parse_kernel_type(const char *kernel);
-
 /* Configurable integer parameters */
 enum parameter_number {
     P_WIDTH,
@@ -230,9 +226,6 @@ extern const int message_base_color;
 extern const char *current_background;
 void set_background(const char *new_background);
 
-/* execute.c */
-void execute(const char *cmdline, enum kernel_type type);
-
 /* drain.c */
 void drain_keyboard(void);
 
diff --git a/com32/include/syslinux/boot.h b/com32/include/syslinux/boot.h
index 870cff3f..aea32d9c 100644
--- a/com32/include/syslinux/boot.h
+++ b/com32/include/syslinux/boot.h
@@ -48,6 +48,13 @@ void syslinux_chain_bootstrap(uint16_t flags, const void *bootstrap,
 			      uint32_t bootstrap_len, uint32_t edx,
 			      uint32_t esi, uint16_t ds);
 
+struct image_types {
+    const char *name;
+    uint32_t type;
+};
+
+extern const struct image_types image_boot_types[];
+
 #define IMAGE_TYPE_KERNEL	0
 #define IMAGE_TYPE_LINUX	1
 #define IMAGE_TYPE_BOOT		2
@@ -57,6 +64,9 @@ void syslinux_chain_bootstrap(uint16_t flags, const void *bootstrap,
 #define IMAGE_TYPE_COMBOOT	6
 #define IMAGE_TYPE_COM32	7
 #define IMAGE_TYPE_CONFIG	8
+#define IMAGE_TYPE_LOCALBOOT	9
+
+uint32_t parse_image_type(const char *cmdline);
 void syslinux_run_kernel_image(const char *filename, const char *cmdline,
 			       uint32_t ipappend_flags, uint32_t type);