diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-12-07 11:33:45 +0000 |
| commit | 10f6cf6eef0a7da7dad1933efdbfb101155792d0 (patch) | |
| tree | d8ee3bfc6e55e739e0f135cd6d945955c670dd46 /core/isolinux.asm | |
| parent | 35928ee37da523e5f992cc462a4a4193d0bfaa4c (diff) | |
| parent | ddb10ce99c327888ade4d2ba3e4c50ad12aaa059 (diff) | |
| download | syslinux-10f6cf6eef0a7da7dad1933efdbfb101155792d0.tar.gz | |
Merge tag 'syslinux-5.00' into firmwaresyslinux-6.00-pre3
Conflicts:
Makefile
com32/elflink/ldlinux/Makefile
com32/lib/sys/module/elf_module.c
core/cleanup.c
core/comboot.inc
core/conio.c
core/fs/fs.c
core/init.c
core/mem/free.c
core/mem/malloc.c
core/timer.inc
diag/geodsp/Makefile
extlinux/main.c
mk/embedded.mk
modules/Makefile
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/isolinux.asm')
| -rw-r--r-- | core/isolinux.asm | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm index 39e5e5c5..673134b0 100644 --- a/core/isolinux.asm +++ b/core/isolinux.asm @@ -68,6 +68,7 @@ trackbuf resb trackbufsize ; Track buffer goes here ; Some of these are touched before the whole image ; is loaded. DO NOT move this to .bss16/.uibss. section .earlybss + global BIOSName alignb 4 FirstSecSum resd 1 ; Checksum of bytes 64-2048 ImageDwords resd 1 ; isolinux.bin size, dwords @@ -1207,24 +1208,15 @@ debug_tracer: pushad %endif ; DEBUG_TRACERS section .bss16 - global CmdOptPtr, KbdMap alignb 4 ThisKbdTo resd 1 ; Temporary holder for KbdTimeout ThisTotalTo resd 1 ; Temporary holder for TotalTimeout KernelExtPtr resw 1 ; During search, final null pointer -CmdOptPtr resw 1 ; Pointer to first option on cmd line -KbdFlags resb 1 ; Check for keyboard escapes FuncFlag resb 1 ; Escape sequences received from keyboard KernelType resb 1 ; Kernel type, from vkernel, if known -KbdMap resb 256 ; Keyboard map global KernelName KernelName resb FILENAME_MAX ; Mangled name for kernel - section .config - global PXERetry -PXERetry dw 0 ; Extra PXE retries section .data16 - global SerialNotice -SerialNotice db 1 ; Only print this once global IPAppends, numIPAppends %if IS_PXELINUX extern IPOption |