diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-02-25 15:25:16 +0000 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-02-26 11:29:04 +0000 |
commit | 76da2ae050d72a31fd47c2fb53f7081781de62ff (patch) | |
tree | 6da146b5f19ca17ff24d4e74940f14264d38f914 /core/isolinux.asm | |
parent | 41c29c26d70fde563d7c255872bbadad87a39dfa (diff) | |
parent | 79312306de0150ef64213ef9fbc5aa8580544f03 (diff) | |
download | syslinux-76da2ae050d72a31fd47c2fb53f7081781de62ff.tar.gz |
Merge branch 'lwip' into elflink
Welcome to Syslinux 5.10.
Conflicts:
NEWS
com32/lib/Makefile
com32/lib/sys/open.c
com32/lib/syslinux/ipappend.c
com32/modules/Makefile
com32/modules/prdhcp.c
core/Makefile
core/cmdline.inc
core/com32.inc
core/comboot.inc
core/configinit.inc
core/fs/chdir.c
core/fs/fs.c
core/fs/pxe/dnsresolv.c
core/fs/pxe/pxe.c
core/fs/pxe/pxe.h
core/idle.c
core/include/ctype.h
core/init.inc
core/mem/init.c
core/parseconfig.inc
core/runkernel.inc
core/syslinux.ld
core/ui.inc
doc/comboot.txt
version
Diffstat (limited to 'core/isolinux.asm')
-rw-r--r-- | core/isolinux.asm | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm index b292d8f9..b494eb4d 100644 --- a/core/isolinux.asm +++ b/core/isolinux.asm @@ -35,23 +35,6 @@ SECTOR_SIZE equ (1 << SECTOR_SHIFT) ROOT_DIR_WORD equ 0x002F -; -; The following structure is used for "virtual kernels"; i.e. LILO-style -; option labels. The options we permit here are `kernel' and `append -; Since there is no room in the bottom 64K for all of these, we -; stick them in high memory and copy them down before we need them. -; - struc vkernel -vk_vname: resb FILENAME_MAX ; Virtual name **MUST BE FIRST!** -vk_rname: resb FILENAME_MAX ; Real name -vk_appendlen: resw 1 -vk_type: resb 1 ; Type of file - alignb 4 -vk_append: resb max_cmd_len+1 ; Command line - alignb 4 -vk_end: equ $ ; Should be <= vk_size - endstruc - ; --------------------------------------------------------------------------- ; BEGIN CODE ; --------------------------------------------------------------------------- @@ -1213,17 +1196,6 @@ FuncFlag resb 1 ; Escape sequences received from keyboard KernelType resb 1 ; Kernel type, from vkernel, if known global KernelName KernelName resb FILENAME_MAX ; Mangled name for kernel - section .data16 - global IPAppends, numIPAppends -%if IS_PXELINUX - extern IPOption - alignz 2 -IPAppends dw IPOption -numIPAppends equ ($-IPAppends)/2 -%else -IPAppends equ 0 -numIPAppends equ 0 -%endif section .text16 ; |