aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:51:32 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:51:32 +0100
commit59b801792c05d7b7f95b72c76924bb6e03321545 (patch)
treefc9de0de82efce21f09ff90d4de2d8015f9fb408
parent230b92c14f50eca6082dffdf87b8b06351e03821 (diff)
parentb00ccfcd70999291ed74d346c744b30e0f2fa999 (diff)
downloadsyslinux-59b801792c05d7b7f95b72c76924bb6e03321545.tar.gz
syslinux-59b801792c05d7b7f95b72c76924bb6e03321545.tar.xz
syslinux-59b801792c05d7b7f95b72c76924bb6e03321545.zip
Merge branch 'for-hpa/elflink/core' into elflink
-rw-r--r--core/diskfs.inc26
1 files changed, 3 insertions, 23 deletions
diff --git a/core/diskfs.inc b/core/diskfs.inc
index ded89b55..470aa429 100644
--- a/core/diskfs.inc
+++ b/core/diskfs.inc
@@ -84,31 +84,11 @@ trackbuf resb trackbufsize ; Track buffer goes here
stosw
;
-; Now we're all set to start with our *real* business. First load the
-; configuration file (if any) and parse it.
-;
-; In previous versions I avoided using 32-bit registers because of a
-; rumour some BIOSes clobbered the upper half of 32-bit registers at
-; random. I figure, though, that if there are any of those still left
-; they probably won't be trying to install Linux on them...
-;
-; The code is still ripe with 16-bitisms, though. Not worth the hassle
-; to take'm out. In fact, we may want to put them back if we're going
-; to boot ELKS at some point.
+; If we get to this point ldlinux.c32 failed to run. There's nothing
+; left to do but inform that user that something went wrong.
;
+ jmp kaboom
-;
-; Load configuration file
-;
- ;feng
- ;pm_call pm_load_config
- ;jz no_config_file
-
-;
-; Now we have the config file open. Parse the config file and
-; run the user interface.
-;
- pm_call hello
%include "ui.inc"
;