Port the conventional memory relaxing from the 1.6x-1 branch.

diff --git a/NEWS b/NEWS
index 54a1b4e..4195a9b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ apply to that specific program only; other changes apply to both.
 
 Changes in 1.70:
        * Major code restructuring.
+       * Relax the conventional memory limits somewhat.
        * MEMDISK: Set up the "version number string" pointer in the
          header correctly.
         * SYSLINUX: Fix, again, "the bug that won't die": the use of

diff --git a/isolinux.asm b/isolinux.asm
index 5040c62..4f0ef22 100644 (file)
--- a/isolinux.asm
+++ b/isolinux.asm
@@ -970,10 +970,10 @@ not_386:
 is_386:
                ; Now we know it's a 386 or higher
 ;
-; Now check that there is at least 384K of low (DOS) memory
+; Now check that there is sufficient low (DOS) memory
 ;
                int 12h
-               cmp ax,384
+               cmp ax,(real_mode_seg+0xa00) >> 6
                jae enough_ram
                mov si,err_noram
                call writestr
@@ -4479,7 +4479,7 @@ err_not386        db 'It appears your computer uses a 286 or lower CPU.'
                db 'down the Ctrl key while booting, and I will take your'
                db CR, LF
                db 'word for it.', CR, LF, 0
-err_noram      db 'It appears your computer has less than 384K of low ("DOS")'
+err_noram      db 'It appears your computer has less than 360K of low ("DOS")'
                db 0Dh, 0Ah
                db 'RAM.  Linux needs at least this amount to boot.  If you get'
                db 0Dh, 0Ah

diff --git a/ldlinux.asm b/ldlinux.asm
index f6a1247..ad2b731 100644 (file)
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -1116,10 +1116,10 @@ not_386:
 is_386:
                ; Now we know it's a 386 or higher
 ;
-; Now check that there is at least 512K of low (DOS) memory
+; Now check that there is sufficient low (DOS) memory
 ;
                int 12h
-               cmp ax,512
+               cmp ax,(real_mode_seg+0xa00) >> 6
                jae enough_ram
                mov si,err_noram
                call writestr
@@ -4303,7 +4303,7 @@ err_not386        db 'It appears your computer uses a 286 or lower CPU.'
                db 'down the Ctrl key while booting, and I will take your'
                db CR, LF
                db 'word for it.', CR, LF, 0
-err_noram      db 'It appears your computer has less than 512K of low ("DOS")'
+err_noram      db 'It appears your computer has less than 488K of low ("DOS")'
                db CR, LF
                db 'RAM.  Linux needs at least this amount to boot.  If you get'
                db CR, LF

diff --git a/pxelinux.asm b/pxelinux.asm
index d1d670a..600eeab 100644 (file)
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -788,10 +788,10 @@ not_386:
 is_386:
                ; Now we know it's a 386 or higher
 ;
-; Now check that there is at least 384K of low (DOS) memory
+; Now check that there is sufficient low (DOS) memory
 ;
                int 12h
-               cmp ax,384
+               cmp ax,(real_mode_seg+0xa00) >> 6
                jae enough_ram
                mov si,err_noram
                call writestr

diff --git a/syslinux.doc b/syslinux.doc
index 6b56cef..bceca68 100644 (file)
--- a/syslinux.doc
+++ b/syslinux.doc
@@ -2,7 +2,7 @@
 
               A bootloader for Linux using MS-DOS floppies
 
-               Copyright (C) 1994-2001 H. Peter Anvin
+               Copyright (C) 1994-2002 H. Peter Anvin
 
 This program is provided under the terms of the GNU General Public
 License, version 2 or, at your option, any later version.  There is no