diff options
| author | Michael Brown | 2009-09-18 05:38:06 +0200 |
|---|---|---|
| committer | Michael Brown | 2012-07-09 16:41:38 +0200 |
| commit | 6022260a96d4e59321a8499fb54805fec0de5018 (patch) | |
| tree | f6636957a13482806944799c2cfde8eba3c7f615 /main.c | |
| parent | [import] Import version 2.01 (diff) | |
| download | memtest86-6022260a96d4e59321a8499fb54805fec0de5018.tar.gz memtest86-6022260a96d4e59321a8499fb54805fec0de5018.tar.xz memtest86-6022260a96d4e59321a8499fb54805fec0de5018.zip | |
[import] Import version 2.10
http://www.memtest.org/download/2.10/memtest86+-2.10.tar.gz
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -5,7 +5,7 @@ * ---------------------------------------------------- * MemTest86+ V2.01 Specific code (GPL V2.0) * By Samuel DEMEULEMEESTER, sdemeule@memtest.org - * http://www.canardplus.com - http://www.memtest.org + * http://www.canardpc.com - http://www.memtest.org */ #include "test.h" @@ -222,6 +222,16 @@ void do_test(void) if ((ulong)&_start > LOW_TEST_ADR) { /* Relocated so we need to test all selected lower memory */ v->map[0].start = mapping(v->plim_lower); + +#ifdef USB_WAR + /* We must not touch test below 0x500 memory beacuase + * BIOS USB support clobbers location 0x410 and 0x4e0 + */ + if ((ulong)v->map[0].start < 0x500) { + v->map[0].start = (ulong*)0x500; + } +#endif + cprint(LINE_RANGE, COL_MID+28, " Relocated"); } else { cprint(LINE_RANGE, COL_MID+28, " "); |