diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-03-06 17:10:32 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-03-06 17:10:32 +0000 |
| commit | 4153b9005c460e02d36c457367a045444812bb97 (patch) | |
| tree | d6f41a24f4f58d0c85725f61aea0e5deba6d21cd /core/isolinux.asm | |
| parent | 12eafad11c9c68c979309087d71f1c76e3f1c4b9 (diff) | |
| parent | 16aa878d78086e9bc1c1f1053dc24da295f81e05 (diff) | |
| download | syslinux-5.10-pre1.tar.gz | |
Merge branch 'lwip-merge' into elflinksyslinux-5.10-pre1
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 ; |