summaryrefslogtreecommitdiff
path: root/core/init.inc
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-02-16 12:12:50 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-03-23 16:34:41 +0000
commit51529126e71d1a2b451c6e809567e1ebd3788aa6 (patch)
tree319e50d828ff053e7e769787516544573149474b /core/init.inc
parent43499c9dc347ee858e9e395eba0954ec52a410ef (diff)
downloadsyslinux-51529126e71d1a2b451c6e809567e1ebd3788aa6.tar.gz
core: Delete the aux segment
We don't need to use a special aux segment because we can represent 'fontbuf' with OFFS() and SEG(). We're guaranteed to be able to break the 32-bit pointer up with these macros because we control where in the address space the core is loaded. (Not all 32-bit pointers can be represented with OFFS() and SEG(), only addresses in the range 0..0xFFFFF.) This fixes the breakage that was introduced in commit 14531c47bc95 ("core: Delete code that is duplicated in ldlinux"). This allows the default font to be displayed. Previously junk was being returned in the COMBOOT API call to query the userfont, leading the caller to believe that a user font was installed even when it wasn't. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/init.inc')
-rw-r--r--core/init.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/init.inc b/core/init.inc
index 286b3803..e0ffd23e 100644
--- a/core/init.inc
+++ b/core/init.inc
@@ -63,7 +63,7 @@ pm_decompress:
mov edi,__bss16_start
mov ecx,__bss16_dwords
rep stosd
- mov edi,__high_clear_start ; .uibss, .auxseg, .lowmem
+ mov edi,__high_clear_start ; .uibss, .lowmem
mov ecx,__high_clear_dwords
rep stosd