summaryrefslogtreecommitdiff
path: root/core/layout.inc
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-21 15:42:03 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-21 15:42:03 -0800
commitced4ec389bd2d915f3e00e41736737279fba89ec (patch)
treec8d297c43ade26a3d60ca4bb16d6b0abd0f5d974 /core/layout.inc
parent8f652f110068ed20dd84bdc46233d803bc4150be (diff)
downloadsyslinux-ced4ec389bd2d915f3e00e41736737279fba89ec.tar.gz
core: let xfer_buf_seg, real_mode_seg be assigned by the linker
Use the linker to assign xfer_bug_seg and real_mode_seg. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/layout.inc')
-rw-r--r--core/layout.inc25
1 files changed, 17 insertions, 8 deletions
diff --git a/core/layout.inc b/core/layout.inc
index baf45b92..b769832f 100644
--- a/core/layout.inc
+++ b/core/layout.inc
@@ -115,13 +115,6 @@ RBFG_brainfuck: resb 2048 ; Bigger than an Ethernet packet...
; Keep the low-memory footprint as small as possible... overrun is a hard
; failure!
;
-; 0000h - main code/data segment (and BIOS segment)
-;
-; This stuff really should come from the linker...
-;
- global xfer_buf_seg, core_xfer_buf
-xfer_buf_seg equ 2000h
-core_xfer_buf equ xfer_buf_seg << 4
serial_buf_size equ 4096 ; Should be a power of 2
@@ -141,8 +134,24 @@ serial_buf_size equ 4096 ; Should be a power of 2
auxseg resb aux_size
;
+; Transfer buffer segment: guaranteed to be aligned 64K, used for disk I/O
+; One symbol for the segment number, one for the absolute address
+;
+ extern xfer_buf_seg
+ section .xfer_buf write nobits align=65536
+ global core_xfer_buf
+core_xfer_buf resb 65536
+
+;
; Segment for the real mode code (needed as long as we have a in-kernel
; loader and/or COM16 support.
+; One symbol for the segment number, one for the absolute address
;
-real_mode_seg equ xfer_buf_seg + 1000h
+ extern real_mode_seg
+ section .real_mode write nobits align=65536
+ global core_real_mode
+core_real_mode resb 65536
+
comboot_seg equ real_mode_seg ; COMBOOT image loading zone
+
+ section .text16