diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 19:44:46 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 19:45:46 -0700 |
commit | f4f5faffaafb0fa41345df9c8d872b00208db21a (patch) | |
tree | 55b3dad7557e227637039919c2c3fbb6f4841e3a /core/layout.inc | |
parent | e22d7eeaf36c4150354cfe536045bb2ed5b17d83 (diff) | |
parent | 9d1cde418a4f0dc6cccf4af7eae340e75de2f3d4 (diff) | |
download | syslinux-f4f5faffaafb0fa41345df9c8d872b00208db21a.tar.gz |
Merge branch 'master' into core32
Conflicts:
core/bcopy32.inc
core/cleanup.inc
core/conio.inc
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/layout.inc')
-rw-r--r-- | core/layout.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/layout.inc b/core/layout.inc index b8103b8b..c096c6f8 100644 --- a/core/layout.inc +++ b/core/layout.inc @@ -97,6 +97,8 @@ RBFG_brainfuck: resb 2048 ; Bigger than an Ethernet packet... global xfer_buf_seg xfer_buf_seg equ 2000h +serial_buf_size equ 4096 ; Should be a power of 2 + ; ; Contents of aux_seg ; @@ -104,6 +106,8 @@ xfer_buf_seg equ 2000h struc aux .fontbuf resb 8192 +.serial resb serial_buf_size + alignb 4096 ; Align the next segment to 4K endstruc |