[syslinux:elflink] elflink: small modification
syslinux-bot for Feng Tang
feng.tang at intel.com
Thu Aug 12 21:03:41 PDT 2010
Commit-ID: 8a3653b8a47c87db6cf2178af7a5470895d4c45c
Gitweb: http://syslinux.zytor.com/commit/8a3653b8a47c87db6cf2178af7a5470895d4c45c
Author: Feng Tang <feng.tang at intel.com>
AuthorDate: Mon, 12 Jul 2010 14:45:25 +0800
Committer: Feng Tang <feng.tang at intel.com>
CommitDate: Tue, 20 Jul 2010 11:10:04 +0800
elflink: small modification
---
core/elflink/kernel.c | 6 ------
core/elflink/load_env32.c | 9 +--------
2 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/core/elflink/kernel.c b/core/elflink/kernel.c
index f8efa16..2e63df6 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 b153281..8d0a557 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();
}
More information about the Syslinux-commits
mailing list