Merge lp:~lfaraone/ubuntu/maverick/memtest86+/4.10-1ubuntu1 into lp:ubuntu/maverick/memtest86+
- Maverick (10.10)
- 4.10-1ubuntu1
- Merge into maverick
Proposed by
Luke Faraone
Status: | Merged |
---|---|
Merge reported by: | Benjamin Drung |
Merged at revision: | not available |
Proposed branch: | lp:~lfaraone/ubuntu/maverick/memtest86+/4.10-1ubuntu1 |
Merge into: | lp:ubuntu/maverick/memtest86+ |
Diff against target: |
1868 lines (+1227/-88) 34 files modified
Makefile (+6/-1) README (+1/-1) changelog (+9/-17) controller.c (+269/-3) debian/README.Debian (+12/-6) debian/changelog (+59/-0) debian/config (+9/-0) debian/control (+6/-5) debian/copyright (+3/-2) debian/grub (+34/-12) debian/lintian-overrides (+3/-0) debian/po/POTFILES.in (+1/-0) debian/po/de.po (+37/-0) debian/po/es.po (+58/-0) debian/po/fr.po (+38/-0) debian/po/ja.po (+35/-0) debian/po/pt.po (+37/-0) debian/po/ru.po (+37/-0) debian/po/sv.po (+37/-0) debian/po/templates.pot (+32/-0) debian/postinst (+9/-12) debian/rules (+9/-1) debian/templates (+7/-0) head.S (+74/-1) init.c (+56/-11) lib.c (+3/-3) main.c (+11/-4) makeiso.sh (+3/-3) memsize.c (+1/-1) memtest.lds (+1/-1) mt86+_loader.asm (+2/-2) multiboot.c (+49/-0) multiboot.h (+259/-0) test.h (+20/-2) |
To merge this branch: | bzr merge lp:~lfaraone/ubuntu/maverick/memtest86+/4.10-1ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Sponsors | Pending | ||
Review via email: mp+28594@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' |
2 | --- Makefile 2009-11-09 17:09:57 +0000 |
3 | +++ Makefile 2010-06-27 17:51:29 +0000 |
4 | @@ -13,9 +13,14 @@ |
5 | |
6 | CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector |
7 | |
8 | +# This reverts a change introduced with recent binutils (post |
9 | +# http://sourceware.org/bugzilla/show_bug.cgi?id=10569). Needed to |
10 | +# ensure Multiboot header is within the limit offset. |
11 | +LD += -z max-page-size=0x1000 |
12 | + |
13 | OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ |
14 | config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \ |
15 | - error.o dmi.o cpuid.o |
16 | + error.o dmi.o cpuid.o multiboot.o |
17 | |
18 | all: memtest.bin memtest |
19 | |
20 | |
21 | === modified file 'README' |
22 | --- README 2009-09-29 23:40:15 +0000 |
23 | +++ README 2010-06-27 17:51:29 +0000 |
24 | @@ -1,4 +1,4 @@ |
25 | -Memtest86++ v4.00 |
26 | +Memtest86++ v4.10 |
27 | ==================== |
28 | |
29 | Table of Contents |
30 | |
31 | === modified file 'changelog' |
32 | --- changelog 2009-11-09 17:09:57 +0000 |
33 | +++ changelog 2010-06-27 17:51:29 +0000 |
34 | @@ -1,19 +1,11 @@ |
35 | -Memtest86+ V4.00 changelog |
36 | +Memtest86+ V4.10 changelog |
37 | -------------------------- |
38 | |
39 | - - Major Architectural changes |
40 | - - First pass twice faster (reduced iterations) |
41 | - - Detect DDR2/3 brands and part numbers |
42 | - - Corrected detection for Intel "Lynnfield" CPU |
43 | - - Added detection for Intel "Clarkdale" CPU |
44 | - - Added detection for Intel "Gulftown" CPU |
45 | - - Corrected detection for AMD 45nm K10 CPU |
46 | - - Added detection for AMD "Magny-Cours" CPU |
47 | - - Solved crash with AMD Geode LX |
48 | - - Added detection for Intel XMP Memory |
49 | - - Added for CPU w/ 0.5/1.5/3/6/12/16/18/24MB L3 |
50 | - - Added "clean" DMI detection for DDR3/FBDIMM2 |
51 | - - Better detection of Integrated Memory Ctrl |
52 | - - Complies with SMBIOS 2.6.1 specs |
53 | - - Fixed compilation issues with gcc 4.2+ |
54 | - - Many others bug fixes |
55 | + - Added support for Core i7 Extreme CPU (32nm) |
56 | + - Added support for Core i5/i3 (32 nm) |
57 | + - Added support for Pentium Gxxxx (32 mn) |
58 | + - Added support for Westmere-based Xeon |
59 | + - Added preliminary support for Intel Sandy Bridge |
60 | + - Added support for AMD 6-cores CPU |
61 | + - Added detection for Intel 3200/3210 |
62 | + - Many bug fixes |
63 | |
64 | === modified file 'controller.c' |
65 | --- controller.c 2009-11-09 17:09:57 +0000 |
66 | +++ controller.c 2010-06-27 17:51:29 +0000 |
67 | @@ -16,6 +16,7 @@ |
68 | #include "spd.h" |
69 | #include "test.h" |
70 | |
71 | + |
72 | int col, col2; |
73 | int nhm_bus = 0x3F; |
74 | |
75 | @@ -160,6 +161,8 @@ |
76 | col2 += 1; |
77 | } |
78 | |
79 | + |
80 | + |
81 | static void poll_fsb_nothing(void) |
82 | { |
83 | /* Code to run for no specific fsb detection */ |
84 | @@ -187,6 +190,23 @@ |
85 | return; |
86 | } |
87 | |
88 | +static void setup_wmr(void) |
89 | +{ |
90 | + |
91 | + // Activate MMR I/O |
92 | + ulong dev0; |
93 | + ctrl.cap = ECC_CORRECT; |
94 | + |
95 | + pci_conf_read( 0, 0, 0, 0x48, 4, &dev0); |
96 | + if (!(dev0 & 0x1)) { |
97 | + pci_conf_write( 0, 0, 0, 0x48, 1, dev0 | 1); |
98 | + } |
99 | + |
100 | + ctrl.mode = ECC_NONE; |
101 | + |
102 | +} |
103 | + |
104 | + |
105 | static void setup_nhm(void) |
106 | { |
107 | static float possible_nhm_bus[] = {0xFF, 0x7F, 0x3F}; |
108 | @@ -204,7 +224,7 @@ |
109 | pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); |
110 | vid &= 0xFFFF; |
111 | did &= 0xFF00; |
112 | - if(vid == 0x8086 && did == 0x2C00) { |
113 | + if(vid == 0x8086 && did >= 0x2C00) { |
114 | nhm_bus = possible_nhm_bus[i]; |
115 | } |
116 | } |
117 | @@ -223,6 +243,41 @@ |
118 | |
119 | } |
120 | |
121 | +static void setup_nhm32(void) |
122 | +{ |
123 | + static float possible_nhm_bus[] = {0xFF, 0x7F, 0x3F}; |
124 | + unsigned long did, vid, mc_control, mc_ssrcontrol; |
125 | + int i; |
126 | + |
127 | + //Nehalem supports Scrubbing */ |
128 | + ctrl.cap = ECC_SCRUB; |
129 | + ctrl.mode = ECC_NONE; |
130 | + |
131 | + /* First, locate the PCI bus where the MCH is located */ |
132 | + |
133 | + for(i = 0; i < sizeof(possible_nhm_bus); i++) { |
134 | + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); |
135 | + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); |
136 | + vid &= 0xFFFF; |
137 | + did &= 0xFF00; |
138 | + if(vid == 0x8086 && did >= 0x2C00) { |
139 | + nhm_bus = possible_nhm_bus[i]; |
140 | + } |
141 | +} |
142 | + |
143 | + /* Now, we have the last IMC bus number in nhm_bus */ |
144 | + /* Check for ECC & Scrub */ |
145 | + pci_conf_read(nhm_bus, 3, 0, 0x48, 2, &mc_control); |
146 | + if((mc_control >> 1) & 1) { |
147 | + ctrl.mode = ECC_CORRECT; |
148 | + pci_conf_read(nhm_bus, 3, 2, 0x48, 2, &mc_ssrcontrol); |
149 | + if(mc_ssrcontrol & 1) { |
150 | + ctrl.mode = ECC_SCRUB; |
151 | + } |
152 | + } |
153 | + |
154 | +} |
155 | + |
156 | static void setup_amd64(void) |
157 | { |
158 | |
159 | @@ -1175,6 +1230,58 @@ |
160 | return coef; |
161 | } |
162 | |
163 | + |
164 | +void getIntelPNS(void) |
165 | +{ |
166 | + int i,j; |
167 | + long psn_eax, psn_ebx, psn_ecx, psn_edx; |
168 | + long char_hex; |
169 | + long ocpuid = 0x80000002; |
170 | + |
171 | + for(j = 0; j < 4; j++) |
172 | + { |
173 | + |
174 | + asm __volatile__( |
175 | + "pushl %%ebx\n\t" \ |
176 | + "cpuid\n\t" \ |
177 | + "movl %%ebx, %1\n\t" \ |
178 | + "popl %%ebx\n\t" \ |
179 | + : "=a" (psn_eax), "=r" (psn_ebx), "=c" (psn_ecx), "=d" (psn_edx) |
180 | + : "a" (ocpuid) |
181 | + : "cc" |
182 | + ); |
183 | + |
184 | + |
185 | + for(i = 0; i < 4; i++) |
186 | + { |
187 | + char_hex = (psn_eax >> (i*8)) & 0xff; |
188 | + cprint(LINE_CPU+5, col + i, convert_hex_to_char(char_hex)); |
189 | + |
190 | + char_hex = (psn_ebx >> (i*8)) & 0xff; |
191 | + cprint(LINE_CPU+5, col + i + 4, convert_hex_to_char(char_hex)); |
192 | + |
193 | + if(psn_ecx != 0x20202020) |
194 | + { |
195 | + char_hex = (psn_ecx >> (i*8)) & 0xff; |
196 | + cprint(LINE_CPU+5, col + i + 8, convert_hex_to_char(char_hex)); |
197 | + |
198 | + char_hex = (psn_edx >> (i*8)) & 0xff; |
199 | + cprint(LINE_CPU+5, col + i + 12, convert_hex_to_char(char_hex)); |
200 | + } |
201 | + else |
202 | + { |
203 | + char_hex = (psn_edx >> (i*8)) & 0xff; |
204 | + cprint(LINE_CPU+5, col + i + 8, convert_hex_to_char(char_hex)); |
205 | + } |
206 | + } |
207 | + (psn_ecx != 0x20202020)?(col += 16):(col +=12); |
208 | + if(psn_edx == 0x20202020) { col -= 4; } |
209 | + ocpuid++; |
210 | + } |
211 | + |
212 | + col -= 16; |
213 | +} |
214 | + |
215 | static void poll_fsb_amd64(void) { |
216 | |
217 | unsigned int mcgsrl; |
218 | @@ -2092,6 +2199,98 @@ |
219 | |
220 | } |
221 | |
222 | +static void poll_fsb_nhm32(void) { |
223 | + |
224 | + double dramclock, dramratio, fsb; |
225 | + unsigned long mc_dimm_clk_ratio, qpi_pll_status; |
226 | + float coef = getNHMmultiplier(); |
227 | + float qpi_speed; |
228 | + |
229 | + fsb = ((extclock /1000) / coef); |
230 | + |
231 | + /* Print FSB */ |
232 | + cprint(LINE_CPU+5, col +1, "/ BCLK : "); |
233 | + col += 10; |
234 | + dprint(LINE_CPU+5, col, fsb, 3,0); |
235 | + col += 3; |
236 | + cprint(LINE_CPU+5, col +1, "MHz"); |
237 | + col += 4; |
238 | + |
239 | + /* Print QPI Speed (if ECC not supported) */ |
240 | + if(ctrl.mode == ECC_NONE && cpu_id.model == 12) { |
241 | + pci_conf_read(nhm_bus, 2, 1, 0x50, 2, &qpi_pll_status); |
242 | + qpi_speed = (qpi_pll_status & 0x7F) * ((extclock / 1000) / coef) * 2; |
243 | + cprint(LINE_CPU+5, col +1, "/ QPI : "); |
244 | + col += 9; |
245 | + dprint(LINE_CPU+5, col, qpi_speed/1000, 1,0); |
246 | + col += 1; |
247 | + cprint(LINE_CPU+5, col, "."); |
248 | + col += 1; |
249 | + qpi_speed = ((qpi_speed / 1000) - (int)(qpi_speed / 1000)) * 10; |
250 | + dprint(LINE_CPU+5, col, qpi_speed, 1,0); |
251 | + col += 1; |
252 | + cprint(LINE_CPU+5, col +1, "GT/s"); |
253 | + col += 5; |
254 | + } |
255 | + |
256 | + /* Get the clock ratio */ |
257 | + |
258 | + pci_conf_read(nhm_bus, 3, 4, 0x50, 2, &mc_dimm_clk_ratio); |
259 | + dramratio = (mc_dimm_clk_ratio & 0x1F); |
260 | + |
261 | + // Compute RAM Frequency |
262 | + fsb = ((extclock / 1000) / coef); |
263 | + dramclock = fsb * dramratio / 2; |
264 | + |
265 | + // Print DRAM Freq |
266 | + print_fsb_info(dramclock, "RAM : ", "DDR3-"); |
267 | + |
268 | +} |
269 | + |
270 | +static void poll_fsb_wmr(void) { |
271 | + |
272 | + double dramclock, dramratio, fsb; |
273 | + unsigned long dev0, mchcfg; |
274 | + float coef = getNHMmultiplier(); |
275 | + long *ptr; |
276 | + |
277 | + fsb = ((extclock / 1000) / coef); |
278 | + |
279 | + if(ctrl.mode == ECC_NONE) |
280 | + { |
281 | + col = 0; |
282 | + cprint(LINE_CPU+5, col, "IMC : "); col += 6; |
283 | + getIntelPNS(); |
284 | + //cprint(LINE_CPU+5, col, "(ECC : Disabled)"); |
285 | + //col += 16; |
286 | + } |
287 | + |
288 | + /* Print FSB */ |
289 | + cprint(LINE_CPU+5, col +1, "/ BCLK : "); |
290 | + col += 10; |
291 | + dprint(LINE_CPU+5, col, fsb, 3,0); |
292 | + col += 3; |
293 | + cprint(LINE_CPU+5, col +1, "MHz"); |
294 | + col += 4; |
295 | + |
296 | + /* Find dramratio */ |
297 | + pci_conf_read( 0, 0, 0, 0x48, 4, &dev0); |
298 | + dev0 &= 0xFFFFC000; |
299 | + ptr=(long*)(dev0+0x2C20); |
300 | + mchcfg = *ptr & 0xFFFF; |
301 | + dramratio = 1; |
302 | + |
303 | + /* Get the clock ratio */ |
304 | + dramratio = 0.25 * (float)(*ptr & 0x1F); |
305 | + |
306 | + // Compute RAM Frequency |
307 | + dramclock = fsb * dramratio; |
308 | + |
309 | + // Print DRAM Freq |
310 | + print_fsb_info(dramclock, "RAM : ", "DDR3-"); |
311 | + |
312 | +} |
313 | + |
314 | /* ------------------ Here the code for Timings detection ------------------ */ |
315 | /* ------------------------------------------------------------------------- */ |
316 | |
317 | @@ -2484,6 +2683,71 @@ |
318 | |
319 | } |
320 | |
321 | +static void poll_timings_wmr(void) { |
322 | + |
323 | + float cas; |
324 | + int rcd, rp, ras; |
325 | + ulong dev0, c0ckectrl, c1ckectrl, offset; |
326 | + ulong ODT_Control_Register, Precharge_Register, ACT_Register, Read_Register, MRC_Register; |
327 | + long *ptr; |
328 | + |
329 | + //Now, read MMR Base Address |
330 | + pci_conf_read( 0, 0, 0, 0x48, 4, &dev0); |
331 | + dev0 &= 0xFFFFC000; |
332 | + |
333 | + ptr = (long*)(dev0+0x260); |
334 | + c0ckectrl = *ptr & 0xFFFFFFFF; |
335 | + |
336 | + ptr = (long*)(dev0+0x660); |
337 | + c1ckectrl = *ptr & 0xFFFFFFFF; |
338 | + |
339 | + // If DIMM 0 not populated, check DIMM 1 |
340 | + ((c0ckectrl) >> 20 & 0xF)?(offset = 0):(offset = 0x400); |
341 | + |
342 | + ptr = (long*)(dev0+offset+0x265); |
343 | + ODT_Control_Register = *ptr & 0xFFFFFFFF; |
344 | + |
345 | + ptr = (long*)(dev0+offset+0x25D); |
346 | + Precharge_Register = *ptr & 0xFFFFFFFF; |
347 | + |
348 | + ptr = (long*)(dev0+offset+0x252); |
349 | + ACT_Register = *ptr & 0xFFFFFFFF; |
350 | + |
351 | + ptr = (long*)(dev0+offset+0x258); |
352 | + Read_Register = *ptr & 0xFFFFFFFF; |
353 | + |
354 | + ptr = (long*)(dev0+offset+0x240); |
355 | + MRC_Register = *ptr & 0xFFFFFFFF; |
356 | + |
357 | + // CAS Latency (tCAS) |
358 | + if(MRC_Register & 0xF) { |
359 | + cas = (MRC_Register & 0xF) + 3.0f; |
360 | + } else { |
361 | + cas = ((ODT_Control_Register >> 8)& 0x3F) - 5.0f; |
362 | + } |
363 | + |
364 | + // RAS-To-CAS (tRCD) |
365 | + rcd = (Read_Register >> 17) & 0xF; |
366 | + |
367 | + // RAS Precharge (tRP) |
368 | + rp = (ACT_Register >> 13) & 0xF; |
369 | + |
370 | + // RAS Active to precharge (tRAS) |
371 | + ras = Precharge_Register & 0x3F; |
372 | + |
373 | + print_timings_info(cas, rcd, rp, ras); |
374 | + |
375 | + cprint(LINE_CPU+6, col2+1, "/"); col2 +=2; |
376 | + |
377 | + if ((c0ckectrl >> 20 & 0xF) && (c1ckectrl >> 20 & 0xF)) { |
378 | + cprint(LINE_CPU+6, col2+1, "Dual Channel"); |
379 | + } else { |
380 | + cprint(LINE_CPU+6, col2+1, "Single Channel"); |
381 | + } |
382 | + |
383 | +} |
384 | + |
385 | + |
386 | static void poll_timings_5400(void) { |
387 | |
388 | // Thanks for CDH optis |
389 | @@ -2938,7 +3202,7 @@ |
390 | fvc_bn = 4; |
391 | } else if(mc_control & 2) { |
392 | fvc_bn = 5; |
393 | - } else if(mc_control & 7) { |
394 | + } else if(mc_control & 4) { |
395 | fvc_bn = 6; |
396 | } |
397 | |
398 | @@ -3098,6 +3362,7 @@ |
399 | { 0x8086, 0x29C0, "Intel P35/G33", 0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing}, |
400 | { 0x8086, 0x29D0, "Intel Q33", 0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing}, |
401 | { 0x8086, 0x29E0, "Intel X38/X48", 0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing}, |
402 | + { 0x8086, 0x29F0, "Intel 3200/3210", 0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing}, |
403 | { 0x8086, 0x2E10, "Intel Q45/Q43", 0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing}, |
404 | { 0x8086, 0x2E20, "Intel P45/G45", 0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing}, |
405 | { 0x8086, 0x2E30, "Intel G41", 0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing}, |
406 | @@ -3113,7 +3378,8 @@ |
407 | |
408 | /* Integrated Memory Controllers */ |
409 | { 0xFFFF, 0x0001, "Core IMC", 0, poll_fsb_nhm, poll_timings_nhm, setup_nhm, poll_nothing}, |
410 | - { 0xFFFF, 0x0002, "Core IMC2", 0, poll_fsb_nhm, poll_timings_nothing, setup_nhm, poll_nothing}, |
411 | + { 0xFFFF, 0x0002, "Core IMC 32nm", 0, poll_fsb_nhm32, poll_timings_nhm, setup_nhm32, poll_nothing}, |
412 | + { 0xFFFF, 0x0003, "Core IMC 32nm", 0, poll_fsb_wmr, poll_timings_wmr, setup_wmr, poll_nothing}, |
413 | { 0xFFFF, 0x0100, "AMD K8 IMC", 0, poll_fsb_amd64, poll_timings_amd64, setup_amd64, poll_amd64 }, |
414 | { 0xFFFF, 0x0101, "AMD K10 IMC", 0, poll_fsb_k10, poll_timings_k10, setup_k10, poll_nothing } |
415 | |
416 | |
417 | === modified file 'debian/README.Debian' |
418 | --- debian/README.Debian 2008-11-13 10:37:16 +0000 |
419 | +++ debian/README.Debian 2010-06-27 17:51:29 +0000 |
420 | @@ -1,12 +1,18 @@ |
421 | memtest86+ for Debian |
422 | --------------------- |
423 | |
424 | -Binary image is /boot/memtest86+.bin |
425 | - |
426 | -It is automatically registered against grub2. For other bootloaders |
427 | -you'll need to do some manual setup (see examples/grub-menu.lst for |
428 | -GRUB Legacy or examples/lilo.conf for LILO), or to make a boot-floppy, |
429 | -and reboot on this image. |
430 | +Two binary images are provided: |
431 | + |
432 | + - A legacy /boot/memtest86+.bin that uses Linux zImage boot |
433 | + protocol. |
434 | + |
435 | + - A Multiboot /boot/memtest86+_multiboot.bin image that follows the |
436 | + Multiboot specification. |
437 | + |
438 | +memtest86+_multiboot.bin is automatically registered against grub2. For |
439 | +other bootloaders you'll need to do some manual setup (see |
440 | +examples/grub-menu.lst for GRUB Legacy or examples/lilo.conf for LILO), |
441 | +or to make a boot-floppy, and reboot on this image. |
442 | |
443 | The make-memtest86+-boot-floppy utility will help you to create a |
444 | boot floppy or floppy image using GRUB Legacy. |
445 | |
446 | === modified file 'debian/changelog' |
447 | --- debian/changelog 2010-03-23 09:33:34 +0000 |
448 | +++ debian/changelog 2010-06-27 17:51:29 +0000 |
449 | @@ -1,3 +1,62 @@ |
450 | +memtest86+ (4.10-1ubuntu1) maverick; urgency=low |
451 | + |
452 | + * Merge from Debian unstable. (LP: #599070) Remaining changes: |
453 | + - Only run update-grub in the postrm on remove/purge. |
454 | + - Update maintainer field. |
455 | + |
456 | + -- Luke Faraone <luke@faraone.cc> Sun, 27 Jun 2010 12:54:15 -0400 |
457 | + |
458 | +memtest86+ (4.10-1) unstable; urgency=low |
459 | + |
460 | + * The "not yet source format 3.0" release. |
461 | + * New upstream release (Closes: #586727). |
462 | + * supports 64 e820 lines (Closes: #567165). |
463 | + * Acknowledge NMUs (Closes: #565642). |
464 | + * Don't emit grub2 menu items if /boot is on a loop-mounted device |
465 | + (Ubuntu, Closes: 574788). |
466 | + * Cache results of prepare_grub_to_access_device to speed up update-grub |
467 | + runs (Ubuntu, Closes: #570987). |
468 | + * Fix typo in package description (Robert Tomsick, Closes: #580147). |
469 | + * Suggest "grub-pc | grub-legacy" instead of old "grub2 | grub" (Closes: |
470 | + #568624). |
471 | + * Include es.po for po-debconf (Francisco Javier Cuadrado, Closes: |
472 | + #580953). |
473 | + * Provide boot entries for non-multiboot image, and tag the multiboot |
474 | + ones as experimental (mitigates #570499). |
475 | + * Install elf image again (was silently dropped in -2.2). |
476 | + * Bumped Standards-Version to 3.8.4, no change. |
477 | + |
478 | + -- Yann Dirson <dirson@debian.org> Sun, 27 Jun 2010 15:16:43 +0200 |
479 | + |
480 | +memtest86+ (4.00-2.3) unstable; urgency=low |
481 | + |
482 | + * Non-maintainer upload. |
483 | + * Check for grub.cfg in postinst. Closes: #550337 |
484 | + |
485 | + -- Michal Suchanek <hramrach@centrum.cz> Fri, 04 Jun 2010 13:50:53 +0200 |
486 | + |
487 | +memtest86+ (4.00-2.2) unstable; urgency=low |
488 | + |
489 | + * Non-maintainer upload. |
490 | + * Build an image with Multiboot support. (Closes: #250864) |
491 | + * Update de.po, fr.po, ja.po, pt.po, ru.po and sv.po. |
492 | + (Closes: #563019, #563288, #564291, #564430, #564470, #565169) |
493 | + * Fix in copyright line in debian/copyright to make lintian happy. |
494 | + |
495 | + -- Robert Millan <rmh.debian@aybabtu.com> Sun, 17 Jan 2010 17:06:16 +0100 |
496 | + |
497 | +memtest86+ (4.00-2.1) unstable; urgency=low |
498 | + |
499 | + * Non-maintainer upload. |
500 | + * Replace manual propt with debconf (Closes: #553292). |
501 | + * Fix ".: 4: Can't open /usr/lib/grub/grub-mkconfig_lib" by checking |
502 | + both grub files and also changing the linux/linux16 grub command based |
503 | + on which version we find (Closes: #550096) |
504 | + * Update suggests to a recent version of grub2 |
505 | + * Add a lintian override for statically-linked-binary (which is expected) |
506 | + |
507 | + -- Iustin Pop <iusty@k1024.org> Sun, 06 Dec 2009 12:20:39 +0100 |
508 | + |
509 | memtest86+ (4.00-2ubuntu3) lucid; urgency=low |
510 | |
511 | * Only run update-grub in the postrm on remove/purge. |
512 | |
513 | === added file 'debian/config' |
514 | --- debian/config 1970-01-01 00:00:00 +0000 |
515 | +++ debian/config 2010-06-27 17:51:29 +0000 |
516 | @@ -0,0 +1,9 @@ |
517 | +#!/bin/sh |
518 | + |
519 | +set -e |
520 | + |
521 | +. /usr/share/debconf/confmodule |
522 | +db_input medium shared/memtest86-run-lilo || true |
523 | +db_go || true |
524 | + |
525 | +#DEBHELPER# |
526 | |
527 | === modified file 'debian/control' |
528 | --- debian/control 2009-03-26 11:45:00 +0000 |
529 | +++ debian/control 2010-06-27 17:51:29 +0000 |
530 | @@ -1,16 +1,17 @@ |
531 | Source: memtest86+ |
532 | Section: misc |
533 | Priority: optional |
534 | -Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
535 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
536 | XSBC-Original-Maintainer: Yann Dirson <dirson@debian.org> |
537 | -Build-Depends: debhelper (>> 5.0.0), dh-buildinfo, gcc-multilib [amd64 kfreebsd-amd64] |
538 | +Build-Depends: debhelper (>> 5.0.0), dh-buildinfo, gcc-multilib [amd64 kfreebsd-amd64], |
539 | + po-debconf |
540 | Homepage: http://www.memtest.org/ |
541 | -Standards-Version: 3.8.0 |
542 | +Standards-Version: 3.8.4 |
543 | |
544 | Package: memtest86+ |
545 | Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 lpia hurd-i386 |
546 | Depends: ${misc:Depends} |
547 | -Suggests: hwtools, memtester, kernel-patch-badram, memtest86, grub2 (>=1.95+20070515-1) | grub (>= 0.95+cvs20040624), mtools |
548 | +Suggests: hwtools, memtester, kernel-patch-badram, memtest86, grub-pc | grub-legacy, mtools |
549 | Description: thorough real-mode memory tester |
550 | Memtest86+ scans your RAM for errors. |
551 | . |
552 | @@ -20,7 +21,7 @@ |
553 | but this one won't be able to test your whole RAM. |
554 | . |
555 | It can output a list of bad RAM regions usable by the BadRAM kernel |
556 | - patch, so that you can still use you old RAM with one or two bad bits. |
557 | + patch, so that you can still use your old RAM with one or two bad bits. |
558 | . |
559 | Memtest86+ is based on memtest86 3.0, and adds support for recent |
560 | hardware, as well as a number of general-purpose improvements, |
561 | |
562 | === modified file 'debian/copyright' |
563 | --- debian/copyright 2009-03-26 11:45:00 +0000 |
564 | +++ debian/copyright 2010-06-27 17:51:29 +0000 |
565 | @@ -2,8 +2,9 @@ |
566 | |
567 | It was downloaded from http://www.memtest.org/ |
568 | |
569 | -Upstream Author: Samuel Demeulemeester <memtest@memtest.org>, based on |
570 | -memtest86 by Chris Brady <cbrady@sgi.com>, and various contributors. |
571 | +Copyright (C) 2004,2005,2007,2009 by Samuel Demeulemeester |
572 | +<memtest@memtest.org>, based on memtest86 by Chris Brady |
573 | +<cbrady@sgi.com>, and various contributors. |
574 | |
575 | License: |
576 | |
577 | |
578 | === modified file 'debian/grub' |
579 | --- debian/grub 2010-02-22 16:06:06 +0000 |
580 | +++ debian/grub 2010-06-27 17:51:29 +0000 |
581 | @@ -1,37 +1,59 @@ |
582 | #!/bin/sh |
583 | set -e |
584 | |
585 | -# older versions of grub2 do not have this yet (LP: #459080) |
586 | -if [ ! -e /usr/lib/grub/grub-mkconfig_lib ]; then |
587 | - echo "no grub-mkconfig_lib, exiting" |
588 | - exit 0 |
589 | +if [ -f /usr/lib/grub/grub-mkconfig_lib ]; then |
590 | + . /usr/lib/grub/grub-mkconfig_lib |
591 | + LX=linux16 |
592 | +elif [ -f /usr/lib/grub/update-grub_lib ]; then |
593 | + . /usr/lib/grub/update-grub_lib |
594 | + LX=linux |
595 | +else |
596 | + # no grub file, so we notify and exit gracefully |
597 | + echo "Cannot find grub config file, exiting." >&2 |
598 | + exit 0 |
599 | fi |
600 | |
601 | -. /usr/lib/grub/grub-mkconfig_lib |
602 | - |
603 | # We can't cope with loop-mounted devices here. |
604 | case ${GRUB_DEVICE_BOOT} in |
605 | - /dev/loop/*|/dev/loop[0-9]) |
606 | - exit 0 |
607 | - ;; |
608 | + /dev/loop/*|/dev/loop[0-9]) exit 0 ;; |
609 | esac |
610 | |
611 | +prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" |
612 | + |
613 | if test -e /boot/memtest86+.bin ; then |
614 | MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" ) |
615 | echo "Found memtest86+ image: $MEMTESTPATH" >&2 |
616 | cat << EOF |
617 | menuentry "Memory test (memtest86+)" { |
618 | EOF |
619 | - prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" |
620 | printf '%s\n' "${prepare_boot_cache}" |
621 | cat << EOF |
622 | - linux16 $MEMTESTPATH |
623 | + $LX $MEMTESTPATH |
624 | } |
625 | menuentry "Memory test (memtest86+, serial console 115200)" { |
626 | EOF |
627 | printf '%s\n' "${prepare_boot_cache}" |
628 | cat << EOF |
629 | - linux16 $MEMTESTPATH console=ttyS0,115200n8 |
630 | + $LX $MEMTESTPATH console=ttyS0,115200n8 |
631 | +} |
632 | +EOF |
633 | +fi |
634 | + |
635 | +if test -e /boot/memtest86+_multiboot.bin ; then |
636 | + MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" ) |
637 | + echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&2 |
638 | + cat << EOF |
639 | +menuentry "Memory test (memtest86+, experimental multiboot)" { |
640 | +EOF |
641 | + printf '%s\n' "${prepare_boot_cache}" |
642 | + cat << EOF |
643 | + multiboot $MEMTESTPATH |
644 | +} |
645 | +menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" { |
646 | +EOF |
647 | + printf '%s\n' "${prepare_boot_cache}" |
648 | + cat << EOF |
649 | + multiboot $MEMTESTPATH console=ttyS0,115200n8 |
650 | } |
651 | EOF |
652 | fi |
653 | |
654 | === added file 'debian/lintian-overrides' |
655 | --- debian/lintian-overrides 1970-01-01 00:00:00 +0000 |
656 | +++ debian/lintian-overrides 2010-06-27 17:51:29 +0000 |
657 | @@ -0,0 +1,3 @@ |
658 | +# This file is intended to be statically-linked |
659 | +memtest86+: statically-linked-binary ./usr/lib/memtest86+/memtest86+.elf |
660 | +memtest86+: shared-lib-without-dependency-information ./boot/memtest86+_multiboot.bin |
661 | |
662 | === added directory 'debian/po' |
663 | === added file 'debian/po/POTFILES.in' |
664 | --- debian/po/POTFILES.in 1970-01-01 00:00:00 +0000 |
665 | +++ debian/po/POTFILES.in 2010-06-27 17:51:29 +0000 |
666 | @@ -0,0 +1,1 @@ |
667 | +[type: gettext/rfc822deb] templates |
668 | |
669 | === added file 'debian/po/de.po' |
670 | --- debian/po/de.po 1970-01-01 00:00:00 +0000 |
671 | +++ debian/po/de.po 2010-06-27 17:51:29 +0000 |
672 | @@ -0,0 +1,37 @@ |
673 | +# Translation of po-debconf template to German |
674 | +# This file is distributed under the same license as the memtest86+ package. |
675 | +# |
676 | +# Thomas Mueller <thomas.mueller@tmit.eu>, 2010. |
677 | +msgid "" |
678 | +msgstr "" |
679 | +"Project-Id-Version: memtest86+ 4.00\n" |
680 | +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" |
681 | +"POT-Creation-Date: 2009-12-02 22:23+0100\n" |
682 | +"PO-Revision-Date: 2010-01-01 19:47+0100\n" |
683 | +"Last-Translator: Thomas Mueller <thomas.mueller@tmit.eu>\n" |
684 | +"Language-Team: German <debian-l10n-german@lists.debian.org>\n" |
685 | +"Language: de\n" |
686 | +"MIME-Version: 1.0\n" |
687 | +"Content-Type: text/plain; charset=UTF-8\n" |
688 | +"Content-Transfer-Encoding: 8bit\n" |
689 | +"X-Generator: Lokalize 1.0\n" |
690 | +"Plural-Forms: nplurals=2; plural=n != 1;\n" |
691 | + |
692 | +#. Type: boolean |
693 | +#. Description |
694 | +#: ../templates:1001 |
695 | +msgid "Run lilo automatically after upgrade (if found)?" |
696 | +msgstr "" |
697 | +"Soll lilo nach dem Upgrade automatisch ausgeführt werden (falls vorhanden)?" |
698 | + |
699 | +#. Type: boolean |
700 | +#. Description |
701 | +#: ../templates:1001 |
702 | +msgid "" |
703 | +"If lilo is installed and its configuration file contains the memtest86/" |
704 | +"memtest86+ image, then it should be re-run in order to allow booting the new " |
705 | +"image." |
706 | +msgstr "" |
707 | +"Falls lilo installiert ist und dessen Konfigurationsdatei das memtest86/" |
708 | +"memtest86+-Image enthält, dann sollte es erneut ausgeführt werden, damit das " |
709 | +"Booten des neuen Images möglich ist." |
710 | |
711 | === added file 'debian/po/es.po' |
712 | --- debian/po/es.po 1970-01-01 00:00:00 +0000 |
713 | +++ debian/po/es.po 2010-06-27 17:51:29 +0000 |
714 | @@ -0,0 +1,58 @@ |
715 | +# memtest86+ po-debconf translation to Spanish |
716 | +# Copyright (C) 2010 Software in the Public Interest |
717 | +# This file is distributed under the same license as the memtest86+ package. |
718 | +# |
719 | +# Changes: |
720 | +# - Initial translation |
721 | +# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2010 |
722 | +# |
723 | +# Traductores, si no conocen el formato PO, merece la pena leer la |
724 | +# documentación de gettext, especialmente las secciones dedicadas a este |
725 | +# formato, por ejemplo ejecutando: |
726 | +# info -n '(gettext)PO Files' |
727 | +# info -n '(gettext)Header Entry' |
728 | +# |
729 | +# Equipo de traducción al español, por favor lean antes de traducir |
730 | +# los siguientes documentos: |
731 | +# |
732 | +# - El proyecto de traducción de Debian al español |
733 | +# http://www.debian.org/intl/spanish/ |
734 | +# especialmente las notas y normas de traducción en |
735 | +# http://www.debian.org/intl/spanish/notas |
736 | +# |
737 | +# - La guía de traducción de po's de debconf: |
738 | +# /usr/share/doc/po-debconf/README-trans |
739 | +# o http://www.debian.org/intl/l10n/po-debconf/README-trans |
740 | +# |
741 | +msgid "" |
742 | +msgstr "" |
743 | +"Project-Id-Version: memtest86+ 4.00-2.2\n" |
744 | +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" |
745 | +"POT-Creation-Date: 2009-12-02 22:23+0100\n" |
746 | +"PO-Revision-Date: 2010-04-28 10:10+0200\n" |
747 | +"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" |
748 | +"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" |
749 | +"Language: \n" |
750 | +"MIME-Version: 1.0\n" |
751 | +"Content-Type: text/plain; charset=UTF-8\n" |
752 | +"Content-Transfer-Encoding: 8bit\n" |
753 | + |
754 | +#. Type: boolean |
755 | +#. Description |
756 | +#: ../templates:1001 |
757 | +msgid "Run lilo automatically after upgrade (if found)?" |
758 | +msgstr "" |
759 | +"¿Desea ejecutar automáticamente lilo después de la actualización (si se " |
760 | +"encuentra)?" |
761 | + |
762 | +#. Type: boolean |
763 | +#. Description |
764 | +#: ../templates:1001 |
765 | +msgid "" |
766 | +"If lilo is installed and its configuration file contains the memtest86/" |
767 | +"memtest86+ image, then it should be re-run in order to allow booting the new " |
768 | +"image." |
769 | +msgstr "" |
770 | +"Si lilo está instalado y su archivo de configuración contiene la imagen de " |
771 | +"«memtest86»/«memtest86+» vuelva a ejecutar lilo para que pueda arrancar la " |
772 | +"nueva imagen." |
773 | |
774 | === added file 'debian/po/fr.po' |
775 | --- debian/po/fr.po 1970-01-01 00:00:00 +0000 |
776 | +++ debian/po/fr.po 2010-06-27 17:51:29 +0000 |
777 | @@ -0,0 +1,38 @@ |
778 | +# Translation of memtest86 debconf templates to French |
779 | +# Copyright (C) 2010 Debian French l10n team <debian-l10n-french@lists.debian.org> |
780 | +# This file is distributed under the same license as the memtest86 package. |
781 | +# |
782 | +# Translators: |
783 | +# Christian Perrier <bubulle@debian.org>, 2010. |
784 | +msgid "" |
785 | +msgstr "" |
786 | +"Project-Id-Version: \n" |
787 | +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" |
788 | +"POT-Creation-Date: 2009-12-02 22:23+0100\n" |
789 | +"PO-Revision-Date: 2010-01-02 18:44+0100\n" |
790 | +"Last-Translator: Christian Perrier <bubulle@debian.org>\n" |
791 | +"Language-Team: French <debian-l10n-french@lists.debian.org>\n" |
792 | +"Language: fr\n" |
793 | +"MIME-Version: 1.0\n" |
794 | +"Content-Type: text/plain; charset=UTF-8\n" |
795 | +"Content-Transfer-Encoding: 8bit\n" |
796 | +"X-Generator: Lokalize 1.0\n" |
797 | +"Plural-Forms: nplurals=2; plural=(n > 1);\n" |
798 | + |
799 | +#. Type: boolean |
800 | +#. Description |
801 | +#: ../templates:1001 |
802 | +msgid "Run lilo automatically after upgrade (if found)?" |
803 | +msgstr "Faut-il exécuter lilo automatiquement après la mise à jour ?" |
804 | + |
805 | +#. Type: boolean |
806 | +#. Description |
807 | +#: ../templates:1001 |
808 | +msgid "" |
809 | +"If lilo is installed and its configuration file contains the memtest86/" |
810 | +"memtest86+ image, then it should be re-run in order to allow booting the new " |
811 | +"image." |
812 | +msgstr "" |
813 | +"Si LILO est installé et que son fichier de configuration fait référence à " |
814 | +"une image de lancement de memtest86 ou memtest86+, il doit être ré-exécuté " |
815 | +"afin de pouvoir utiliser la nouvelle image." |
816 | |
817 | === added file 'debian/po/ja.po' |
818 | --- debian/po/ja.po 1970-01-01 00:00:00 +0000 |
819 | +++ debian/po/ja.po 2010-06-27 17:51:29 +0000 |
820 | @@ -0,0 +1,35 @@ |
821 | +# memtest86+ po-debconf translation (Japanese) |
822 | +# Copyright (C) 2009 Yann Dirson <dirson@debian.org> |
823 | +# This file is distributed under the same license as the memtest86+ package. |
824 | +# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009. |
825 | +# |
826 | +msgid "" |
827 | +msgstr "" |
828 | +"Project-Id-Version: memtest86+ 4.00-2.1\n" |
829 | +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" |
830 | +"POT-Creation-Date: 2009-12-02 22:23+0100\n" |
831 | +"PO-Revision-Date: 2009-12-27 13:52+0900\n" |
832 | +"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" |
833 | +"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" |
834 | +"Language: ja\n" |
835 | +"MIME-Version: 1.0\n" |
836 | +"Content-Type: text/plain; charset=UTF-8\n" |
837 | +"Content-Transfer-Encoding: 8bit\n" |
838 | + |
839 | +#. Type: boolean |
840 | +#. Description |
841 | +#: ../templates:1001 |
842 | +msgid "Run lilo automatically after upgrade (if found)?" |
843 | +msgstr "(もしあれば) lilo をアップグレード後に自動的に実行しますか?" |
844 | + |
845 | +#. Type: boolean |
846 | +#. Description |
847 | +#: ../templates:1001 |
848 | +msgid "" |
849 | +"If lilo is installed and its configuration file contains the memtest86/" |
850 | +"memtest86+ image, then it should be re-run in order to allow booting the new " |
851 | +"image." |
852 | +msgstr "" |
853 | +"lilo がインストールされていて、その設定ファイルが memtest86/memtest86+ のイ" |
854 | +"メージを指定している場合は、新しいイメージを起動できるようにするために lilo " |
855 | +"の再実行が必要です。" |
856 | |
857 | === added file 'debian/po/pt.po' |
858 | --- debian/po/pt.po 1970-01-01 00:00:00 +0000 |
859 | +++ debian/po/pt.po 2010-06-27 17:51:29 +0000 |
860 | @@ -0,0 +1,37 @@ |
861 | +# Translation of memtest86+ debconf messages to Portuguese |
862 | +# Copyright (C) 2009 the memtest86+ copyright holder |
863 | +# This file is distributed under the same license as the memtest86+ package. |
864 | +# |
865 | +# Américo Monteiro <a_monteiro@netcabo.pt>, 2009. |
866 | +msgid "" |
867 | +msgstr "" |
868 | +"Project-Id-Version: memtest86+ 4.00-2.1\n" |
869 | +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" |
870 | +"POT-Creation-Date: 2009-12-02 22:23+0100\n" |
871 | +"PO-Revision-Date: 2009-12-28 20:18+0000\n" |
872 | +"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" |
873 | +"Language-Team: Portuguese <traduz@debianpt.org>\n" |
874 | +"Language: pt\n" |
875 | +"MIME-Version: 1.0\n" |
876 | +"Content-Type: text/plain; charset=UTF-8\n" |
877 | +"Content-Transfer-Encoding: 8bit\n" |
878 | +"X-Generator: Lokalize 1.0\n" |
879 | +"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
880 | + |
881 | +#. Type: boolean |
882 | +#. Description |
883 | +#: ../templates:1001 |
884 | +msgid "Run lilo automatically after upgrade (if found)?" |
885 | +msgstr "Correr o lilo automaticamente (se encontrado) após a actualização?" |
886 | + |
887 | +#. Type: boolean |
888 | +#. Description |
889 | +#: ../templates:1001 |
890 | +msgid "" |
891 | +"If lilo is installed and its configuration file contains the memtest86/" |
892 | +"memtest86+ image, then it should be re-run in order to allow booting the new " |
893 | +"image." |
894 | +msgstr "" |
895 | +"Se o lilo estiver instalado e o seu ficheiro de configuração conter a imagem " |
896 | +"memtest86/memtest86+, então deve ser re-executado de modo a permitir o " |
897 | +"arranque pela nova imagem." |
898 | |
899 | === added file 'debian/po/ru.po' |
900 | --- debian/po/ru.po 1970-01-01 00:00:00 +0000 |
901 | +++ debian/po/ru.po 2010-06-27 17:51:29 +0000 |
902 | @@ -0,0 +1,37 @@ |
903 | +# translation of memtest86+_4.00-2.1_ru.po to Russian |
904 | +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
905 | +# This file is distributed under the same license as the PACKAGE package. |
906 | +# |
907 | +# Yuri Kozlov <yuray@komyakino.ru>, 2010. |
908 | +msgid "" |
909 | +msgstr "" |
910 | +"Project-Id-Version: memtest86+ 4.00-2.1\n" |
911 | +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" |
912 | +"POT-Creation-Date: 2009-12-02 22:23+0100\n" |
913 | +"PO-Revision-Date: 2010-01-13 19:22+0300\n" |
914 | +"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" |
915 | +"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" |
916 | +"Language: ru\n" |
917 | +"MIME-Version: 1.0\n" |
918 | +"Content-Type: text/plain; charset=UTF-8\n" |
919 | +"Content-Transfer-Encoding: 8bit\n" |
920 | +"X-Generator: KBabel 1.11.4\n" |
921 | +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" |
922 | +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" |
923 | + |
924 | +#. Type: boolean |
925 | +#. Description |
926 | +#: ../templates:1001 |
927 | +msgid "Run lilo automatically after upgrade (if found)?" |
928 | +msgstr "Запускать lilo автоматически после обновления (если установлен)?" |
929 | + |
930 | +#. Type: boolean |
931 | +#. Description |
932 | +#: ../templates:1001 |
933 | +msgid "" |
934 | +"If lilo is installed and its configuration file contains the memtest86/" |
935 | +"memtest86+ image, then it should be re-run in order to allow booting the new " |
936 | +"image." |
937 | +msgstr "" |
938 | +"Если пакет lilo установлен и его файл настройки содержит образ memtest86/" |
939 | +"memtest86+, то его нужно перезапустить, чтобы стал загружаться новый образ." |
940 | |
941 | === added file 'debian/po/sv.po' |
942 | --- debian/po/sv.po 1970-01-01 00:00:00 +0000 |
943 | +++ debian/po/sv.po 2010-06-27 17:51:29 +0000 |
944 | @@ -0,0 +1,37 @@ |
945 | +# Translation of memtest86+ debconf template to Swedish |
946 | +# Copyright (C) 2010 Martin Bagge <brother@bsnet.se> |
947 | +# This file is distributed under the same license as the memtest86+ package. |
948 | +# |
949 | +# Martin Bagge <brother@bsnet.se>, 2010 |
950 | +msgid "" |
951 | +msgstr "" |
952 | +"Project-Id-Version: PACKAGE VERSION\n" |
953 | +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" |
954 | +"POT-Creation-Date: 2009-12-02 22:23+0100\n" |
955 | +"PO-Revision-Date: 2010-01-09 19:01+0100\n" |
956 | +"Last-Translator: Martin Bagge <brother@bsnet.se>\n" |
957 | +"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" |
958 | +"Language: sv\n" |
959 | +"MIME-Version: 1.0\n" |
960 | +"Content-Type: text/plain; charset=utf-8\n" |
961 | +"Content-Transfer-Encoding: 8bit\n" |
962 | +"X-Poedit-Language: Swedish\n" |
963 | +"X-Poedit-Country: Sweden\n" |
964 | + |
965 | +#. Type: boolean |
966 | +#. Description |
967 | +#: ../templates:1001 |
968 | +msgid "Run lilo automatically after upgrade (if found)?" |
969 | +msgstr "Ska lilo (om det finns) köras automatiskt efter uppgradering?" |
970 | + |
971 | +#. Type: boolean |
972 | +#. Description |
973 | +#: ../templates:1001 |
974 | +msgid "" |
975 | +"If lilo is installed and its configuration file contains the memtest86/" |
976 | +"memtest86+ image, then it should be re-run in order to allow booting the new " |
977 | +"image." |
978 | +msgstr "" |
979 | +"Om lilo är installerat och dess inställningar innehållet avbildningen av " |
980 | +"memtest86/memtest86+ ska den köras för att systemet ska kunna startas på den " |
981 | +"nya avbildningen." |
982 | |
983 | === added file 'debian/po/templates.pot' |
984 | --- debian/po/templates.pot 1970-01-01 00:00:00 +0000 |
985 | +++ debian/po/templates.pot 2010-06-27 17:51:29 +0000 |
986 | @@ -0,0 +1,32 @@ |
987 | +# SOME DESCRIPTIVE TITLE. |
988 | +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER |
989 | +# This file is distributed under the same license as the PACKAGE package. |
990 | +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. |
991 | +# |
992 | +#, fuzzy |
993 | +msgid "" |
994 | +msgstr "" |
995 | +"Project-Id-Version: PACKAGE VERSION\n" |
996 | +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" |
997 | +"POT-Creation-Date: 2009-12-02 22:23+0100\n" |
998 | +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
999 | +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1000 | +"Language-Team: LANGUAGE <LL@li.org>\n" |
1001 | +"MIME-Version: 1.0\n" |
1002 | +"Content-Type: text/plain; charset=CHARSET\n" |
1003 | +"Content-Transfer-Encoding: 8bit\n" |
1004 | + |
1005 | +#. Type: boolean |
1006 | +#. Description |
1007 | +#: ../templates:1001 |
1008 | +msgid "Run lilo automatically after upgrade (if found)?" |
1009 | +msgstr "" |
1010 | + |
1011 | +#. Type: boolean |
1012 | +#. Description |
1013 | +#: ../templates:1001 |
1014 | +msgid "" |
1015 | +"If lilo is installed and its configuration file contains the memtest86/" |
1016 | +"memtest86+ image, then it should be re-run in order to allow booting the new " |
1017 | +"image." |
1018 | +msgstr "" |
1019 | |
1020 | === modified file 'debian/postinst' |
1021 | --- debian/postinst 2009-06-24 16:55:39 +0000 |
1022 | +++ debian/postinst 2010-06-27 17:51:29 +0000 |
1023 | @@ -1,23 +1,20 @@ |
1024 | #!/bin/sh |
1025 | set -e |
1026 | |
1027 | -# offer to run LILO |
1028 | -# (adapted from snippet by chr.ohm@gmx.net) |
1029 | -if [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && |
1030 | - [ "${DEBIAN_FRONTEND}" != "noninteractive" ] && |
1031 | +. /usr/share/debconf/confmodule |
1032 | + |
1033 | +if [ "$1" = configure ]; then |
1034 | + db_get shared/memtest86-run-lilo |
1035 | + if [ "$RET" = true ] && |
1036 | + [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && |
1037 | grep "image.*=.*/boot/memtest86+.bin" /etc/lilo.conf >/dev/null |
1038 | -then |
1039 | - echo "You seem to have an entry for memtest86+ in /etc/lilo.conf." |
1040 | - printf "Run lilo now [y/N]? " |
1041 | - read c |
1042 | - if [ "$c" = "y" ] || [ "$c" = "Y" ] |
1043 | then |
1044 | lilo |
1045 | fi |
1046 | -fi |
1047 | |
1048 | -if [ "$1" = "configure" ] && [ -x "`which update-grub2 2>/dev/null`" ] && [ -e /boot/grub/grub.cfg ]; then |
1049 | - update-grub2 |
1050 | + if [ -e /boot/grub/grub.cfg ] && [ -x "`which update-grub2 2>/dev/null`" ] ; then |
1051 | + update-grub2 |
1052 | + fi |
1053 | fi |
1054 | |
1055 | #DEBHELPER# |
1056 | |
1057 | === modified file 'debian/rules' |
1058 | --- debian/rules 2009-03-26 11:45:00 +0000 |
1059 | +++ debian/rules 2010-06-27 17:51:29 +0000 |
1060 | @@ -23,6 +23,9 @@ |
1061 | |
1062 | [ ! -f Makefile ] || $(MAKE) clean |
1063 | |
1064 | + # make sure PO files are always up-to-date |
1065 | + debconf-updatepo |
1066 | + |
1067 | dh_clean |
1068 | |
1069 | install: build |
1070 | @@ -35,8 +38,13 @@ |
1071 | install -m755 debian/make-$(PACKAGE)-boot-floppy debian/$(PACKAGE)/usr/bin/ |
1072 | install -D -m644 memtest.bin debian/$(PACKAGE)/boot/$(PACKAGE).bin |
1073 | install -D -m644 memtest debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf |
1074 | + install -D -m644 -s memtest_shared debian/$(PACKAGE)/boot/$(PACKAGE)_multiboot.bin |
1075 | install -D -m755 debian/grub debian/$(PACKAGE)/etc/grub.d/20_$(PACKAGE) |
1076 | dh_installman debian/make-$(PACKAGE)-boot-floppy.1 |
1077 | + #install the lintian override |
1078 | + install -d debian/$(PACKAGE)/usr/share/lintian/overrides |
1079 | + install -m644 debian/lintian-overrides \ |
1080 | + debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE) |
1081 | |
1082 | # Build architecture-independent files here. |
1083 | binary-indep: build install |
1084 | @@ -46,7 +54,7 @@ |
1085 | binary-arch: build install |
1086 | dh_testdir |
1087 | dh_testroot |
1088 | -# dh_installdebconf |
1089 | + dh_installdebconf |
1090 | dh_installdocs README |
1091 | dh_buildinfo |
1092 | dh_installexamples debian/lilo.conf debian/grub-menu.lst |
1093 | |
1094 | === added file 'debian/templates' |
1095 | --- debian/templates 1970-01-01 00:00:00 +0000 |
1096 | +++ debian/templates 2010-06-27 17:51:29 +0000 |
1097 | @@ -0,0 +1,7 @@ |
1098 | +Template: shared/memtest86-run-lilo |
1099 | +Type: boolean |
1100 | +Default: false |
1101 | +_Description: Run lilo automatically after upgrade (if found)? |
1102 | + If lilo is installed and its configuration file contains the |
1103 | + memtest86/memtest86+ image, then it should be re-run in order to |
1104 | + allow booting the new image. |
1105 | |
1106 | === modified file 'head.S' |
1107 | --- head.S 2009-03-01 16:50:40 +0000 |
1108 | +++ head.S 2010-06-27 17:51:29 +0000 |
1109 | @@ -13,9 +13,11 @@ |
1110 | |
1111 | .text |
1112 | #define __ASSEMBLY__ |
1113 | +#define ASM_FILE |
1114 | #include "defs.h" |
1115 | #include "config.h" |
1116 | #include "test.h" |
1117 | +#include "multiboot.h" |
1118 | |
1119 | /* |
1120 | * References to members of the boot_cpu_data structure. |
1121 | @@ -31,6 +33,22 @@ |
1122 | #define X86_PWRCAP 40 |
1123 | #define X86_EXT 44 |
1124 | #define X86_FFL 48 |
1125 | +#define X86_DCACHE0_EAX 52 |
1126 | +#define X86_DCACHE0_EBX 56 |
1127 | +#define X86_DCACHE0_ECX 60 |
1128 | +#define X86_DCACHE0_EDX 64 |
1129 | +#define X86_DCACHE1_EAX 68 |
1130 | +#define X86_DCACHE1_EBX 72 |
1131 | +#define X86_DCACHE1_ECX 76 |
1132 | +#define X86_DCACHE1_EDX 80 |
1133 | +#define X86_DCACHE2_EAX 84 |
1134 | +#define X86_DCACHE2_EBX 88 |
1135 | +#define X86_DCACHE2_ECX 92 |
1136 | +#define X86_DCACHE2_EDX 96 |
1137 | +#define X86_DCACHE3_EAX 100 |
1138 | +#define X86_DCACHE3_EBX 104 |
1139 | +#define X86_DCACHE3_ECX 108 |
1140 | +#define X86_DCACHE3_EDX 112 |
1141 | |
1142 | .code32 |
1143 | .globl startup_32 |
1144 | @@ -38,6 +56,13 @@ |
1145 | cld |
1146 | cli |
1147 | |
1148 | + /* Store MBI pointer */ |
1149 | + xorl %ecx, %ecx |
1150 | + cmpl $MULTIBOOT_BOOTLOADER_MAGIC, %eax |
1151 | + jne 0f |
1152 | + movl %ebx, %ecx |
1153 | +0: |
1154 | + |
1155 | /* Ensure I have a stack pointer */ |
1156 | testl %esp, %esp |
1157 | jnz 0f |
1158 | @@ -50,6 +75,20 @@ |
1159 | 0: popl %ebx |
1160 | addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx |
1161 | |
1162 | + /* Move MBI pointer to a safe place */ |
1163 | + testl %ecx, %ecx |
1164 | + je 0f |
1165 | + movl %ecx, mbiptr@GOTOFF(%ebx) |
1166 | +0: |
1167 | + |
1168 | + jmp 0f |
1169 | + /* Multiboot header */ |
1170 | +.align 4 |
1171 | + .long MULTIBOOT_HEADER_MAGIC |
1172 | + .long 0 |
1173 | + .long -MULTIBOOT_HEADER_MAGIC |
1174 | +0: |
1175 | + |
1176 | /* Pick the appropriate stack address */ |
1177 | leal stack_top@GOTOFF(%ebx), %esp |
1178 | |
1179 | @@ -373,6 +412,37 @@ |
1180 | movl %ebx, X86_CACHE+4(%esi) |
1181 | movl %ecx, X86_CACHE+8(%esi) |
1182 | movl %edx, X86_CACHE+12(%esi) |
1183 | +# Grab deterministic cache information (for 32nm Intel CPU) |
1184 | + cmpw $0x0000,%dx |
1185 | + jne id_done |
1186 | + movl $4, %eax |
1187 | + movl $0, %ecx |
1188 | + cpuid |
1189 | + movl %eax, X86_DCACHE0_EAX(%esi) |
1190 | + movl %ebx, X86_DCACHE0_EBX(%esi) |
1191 | + movl %ecx, X86_DCACHE0_ECX(%esi) |
1192 | + movl %edx, X86_DCACHE0_EDX(%esi) |
1193 | + movl $4, %eax |
1194 | + movl $1, %ecx |
1195 | + cpuid |
1196 | + movl %eax, X86_DCACHE1_EAX(%esi) |
1197 | + movl %ebx, X86_DCACHE1_EBX(%esi) |
1198 | + movl %ecx, X86_DCACHE1_ECX(%esi) |
1199 | + movl %edx, X86_DCACHE1_EDX(%esi) |
1200 | + movl $4, %eax |
1201 | + movl $2, %ecx |
1202 | + cpuid |
1203 | + movl %eax, X86_DCACHE2_EAX(%esi) |
1204 | + movl %ebx, X86_DCACHE2_EBX(%esi) |
1205 | + movl %ecx, X86_DCACHE2_ECX(%esi) |
1206 | + movl %edx, X86_DCACHE2_EDX(%esi) |
1207 | + movl $4, %eax |
1208 | + movl $3, %ecx |
1209 | + cpuid |
1210 | + movl %eax, X86_DCACHE3_EAX(%esi) |
1211 | + movl %ebx, X86_DCACHE3_EBX(%esi) |
1212 | + movl %ecx, X86_DCACHE3_ECX(%esi) |
1213 | + movl %edx, X86_DCACHE3_EDX(%esi) |
1214 | jmp id_done |
1215 | |
1216 | not_intel: |
1217 | @@ -956,6 +1026,9 @@ |
1218 | movl $1, %eax |
1219 | ret |
1220 | |
1221 | +.globl mbiptr |
1222 | +mbiptr: |
1223 | + .long 0 |
1224 | realptr: |
1225 | .word real - RSTART |
1226 | .word 0x0000 |
1227 | @@ -980,6 +1053,6 @@ |
1228 | .bss |
1229 | .balign 16 |
1230 | stack: |
1231 | - . = . + 4096 |
1232 | + . = . + 8192 |
1233 | stack_top: |
1234 | .previous |
1235 | |
1236 | === modified file 'init.c' |
1237 | --- init.c 2009-11-09 17:09:57 +0000 |
1238 | +++ init.c 2010-06-27 17:51:29 +0000 |
1239 | @@ -3,7 +3,7 @@ |
1240 | * Released under version 2 of the Gnu Public License. |
1241 | * By Chris Brady, cbrady@sgi.com |
1242 | * ---------------------------------------------------- |
1243 | - * MemTest86+ V4.00 Specific code (GPL V2.0) |
1244 | + * MemTest86+ V4.10 Specific code (GPL V2.0) |
1245 | * By Samuel DEMEULEMEESTER, sdemeule@memtest.org |
1246 | * http://www.canardpc.com - http://www.memtest.org |
1247 | */ |
1248 | @@ -15,6 +15,7 @@ |
1249 | #include "pci.h" |
1250 | #include "io.h" |
1251 | #include "spd.h" |
1252 | +#include "multiboot.h" |
1253 | |
1254 | #define rdmsr(msr,val1,val2) \ |
1255 | __asm__ __volatile__("rdmsr" \ |
1256 | @@ -65,7 +66,7 @@ |
1257 | for(i=0, pp=(char *)(SCREEN_ADR+1); i<TITLE_WIDTH; i++, pp+=2) { |
1258 | *pp = 0x20; |
1259 | } |
1260 | - cprint(0, 0, " Memtest86 v4.00 "); |
1261 | + cprint(0, 0, " Memtest86 v4.10 "); |
1262 | |
1263 | for(i=0, pp=(char *)(SCREEN_ADR+1); i<2; i++, pp+=30) { |
1264 | *pp = 0xA4; |
1265 | @@ -98,7 +99,10 @@ |
1266 | /* Determine the memory map */ |
1267 | if ((firmware == FIRMWARE_UNKNOWN) && |
1268 | (memsz_mode != SZ_MODE_PROBE)) { |
1269 | - if (query_linuxbios()) { |
1270 | + if (query_multiboot()) { |
1271 | + firmware = FIRMWARE_MULTIBOOT; |
1272 | + } |
1273 | + else if (query_linuxbios()) { |
1274 | firmware = FIRMWARE_LINUXBIOS; |
1275 | } |
1276 | else if (query_pcbios()) { |
1277 | @@ -777,6 +781,41 @@ |
1278 | break; |
1279 | } |
1280 | } |
1281 | + |
1282 | + // If no cache found, check if deterministic cache info are available |
1283 | + if(l1_cache == 0 && ((cpu_id.dcache0_eax >> 5) & 7) == 1) |
1284 | + { |
1285 | + |
1286 | + long dcache[] = { cpu_id.dcache0_eax, cpu_id.dcache0_ebx, cpu_id.dcache0_ecx, cpu_id.dcache0_edx, |
1287 | + cpu_id.dcache1_eax, cpu_id.dcache1_ebx, cpu_id.dcache1_ecx, cpu_id.dcache1_edx, |
1288 | + cpu_id.dcache2_eax, cpu_id.dcache2_ebx, cpu_id.dcache2_ecx, cpu_id.dcache2_edx, |
1289 | + cpu_id.dcache3_eax, cpu_id.dcache3_ebx, cpu_id.dcache3_ecx, cpu_id.dcache3_edx |
1290 | + }; |
1291 | + |
1292 | + for(i=0; i<4; i++) |
1293 | + { |
1294 | + switch((dcache[i*4] >> 5) & 7) |
1295 | + { |
1296 | + case 1: |
1297 | + // We don't want L1 I-Cache, only L1 D-Cache |
1298 | + if((dcache[i*4] & 3) != 2) |
1299 | + { |
1300 | + l1_cache = (((dcache[i*4+1] >> 22) & 0x3FF) + 1) * (((dcache[i*4+1] >> 12) & 0x3FF) + 1); |
1301 | + l1_cache *= ((dcache[i*4+1] & 0xFFF) + 1) * (dcache[i*4+2] + 1) / 1024; |
1302 | + } |
1303 | + break; |
1304 | + case 2: |
1305 | + l2_cache = (((dcache[i*4+1] >> 22) & 0x3FF) + 1) * (((dcache[i*4+1] >> 12) & 0x3FF) + 1); |
1306 | + l2_cache *= ((dcache[i*4+1] & 0xFFF) + 1) * (dcache[i*4+2] + 1) / 1024; |
1307 | + break; |
1308 | + case 3: |
1309 | + l3_cache = (((dcache[i*4+1] >> 22) & 0x3FF) + 1) * (((dcache[i*4+1] >> 12) & 0x3FF) + 1); |
1310 | + l3_cache *= ((dcache[i*4+1] & 0xFFF) + 1) * (dcache[i*4+2] + 1) / 1024; |
1311 | + break; |
1312 | + } |
1313 | + } |
1314 | + } |
1315 | + |
1316 | |
1317 | switch(cpu_id.type) { |
1318 | case 5: |
1319 | @@ -818,7 +857,7 @@ |
1320 | if(((cpu_id.ext >> 16) & 0xF) > 1) { |
1321 | cprint(LINE_CPU, 0, "Intel Core i3/i5"); |
1322 | tsc_invariable = 1; |
1323 | - imc_type = 0x0002; |
1324 | + imc_type = 0x0003; |
1325 | off = 16; |
1326 | } else { |
1327 | cprint(LINE_CPU, 0, "Intel EP80579"); |
1328 | @@ -876,10 +915,16 @@ |
1329 | break; |
1330 | case 10: |
1331 | if (((cpu_id.ext >> 16) & 0xF) != 0) { |
1332 | - tsc_invariable = 1; |
1333 | - imc_type = 0x0001; |
1334 | - cprint(LINE_CPU, 0, "Intel Core i7"); |
1335 | - off = 13; |
1336 | + tsc_invariable = 1; |
1337 | + if(((cpu_id.ext >> 16) & 0xF) > 1) { |
1338 | + cprint(LINE_CPU, 0, "Intel SNB"); |
1339 | + imc_type = 0x0003; |
1340 | + off = 9; |
1341 | + } else { |
1342 | + imc_type = 0x0001; |
1343 | + cprint(LINE_CPU, 0, "Intel Core i7"); |
1344 | + off = 13; |
1345 | + } |
1346 | } else { |
1347 | cprint(LINE_CPU, 0, "Pentium III Xeon"); |
1348 | off = 16; |
1349 | @@ -887,10 +932,10 @@ |
1350 | break; |
1351 | case 12: |
1352 | if (((cpu_id.ext >> 16) & 0xF) > 1) { |
1353 | - cprint(LINE_CPU, 0, "Intel Core i9"); |
1354 | + cprint(LINE_CPU, 0, "Core i7 (32nm)"); |
1355 | tsc_invariable = 1; |
1356 | imc_type = 0x0002; |
1357 | - off = 13; |
1358 | + off = 14; |
1359 | } else { |
1360 | l1_cache = 24; |
1361 | cprint(LINE_CPU, 0, "Atom (0.045)"); |
1362 | @@ -1369,7 +1414,7 @@ |
1363 | "lodsl\n\t" \ |
1364 | "loop L2\n\t" \ |
1365 | :: "g" (src), "g" (wlen) |
1366 | - : "esi", "ecx" |
1367 | + : "esi", "ecx", "eax" |
1368 | ); |
1369 | } |
1370 | asm __volatile__ ("rdtsc":"=a" (end_low),"=d" (end_high)); |
1371 | |
1372 | === modified file 'lib.c' |
1373 | --- lib.c 2009-09-29 23:40:15 +0000 |
1374 | +++ lib.c 2010-06-27 17:51:29 +0000 |
1375 | @@ -24,7 +24,7 @@ |
1376 | #error Bad SERIAL_TTY. Only ttyS0 and ttyS1 are supported. |
1377 | #endif |
1378 | short serial_tty = SERIAL_TTY; |
1379 | -const short serial_base_ports[] = {0x3f8, 0x2f8}; |
1380 | +const short serial_base_ports[] = {0x3f8, 0x2f8, 0x3e8, 0x2e8}; |
1381 | |
1382 | #if ((115200%SERIAL_BAUD_RATE) != 0) |
1383 | #error Bad default baud rate |
1384 | @@ -1053,8 +1053,8 @@ |
1385 | if (option == param) |
1386 | return; /* there were no digits */ |
1387 | |
1388 | - if (tty > 1) |
1389 | - return; /* only ttyS0 and ttyS1 supported */ |
1390 | + if (tty > 3) |
1391 | + return; /* only ttyS0 to ttyS3 supported */ |
1392 | |
1393 | if (*option == '\0' || *option == ' ') |
1394 | goto save_tty; /* no options given, just ttyS? */ |
1395 | |
1396 | === modified file 'main.c' |
1397 | --- main.c 2009-09-29 23:40:15 +0000 |
1398 | +++ main.c 2010-06-27 17:51:29 +0000 |
1399 | @@ -11,9 +11,12 @@ |
1400 | #include "test.h" |
1401 | #include "defs.h" |
1402 | #include "config.h" |
1403 | +#include "multiboot.h" |
1404 | #undef TEST_TIMES |
1405 | #define DEFTESTS 9 |
1406 | |
1407 | +extern struct multiboot_info *mbiptr; |
1408 | + |
1409 | extern void bzero(); |
1410 | |
1411 | const struct tseq tseq[] = { |
1412 | @@ -151,11 +154,15 @@ |
1413 | if (cmdline_parsed) |
1414 | return; |
1415 | |
1416 | - if (*OLD_CL_MAGIC_ADDR != OLD_CL_MAGIC) |
1417 | - return; |
1418 | + if (mbiptr && (mbiptr->flags & MULTIBOOT_INFO_CMDLINE)) { |
1419 | + cmdline = (void *) mbiptr->cmdline; |
1420 | + } else { |
1421 | + if (*OLD_CL_MAGIC_ADDR != OLD_CL_MAGIC) |
1422 | + return; |
1423 | |
1424 | - unsigned short offset = *OLD_CL_OFFSET_ADDR; |
1425 | - cmdline = MK_PTR(INITSEG, offset); |
1426 | + unsigned short offset = *OLD_CL_OFFSET_ADDR; |
1427 | + cmdline = MK_PTR(INITSEG, offset); |
1428 | + } |
1429 | |
1430 | /* skip leading spaces */ |
1431 | while (*cmdline == ' ') |
1432 | |
1433 | === modified file 'makeiso.sh' |
1434 | --- makeiso.sh 2009-09-29 23:40:15 +0000 |
1435 | +++ makeiso.sh 2010-06-27 17:51:29 +0000 |
1436 | @@ -37,9 +37,9 @@ |
1437 | echo -e "There is nothing to do here\r\r\nMemtest86+ is located on the bootsector of this CD\r\r\n" > README.TXT |
1438 | echo -e "Just boot from this CD and Memtest86+ will launch" >> README.TXT |
1439 | |
1440 | -mkisofs -A "MKISOFS 1.1.2" -p "Memtest86+ 4.00" -publisher "Samuel D. <sdemeule@memtest.org>" -b boot/memtest.img -c boot/boot.catalog -V "MT201" -o memtest.iso . |
1441 | -mv memtest.iso ../mt400.iso |
1442 | +mkisofs -A "MKISOFS 1.1.2" -p "Memtest86+ 4.10" -publisher "Samuel D. <sdemeule@memtest.org>" -b boot/memtest.img -c boot/boot.catalog -V "MT410" -o memtest.iso . |
1443 | +mv memtest.iso ../mt410.iso |
1444 | cd .. |
1445 | rm -rf cd |
1446 | |
1447 | -echo "Done! Memtest86+ 4.00 ISO is mt400.iso" |
1448 | +echo "Done! Memtest86+ 4.10 ISO is mt410.iso" |
1449 | |
1450 | === modified file 'memsize.c' |
1451 | --- memsize.c 2009-09-29 23:40:15 +0000 |
1452 | +++ memsize.c 2010-06-27 17:51:29 +0000 |
1453 | @@ -75,7 +75,7 @@ |
1454 | |
1455 | static void memsize_bios() |
1456 | { |
1457 | - if (firmware == FIRMWARE_PCBIOS) { |
1458 | + if (firmware == FIRMWARE_PCBIOS || firmware == FIRMWARE_MULTIBOOT) { |
1459 | memsize_820(); |
1460 | } |
1461 | else if (firmware == FIRMWARE_LINUXBIOS) { |
1462 | |
1463 | === removed file 'memtest.exe' |
1464 | Binary files memtest.exe 2009-09-29 23:40:15 +0000 and memtest.exe 1970-01-01 00:00:00 +0000 differ |
1465 | === modified file 'memtest.lds' |
1466 | --- memtest.lds 2005-04-04 15:19:44 +0000 |
1467 | +++ memtest.lds 2010-06-27 17:51:29 +0000 |
1468 | @@ -3,7 +3,7 @@ |
1469 | |
1470 | ENTRY(_start); |
1471 | SECTIONS { |
1472 | - . = 0x10000; |
1473 | + . = 0x5000; |
1474 | _start = . ; |
1475 | .data : { |
1476 | *(.data) |
1477 | |
1478 | === modified file 'mt86+_loader' |
1479 | Binary files mt86+_loader 2009-11-09 17:09:57 +0000 and mt86+_loader 2010-06-27 17:51:29 +0000 differ |
1480 | === modified file 'mt86+_loader.asm' |
1481 | --- mt86+_loader.asm 2009-11-09 17:09:57 +0000 |
1482 | +++ mt86+_loader.asm 2010-06-27 17:51:29 +0000 |
1483 | @@ -12,8 +12,8 @@ |
1484 | ; The good thing is that you get a single file which can be |
1485 | ; compressed, for example with http://upx.sf.net/ (UPX). |
1486 | |
1487 | -%define fullsize (160280 + buffer - exeh) |
1488 | - ; 160280 is the size of memtest86+ V4.00, adjust as needed! |
1489 | +%define fullsize (165080 + buffer - exeh) |
1490 | + ; 165080 is the size of memtest86+ V4.00, adjust as needed! |
1491 | |
1492 | %define stacksize 2048 |
1493 | %define stackpara ((stacksize + 15) / 16) |
1494 | |
1495 | === added file 'multiboot.c' |
1496 | --- multiboot.c 1970-01-01 00:00:00 +0000 |
1497 | +++ multiboot.c 2010-06-27 17:51:29 +0000 |
1498 | @@ -0,0 +1,49 @@ |
1499 | +/* multiboot.c |
1500 | + * |
1501 | + * Copyright (C) 2008,2009 Robert Millan |
1502 | + * |
1503 | + * Loosely based on linuxbios.c, which is: |
1504 | + * |
1505 | + * Released under version 2 of the Gnu Public License. |
1506 | + * By Eric Biederman |
1507 | + */ |
1508 | + |
1509 | +#include "multiboot.h" |
1510 | +#include "test.h" |
1511 | + |
1512 | +extern struct multiboot_info *mbiptr; |
1513 | + |
1514 | +int query_multiboot(void) |
1515 | +{ |
1516 | + struct multiboot_mmap_entry *mem; |
1517 | + int i; |
1518 | + |
1519 | + if (!mbiptr) { |
1520 | + return 0; |
1521 | + } |
1522 | + if (!mbiptr->mmap_addr) { |
1523 | + return 1; |
1524 | + } |
1525 | + if ((mbiptr->flags & MULTIBOOT_INFO_MEM_MAP) == 0) { |
1526 | + return 1; |
1527 | + } |
1528 | + |
1529 | + mem = (struct multiboot_mmap_entry *) mbiptr->mmap_addr; |
1530 | + mem_info.e820_nr = 0; |
1531 | + |
1532 | + for (i = 0; i < E820MAX; i++) { |
1533 | + if ((multiboot_uint32_t) mem >= (mbiptr->mmap_addr + mbiptr->mmap_length)) { |
1534 | + break; |
1535 | + } |
1536 | + |
1537 | + mem_info.e820[mem_info.e820_nr].addr = mem->addr; |
1538 | + mem_info.e820[mem_info.e820_nr].size = mem->len; |
1539 | + /* Multiboot spec defines available / reserved types to match with E820. */ |
1540 | + mem_info.e820[mem_info.e820_nr].type = mem->type; |
1541 | + mem_info.e820_nr++; |
1542 | + |
1543 | + mem = (struct multiboot_mmap_entry *) ((multiboot_uint32_t) mem + mem->size + sizeof (mem->size)); |
1544 | + } |
1545 | + |
1546 | + return 1; |
1547 | +} |
1548 | |
1549 | === added file 'multiboot.h' |
1550 | --- multiboot.h 1970-01-01 00:00:00 +0000 |
1551 | +++ multiboot.h 2010-06-27 17:51:29 +0000 |
1552 | @@ -0,0 +1,259 @@ |
1553 | +/* multiboot.h - Multiboot header file. */ |
1554 | +/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. |
1555 | + * |
1556 | + * Permission is hereby granted, free of charge, to any person obtaining a copy |
1557 | + * of this software and associated documentation files (the "Software"), to |
1558 | + * deal in the Software without restriction, including without limitation the |
1559 | + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or |
1560 | + * sell copies of the Software, and to permit persons to whom the Software is |
1561 | + * furnished to do so, subject to the following conditions: |
1562 | + * |
1563 | + * The above copyright notice and this permission notice shall be included in |
1564 | + * all copies or substantial portions of the Software. |
1565 | + * |
1566 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
1567 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
1568 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY |
1569 | + * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
1570 | + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR |
1571 | + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
1572 | + */ |
1573 | + |
1574 | +#ifndef MULTIBOOT_HEADER |
1575 | +#define MULTIBOOT_HEADER 1 |
1576 | + |
1577 | +/* How many bytes from the start of the file we search for the header. */ |
1578 | +#define MULTIBOOT_SEARCH 8192 |
1579 | + |
1580 | +/* The magic field should contain this. */ |
1581 | +#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 |
1582 | + |
1583 | +/* This should be in %eax. */ |
1584 | +#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 |
1585 | + |
1586 | +/* Alignment of multiboot modules. */ |
1587 | +#define MULTIBOOT_MOD_ALIGN 0x00001000 |
1588 | + |
1589 | +/* Alignment of the multiboot info structure. */ |
1590 | +#define MULTIBOOT_INFO_ALIGN 0x00000004 |
1591 | + |
1592 | +/* Flags set in the 'flags' member of the multiboot header. */ |
1593 | + |
1594 | +/* Align all boot modules on i386 page (4KB) boundaries. */ |
1595 | +#define MULTIBOOT_PAGE_ALIGN 0x00000001 |
1596 | + |
1597 | +/* Must pass memory information to OS. */ |
1598 | +#define MULTIBOOT_MEMORY_INFO 0x00000002 |
1599 | + |
1600 | +/* Must pass video information to OS. */ |
1601 | +#define MULTIBOOT_VIDEO_MODE 0x00000004 |
1602 | + |
1603 | +/* This flag indicates the use of the address fields in the header. */ |
1604 | +#define MULTIBOOT_AOUT_KLUDGE 0x00010000 |
1605 | + |
1606 | +/* Flags to be set in the 'flags' member of the multiboot info structure. */ |
1607 | + |
1608 | +/* is there basic lower/upper memory information? */ |
1609 | +#define MULTIBOOT_INFO_MEMORY 0x00000001 |
1610 | +/* is there a boot device set? */ |
1611 | +#define MULTIBOOT_INFO_BOOTDEV 0x00000002 |
1612 | +/* is the command-line defined? */ |
1613 | +#define MULTIBOOT_INFO_CMDLINE 0x00000004 |
1614 | +/* are there modules to do something with? */ |
1615 | +#define MULTIBOOT_INFO_MODS 0x00000008 |
1616 | + |
1617 | +/* These next two are mutually exclusive */ |
1618 | + |
1619 | +/* is there a symbol table loaded? */ |
1620 | +#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 |
1621 | +/* is there an ELF section header table? */ |
1622 | +#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 |
1623 | + |
1624 | +/* is there a full memory map? */ |
1625 | +#define MULTIBOOT_INFO_MEM_MAP 0x00000040 |
1626 | + |
1627 | +/* Is there drive info? */ |
1628 | +#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 |
1629 | + |
1630 | +/* Is there a config table? */ |
1631 | +#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 |
1632 | + |
1633 | +/* Is there a boot loader name? */ |
1634 | +#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 |
1635 | + |
1636 | +/* Is there a APM table? */ |
1637 | +#define MULTIBOOT_INFO_APM_TABLE 0x00000400 |
1638 | + |
1639 | +/* Is there video information? */ |
1640 | +#define MULTIBOOT_INFO_VBE_INFO 0x00000800 |
1641 | +#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000 |
1642 | + |
1643 | +#ifndef ASM_FILE |
1644 | + |
1645 | +typedef unsigned char multiboot_uint8_t; |
1646 | +typedef unsigned short multiboot_uint16_t; |
1647 | +typedef unsigned int multiboot_uint32_t; |
1648 | +typedef unsigned long long multiboot_uint64_t; |
1649 | + |
1650 | +struct multiboot_header |
1651 | +{ |
1652 | + /* Must be MULTIBOOT_MAGIC - see above. */ |
1653 | + multiboot_uint32_t magic; |
1654 | + |
1655 | + /* Feature flags. */ |
1656 | + multiboot_uint32_t flags; |
1657 | + |
1658 | + /* The above fields plus this one must equal 0 mod 2^32. */ |
1659 | + multiboot_uint32_t checksum; |
1660 | + |
1661 | + /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ |
1662 | + multiboot_uint32_t header_addr; |
1663 | + multiboot_uint32_t load_addr; |
1664 | + multiboot_uint32_t load_end_addr; |
1665 | + multiboot_uint32_t bss_end_addr; |
1666 | + multiboot_uint32_t entry_addr; |
1667 | + |
1668 | + /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ |
1669 | + multiboot_uint32_t mode_type; |
1670 | + multiboot_uint32_t width; |
1671 | + multiboot_uint32_t height; |
1672 | + multiboot_uint32_t depth; |
1673 | +}; |
1674 | + |
1675 | +/* The symbol table for a.out. */ |
1676 | +struct multiboot_aout_symbol_table |
1677 | +{ |
1678 | + multiboot_uint32_t tabsize; |
1679 | + multiboot_uint32_t strsize; |
1680 | + multiboot_uint32_t addr; |
1681 | + multiboot_uint32_t reserved; |
1682 | +}; |
1683 | +typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; |
1684 | + |
1685 | +/* The section header table for ELF. */ |
1686 | +struct multiboot_elf_section_header_table |
1687 | +{ |
1688 | + multiboot_uint32_t num; |
1689 | + multiboot_uint32_t size; |
1690 | + multiboot_uint32_t addr; |
1691 | + multiboot_uint32_t shndx; |
1692 | +}; |
1693 | +typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; |
1694 | + |
1695 | +struct multiboot_color |
1696 | +{ |
1697 | + multiboot_uint8_t red; |
1698 | + multiboot_uint8_t green; |
1699 | + multiboot_uint8_t blue; |
1700 | +}; |
1701 | + |
1702 | +struct multiboot_info |
1703 | +{ |
1704 | + /* Multiboot info version number */ |
1705 | + multiboot_uint32_t flags; |
1706 | + |
1707 | + /* Available memory from BIOS */ |
1708 | + multiboot_uint32_t mem_lower; |
1709 | + multiboot_uint32_t mem_upper; |
1710 | + |
1711 | + /* "root" partition */ |
1712 | + multiboot_uint32_t boot_device; |
1713 | + |
1714 | + /* Kernel command line */ |
1715 | + multiboot_uint32_t cmdline; |
1716 | + |
1717 | + /* Boot-Module list */ |
1718 | + multiboot_uint32_t mods_count; |
1719 | + multiboot_uint32_t mods_addr; |
1720 | + |
1721 | + union |
1722 | + { |
1723 | + multiboot_aout_symbol_table_t aout_sym; |
1724 | + multiboot_elf_section_header_table_t elf_sec; |
1725 | + } u; |
1726 | + |
1727 | + /* Memory Mapping buffer */ |
1728 | + multiboot_uint32_t mmap_length; |
1729 | + multiboot_uint32_t mmap_addr; |
1730 | + |
1731 | + /* Drive Info buffer */ |
1732 | + multiboot_uint32_t drives_length; |
1733 | + multiboot_uint32_t drives_addr; |
1734 | + |
1735 | + /* ROM configuration table */ |
1736 | + multiboot_uint32_t config_table; |
1737 | + |
1738 | + /* Boot Loader Name */ |
1739 | + multiboot_uint32_t boot_loader_name; |
1740 | + |
1741 | + /* APM table */ |
1742 | + multiboot_uint32_t apm_table; |
1743 | + |
1744 | + /* Video */ |
1745 | + multiboot_uint32_t vbe_control_info; |
1746 | + multiboot_uint32_t vbe_mode_info; |
1747 | + multiboot_uint16_t vbe_mode; |
1748 | + multiboot_uint16_t vbe_interface_seg; |
1749 | + multiboot_uint16_t vbe_interface_off; |
1750 | + multiboot_uint16_t vbe_interface_len; |
1751 | + |
1752 | + multiboot_uint64_t framebuffer_addr; |
1753 | + multiboot_uint32_t framebuffer_pitch; |
1754 | + multiboot_uint32_t framebuffer_width; |
1755 | + multiboot_uint32_t framebuffer_height; |
1756 | + multiboot_uint8_t framebuffer_bpp; |
1757 | +#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 |
1758 | +#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 |
1759 | +#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 |
1760 | + multiboot_uint8_t framebuffer_type; |
1761 | + union |
1762 | + { |
1763 | + /* Indexed color. */ |
1764 | + struct |
1765 | + { |
1766 | + struct multiboot_color *framebuffer_palette_addr; |
1767 | + multiboot_uint16_t framebuffer_palette_num_colors; |
1768 | + }; |
1769 | + |
1770 | + /* Direct RGB color. */ |
1771 | + struct |
1772 | + { |
1773 | + multiboot_uint8_t framebuffer_red_field_position; |
1774 | + multiboot_uint8_t framebuffer_red_mask_size; |
1775 | + multiboot_uint8_t framebuffer_green_field_position; |
1776 | + multiboot_uint8_t framebuffer_green_mask_size; |
1777 | + multiboot_uint8_t framebuffer_blue_field_position; |
1778 | + multiboot_uint8_t framebuffer_blue_mask_size; |
1779 | + }; |
1780 | + }; |
1781 | +}; |
1782 | +typedef struct multiboot_info multiboot_info_t; |
1783 | + |
1784 | +struct multiboot_mmap_entry |
1785 | +{ |
1786 | + multiboot_uint32_t size; |
1787 | + multiboot_uint64_t addr; |
1788 | + multiboot_uint64_t len; |
1789 | +#define MULTIBOOT_MEMORY_AVAILABLE 1 |
1790 | +#define MULTIBOOT_MEMORY_RESERVED 2 |
1791 | + multiboot_uint32_t type; |
1792 | +} __attribute__((packed)); |
1793 | +typedef struct multiboot_mmap_entry multiboot_memory_map_t; |
1794 | + |
1795 | +struct multiboot_mod_list |
1796 | +{ |
1797 | + /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ |
1798 | + multiboot_uint32_t mod_start; |
1799 | + multiboot_uint32_t mod_end; |
1800 | + |
1801 | + /* Module command line */ |
1802 | + multiboot_uint32_t cmdline; |
1803 | + |
1804 | + /* padding to take it to 16 bytes (must be zero) */ |
1805 | + multiboot_uint32_t pad; |
1806 | +}; |
1807 | +typedef struct multiboot_mod_list multiboot_module_t; |
1808 | + |
1809 | +#endif /* ! ASM_FILE */ |
1810 | + |
1811 | +#endif /* ! MULTIBOOT_HEADER */ |
1812 | |
1813 | === modified file 'precomp.bin' |
1814 | Binary files precomp.bin 2009-11-09 17:09:57 +0000 and precomp.bin 2010-06-27 17:51:29 +0000 differ |
1815 | === modified file 'test.h' |
1816 | --- test.h 2009-09-29 23:40:15 +0000 |
1817 | +++ test.h 2010-06-27 17:51:29 +0000 |
1818 | @@ -14,9 +14,9 @@ |
1819 | #define E801 0x04 |
1820 | #define E820NR 0x08 /* # entries in E820MAP */ |
1821 | #define E820MAP 0x0c /* our map */ |
1822 | -#define E820MAX 32 /* number of entries in E820MAP */ |
1823 | +#define E820MAX 64 /* number of entries in E820MAP */ |
1824 | #define E820ENTRY_SIZE 20 |
1825 | -#define MEMINFO_SIZE 0x28c |
1826 | +#define MEMINFO_SIZE (E820MAP + E820MAX * E820ENTRY_SIZE) |
1827 | #define MAX_DMI_MEMDEVS 16 |
1828 | |
1829 | #ifndef __ASSEMBLY__ |
1830 | @@ -106,6 +106,7 @@ |
1831 | void *memmove(void *dest, const void *src, ulong n); |
1832 | int query_linuxbios(void); |
1833 | int query_pcbios(void); |
1834 | +int query_multiboot(void); |
1835 | int insertaddress(ulong); |
1836 | void printpatn(void); |
1837 | void printpatn(void); |
1838 | @@ -269,6 +270,22 @@ |
1839 | long pwrcap; |
1840 | long ext; |
1841 | long feature_flag; |
1842 | + long dcache0_eax; |
1843 | + long dcache0_ebx; |
1844 | + long dcache0_ecx; |
1845 | + long dcache0_edx; |
1846 | + long dcache1_eax; |
1847 | + long dcache1_ebx; |
1848 | + long dcache1_ecx; |
1849 | + long dcache1_edx; |
1850 | + long dcache2_eax; |
1851 | + long dcache2_ebx; |
1852 | + long dcache2_ecx; |
1853 | + long dcache2_edx; |
1854 | + long dcache3_eax; |
1855 | + long dcache3_ebx; |
1856 | + long dcache3_ecx; |
1857 | + long dcache3_edx; |
1858 | }; |
1859 | |
1860 | struct xadr { |
1861 | @@ -335,6 +352,7 @@ |
1862 | #define FIRMWARE_UNKNOWN 0 |
1863 | #define FIRMWARE_PCBIOS 1 |
1864 | #define FIRMWARE_LINUXBIOS 2 |
1865 | +#define FIRMWARE_MULTIBOOT 3 |
1866 | |
1867 | extern struct vars * const v; |
1868 | extern unsigned char _start[], _end[], startup_32[]; |