[syslinux] [PATCH] core: remove HAS_LOCALBOOT

[Sebastian Herbszt]

HAS_LOCALBOOT is set unconditionally in config.inc.

Signed-off-by: Sebastian Herbszt <herbszt at gmx.de>

diff --git a/core/comboot.inc b/core/comboot.inc
index 59db7ec..d6f670c 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 269e13e..999d3d9 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 d0f7db3..bd482f2 100644
--- a/core/keywords.inc
+++ b/core/keywords.inc
@@ -94,8 +94,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 a66cf20..1fe3102 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 e7b3108..d2c5715 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 2d44447..0a4bb56 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: