diff options
| author | Sebastian Herbszt <herbszt@gmx.de> | 2010-07-27 22:32:54 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-12-16 19:37:49 -0800 |
| commit | 33cef16bfdef4576be2b538506b4f8a61bf9c0a2 (patch) | |
| tree | 2b80804a710a68b8c5a793ac067b90de8ca8167f /core | |
| parent | ac7b5736554bcdf5ba06ac637d1028dd7ddc25db (diff) | |
| download | syslinux-33cef16bfdef4576be2b538506b4f8a61bf9c0a2.tar.gz | |
core: remove HAS_LOCALBOOT
HAS_LOCALBOOT is set unconditionally in config.inc.
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/comboot.inc | 4 | ||||
| -rw-r--r-- | core/config.inc | 5 | ||||
| -rw-r--r-- | core/keywords.inc | 2 | ||||
| -rw-r--r-- | core/localboot.inc | 3 | ||||
| -rw-r--r-- | core/parseconfig.inc | 4 | ||||
| -rw-r--r-- | core/ui.inc | 2 |
6 files changed, 0 insertions, 20 deletions
diff --git a/core/comboot.inc b/core/comboot.inc index 59db7ec1..d6f670c9 100644 --- a/core/comboot.inc +++ b/core/comboot.inc @@ -723,13 +723,9 @@ comapi_idle: ; ; INT 22h AX=0014h Local boot ; -%if HAS_LOCALBOOT comapi_localboot: mov ax,P_DX jmp local_boot -%else -comapi_localboot equ comapi_err -%endif ; HAS_LOCALBOOT ; ; INT 22h AX=0015h Feature flags diff --git a/core/config.inc b/core/config.inc index 269e13ec..999d3d91 100644 --- a/core/config.inc +++ b/core/config.inc @@ -27,11 +27,6 @@ BAUD_DIVISOR equ 115200 ; Serial port parameter MAX_FKEYS equ 12 ; Number of F-key help files ; -; Local boot supported -; -%assign HAS_LOCALBOOT 1 - -; ; log2(Max filename size Including final null) ; FILENAME_MAX_LG2 equ 8 diff --git a/core/keywords.inc b/core/keywords.inc index 7f1404e9..08d77c64 100644 --- a/core/keywords.inc +++ b/core/keywords.inc @@ -95,8 +95,6 @@ keywd_table: %if IS_PXELINUX keyword ipappend, pc_ipappend %endif -%if HAS_LOCALBOOT keyword localboot, pc_localboot -%endif keywd_count equ ($-keywd_table)/keywd_size diff --git a/core/localboot.inc b/core/localboot.inc index a66cf206..1fe3102d 100644 --- a/core/localboot.inc +++ b/core/localboot.inc @@ -16,8 +16,6 @@ ; Boot from a local disk, or invoke INT 18h. ; -%if HAS_LOCALBOOT - ; ; Boot a specified local disk. AX specifies the BIOS disk number; or ; -1 in case we should execute INT 18h ("next device.") @@ -73,4 +71,3 @@ localboot_msg db 'Booting from local disk...', CR, LF, 0 section .text16 -%endif ; HAS_LOCALBOOT diff --git a/core/parseconfig.inc b/core/parseconfig.inc index 69681d94..512f16b4 100644 --- a/core/parseconfig.inc +++ b/core/parseconfig.inc @@ -85,8 +85,6 @@ pc_ipappend: call getint ; ; "localboot" command ; -%if HAS_LOCALBOOT - pc_localboot: call getint cmp byte [VKernel],0 ; ("label" section only) je .err @@ -94,8 +92,6 @@ pc_localboot: call getint mov byte [VKernelBuf+vk_type],VK_LOCALBOOT .err: ret -%endif ; HAS_LOCALBOOT - ; ; "kernel", "config", ... command ; diff --git a/core/ui.inc b/core/ui.inc index 2d44447d..0a4bb569 100644 --- a/core/ui.inc +++ b/core/ui.inc @@ -415,12 +415,10 @@ vk_check: mov al,[VKernelBuf+vk_type] mov [KernelType],al -%if HAS_LOCALBOOT ; Is this a "localboot" pseudo-kernel? cmp al,VK_LOCALBOOT ; al == KernelType mov ax,[VKernelBuf+vk_rname] ; Possible localboot type je local_boot -%endif jmp get_kernel .not_vk: |