aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2010-07-12 14:45:25 +0800
committerFeng Tang <feng.tang@intel.com>2010-07-20 11:10:04 +0800
commit8a3653b8a47c87db6cf2178af7a5470895d4c45c (patch)
tree6a2f09f417a068e3eb425078539b76541d240903
parent0b6c1cd6e2434310b225525301f5878e4754b56c (diff)
downloadsyslinux-8a3653b8a47c87db6cf2178af7a5470895d4c45c.tar.gz
syslinux-8a3653b8a47c87db6cf2178af7a5470895d4c45c.tar.xz
syslinux-8a3653b8a47c87db6cf2178af7a5470895d4c45c.zip
elflink: small modification
-rw-r--r--core/elflink/kernel.c6
-rw-r--r--core/elflink/load_env32.c9
2 files changed, 1 insertions, 14 deletions
diff --git a/core/elflink/kernel.c b/core/elflink/kernel.c
index f8efa168..2e63df66 100644
--- a/core/elflink/kernel.c
+++ b/core/elflink/kernel.c
@@ -22,12 +22,6 @@ int new_linux_kernel(char *okernel, char *ocmdline)
char cmdline_buf[256], *cmdline;
int i;
- /* to make malloc works for code in com32/lib */
- /*
- openconsole(&dev_null_r, &dev_stdcon_w);
- init_memory_arena();
- */
-
mp("okernel = %s, ocmdline = %s", okernel, ocmdline);
cmdline = cmdline_buf;
diff --git a/core/elflink/load_env32.c b/core/elflink/load_env32.c
index b153281d..8d0a5574 100644
--- a/core/elflink/load_env32.c
+++ b/core/elflink/load_env32.c
@@ -95,9 +95,8 @@ void start_ui(char *config_file)
mp("enter, config file = %s", config_file);
parse_configs(argv);
+
/* run the default menu if found */
- /*
- */
if (default_menu) {
cmdline = default_menu->menu_entries[default_menu->defentry]->cmdline;
if (*cmdline == '.') {
@@ -106,12 +105,6 @@ void start_ui(char *config_file)
process_command(cmdline);
}
- /* try to run a default linux kernel */
- /*
- if (append || globaldefault)
- new_linux_kernel(NULL, NULL);
- */
-
/* Should never return */
enter_cmdline();
}