[syslinux:pathbased] pxelinux: remove USE_PXE_PROVIDED_STACK

[syslinux-bot for H. Peter Anvin]

Commit-ID:  bb18754c78f2e39331d04b02580695e65db83bb5
Gitweb:     http://syslinux.zytor.com/commit/bb18754c78f2e39331d04b02580695e65db83bb5
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Sun, 14 Feb 2010 15:02:42 -0800
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Sun, 14 Feb 2010 15:02:42 -0800

pxelinux: remove USE_PXE_PROVIDED_STACK

Remove USE_PXE_PROVIDED_STACK once and for all.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>


---
 core/pxelinux.asm |   26 ++++++--------------------
 1 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index c04da8e..a966a39 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -36,11 +36,6 @@ REBOOT_TIME	equ 5*60		; If failure, time until full reset
 TFTP_BLOCKSIZE_LG2 equ 9		; log2(bytes/block)
 TFTP_BLOCKSIZE	equ (1 << TFTP_BLOCKSIZE_LG2)
 
-;
-; Set to 1 to disable switching to a private stack
-;
-%assign USE_PXE_PROVIDED_STACK 0	; Use stack provided by PXE?
-
 SECTOR_SHIFT	equ TFTP_BLOCKSIZE_LG2
 SECTOR_SIZE	equ TFTP_BLOCKSIZE
 
@@ -169,13 +164,6 @@ _start1:
 		mov [InitStack],sp
 		mov [InitStack+2],ss
 
-%if USE_PXE_PROVIDED_STACK
-		; Apparently some platforms go bonkers if we
-		; set up our own stack...
-		mov [BaseStack],sp
-		mov [BaseStack+4],ss
-%endif
-
 		lss esp,[BaseStack]
 		sti			; Stack set up and ready
 ;
@@ -382,11 +370,11 @@ kaboom:
 pxenv:
 		pushfd
 		pushad
-%if USE_PXE_PROVIDED_STACK == 0
+
 		mov [cs:PXEStack],sp
 		mov [cs:PXEStack+2],ss
 		lss sp,[cs:InitStack]
-%endif
+
 		; Pre-clear the Status field
 		mov word [es:di],cs
 
@@ -399,9 +387,9 @@ pxenv:
 .jump:		call 0:0
 		add sp,6
 		mov [cs:PXEStatus],ax
-%if USE_PXE_PROVIDED_STACK == 0
+
 		lss sp,[cs:PXEStack]
-%endif
+
 		mov bp,sp
 		and ax,ax
 		setnz [bp+32]			; If AX != 0 set CF on return
@@ -428,15 +416,13 @@ PXEStatus	resb 2
 ;
                 global pxe_int1a
 pxe_int1a:
-%if USE_PXE_PROVIDED_STACK == 0
 		mov [cs:PXEStack],sp
 		mov [cs:PXEStack+2],ss
 		lss sp,[cs:InitStack]
-%endif
+
 		int 1Ah			; May trash registers
-%if USE_PXE_PROVIDED_STACK == 0
+
 		lss sp,[cs:PXEStack]
-%endif
 		ret
 
 ;