aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-10-31 14:17:49 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-01 12:33:09 +0000
commit77c1b364a530e51287f274a90b0744436c3312e8 (patch)
tree90bd0e04a5651cbf03e5438f618f788f00043951
parentb210bd5bfd0d7182b0a65f507c7557eeb90d5b16 (diff)
downloadsyslinux-77c1b364a530e51287f274a90b0744436c3312e8.tar.gz
syslinux-77c1b364a530e51287f274a90b0744436c3312e8.tar.xz
syslinux-77c1b364a530e51287f274a90b0744436c3312e8.zip
pxe: Don't call open_config() from the pxe core
Delete some stale comments about ldlinux.c32 requiring ConfigName to be initialised before it's launched - this is no longer true. ldlinux.c32 takes care of opening the config files. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--core/pxelinux.asm13
1 files changed, 1 insertions, 12 deletions
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index ef9c7238..35c74088 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -192,8 +192,7 @@ ROOT_FS_OPS:
call reset_idle
;
-; Now we're all set to start with our *real* business. First load the
-; configuration file (if any) and parse it.
+; Now we're all set to start with our *real* business.
;
; In previous versions I avoided using 32-bit registers because of a
; rumour some BIOSes clobbered the upper half of 32-bit registers at
@@ -217,16 +216,6 @@ ROOT_FS_OPS:
%endmacro
;
-; Open configuration file. ldlinux.c32 needs ConfigName to be set - so we need
-; to call open_config() before loading it.
-;
-; Note: We don't need to check return value of open_config() function. It will
-; call kaboom() on failure.
-;
- extern open_config
- pm_call open_config
-
-;
; Jump to 32-bit ELF space
;
pm_call load_env32