diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-03-20 17:14:21 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-03-22 13:57:44 +0000 |
| commit | 37d43cf9dd5dd2d2cef1e86aa651097473fd0b48 (patch) | |
| tree | 07a7df546f178c4e1576f4cbcc0bb4db3a8e18b4 /core/isolinux.asm | |
| parent | bf20364b582c383b4927f898de213b1cc0981a80 (diff) | |
| parent | a107cb3b6fa219cf5f65bef366c9b00b108e9a3a (diff) | |
| download | syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.tar.gz | |
Merge tag 'syslinux-5.10-pre2' into for-hpa/elflink/firmware
syslinux-5.10-pre2
Conflicts:
NEWS
com32/include/netinet/in.h
com32/include/sys/cpu.h
com32/lib/Makefile
core/Makefile
core/fs/diskio.c
core/fs/pxe/pxe.h
core/init.c
core/mem/free.c
core/mem/malloc.c
mk/devel.mk
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 b54beb4a..bd4e9556 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 ; --------------------------------------------------------------------------- @@ -1219,17 +1202,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 ; |