diff options
author | Francis Rowe <info@gluglug.org.uk> | 2014-09-03 18:13:00 +0000 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2014-09-03 20:22:56 +0200 |
commit | 9a321884379a71b5f0986fdfb97a2b6c5bdccd8a (patch) | |
tree | 7a89b0126c7572c39b00a133dc3bb43d00349871 /resources/memtest86 | |
parent | d2ebc60a339b66fe067ebc244ef31c600d57d541 (diff) |
Libreboot release 6 beta 6.
- Added modified builddeb* scripts for Parabola GNU/Linux-libre:
buildpac, buildpac-flashrom, buildpac-bucts (courtesy of Noah
Vesely)
- Documentation: updated all relevant areas to mention use of
buildpac* scripts for Parabola users.
- Documentation: added information showing how to enable or disable
bluetooth on the X60
- MacBook1,1 tested! See ../docs/index.html#macbook11"
- Documentation: fixed typo in ../docs/index.html#get_edid_panelname
(get-edit changed to get-edid)
- Documentation: added ../docs/howtos/x60_lcd_change/ (pics only for
now)
- Added gcry_serpent and gcry_whirlpool to the GRUB module list in the
'build' script (for luks users)
- Libreboot is now based on a new coreboot version from August 23rd,
2014:
Merged commits (relates to boards that were already supported in libreboot):
- http://review.coreboot.org/#/c/6697/
- http://review.coreboot.org/#/c/6698/ (merged already)
- http://review.coreboot.org/#/c/6699/ (merged already)
- http://review.coreboot.org/#/c/6696/ (merged already)
- http://review.coreboot.org/#/c/6695/ (merged already)
- http://review.coreboot.org/#/c/5927/ (merged already)
- http://review.coreboot.org/#/c/6717/ (merged already)
- http://review.coreboot.org/#/c/6718/ (merged already)
- http://review.coreboot.org/#/c/6723/ (merged already) (text-mode
patch, might enable memtest. macbook21)
- http://review.coreboot.org/#/c/6732/ (MERGED) (remove useless ps/2
keyboard delay from macbook21. already merged)
- These were also merged in coreboot (relates to boards that libreboot
already supported):
- http://review.coreboot.org/#/c/5320/ (merged)
- http://review.coreboot.org/#/c/5321/ (merged)
- http://review.coreboot.org/#/c/5323/ (merged)
- http://review.coreboot.org/#/c/6693/ (merged)
- http://review.coreboot.org/#/c/6694/ (merged)
- http://review.coreboot.org/#/c/5324/ (merged)
- Documentation: removed the section about tft_brightness on X60 (new
code makes it obsolete)
- Removed all patches from resources/libreboot/patch/ and added new
patch: 0000_t60_textmode.git.diff
- Updated getcb script and DEBLOB script.
- Updated configuration files under resources/libreboot/config/ to
accomodate new coreboot version.
- Removed grub_serial*.cfg and libreboot_serial*.rom, all
configs/rom's are now unified (containing same configuration as
serial rom's from before).
- Documentation: updated ../docs/index.html#rom to reflect the above.
- Updated GRUB to new version from August 14th, 2014.
- Unified all grub configurations for all machines to a single
grub.cfg under resources/grub/config/
- Updated flashrom to new version from August 20th, 2014
- Added getseabios and builddeps-seabios (builddeps and getall were
also updated)
- Added instructions to 'buildrom-withgrub' to include bios.bin.elf
and vgaroms/vgabios.bin from SeaBIOS inside the ROM.
- Added seabios (and sgavgabios) to grub as payload option in menu
- Disabled serial output in Memtest86+ (no longer needed) to speed up
tests.
- MemTest86+ now works properly, it can output on the laptop screen
(no serial port needed anymore).
- Added getgrubinvaders, builddeps-grubinvaders scripts. Added these
to getall and builddeps.
- Added GRUB Invaders menu entry in resources/grub/config/grub.cfg
- Added rules to builddeps-coreboot to build libpayload with
TinyCurses. (added appropriate instructions to cleandeps script).
- Commented out lines in resources/grub/config/grub.cfg for loading
font/background (not useful anymore, now that GRUB is in text-mode).
- Commented out lines in buildrom-withgrub that included
backgrounds/fonts (not useful anymore, now that GRUB is in
text-mode).
- Added resources/utilities/i945-pwm/ (from
git://git.mtjm.eu/i945-pwm), for debugging acpi brightness on i945
machines.
- Added instructions for it in builddeps, builddeps-i945pwm,
builddeb and cleandeps
- 'build' script: removed the parts that generated sha512sum manifests
(not needed, since release tarballs are GPG-signed)
- 'build' script: removed the parts that generated libreboot_meta
directory (not needed anymore, since _meta will be hosted in git)
- Updated ../docs/index.html#build_meta (and other parts of
documentation) to accomodate this change.
- Documentation: simplified (refactored) the notes in
../docs/index.html#rom
- 'build' script: removed the parts that generated libreboot_bin and
added them to a new script: 'build-release'
- Documentation: ../docs/index.html#build updated to reflect the
above.
- Removed 'sudo' from builddeb, builddeb-flashrom, powertop.trisquel6
and builddeb-bucts scripts (assuming that the user has it is a
really bad idea).
- Added all gcry_* modules to grub (luks/cryptomount): gcry_arcfour
gcry_camellia gcry_crc gcry_dsa gcry_md4 gcry_rfc2268 gcry_rmd160
gcry_seed gcry_sha1 gcry_sha512 gcry_twofish gcry_blowfish
gcry_cast5 gcry_des gcry_idea gcry_md5 gcry_rijndael gcry_rsa
gcry_serpent gcry_sha256 gcry_tiger gcry_whirlpool
- Added GNUtoo's list of GRUB modules (includes all of the gcry_*
modules above), cryptomount should be working now.
- Removed builddeb-bucts and builddeb-flashrom, merged them with
builddeb (../docs/index.html updated accordingly)
- Removed buildpac-bucts and buildpac-flashrom, merged them with
buildpac (../docs/index.html updated accordingly)
- Renamed builddeb to deps-trisquel (../docs/index.html updated
accordingly)
- Renamed buildpac to deps-parabola (../docs/index.html updated
accordingly)
- Documentation: removed all parts talking about build dependencies,
replaced them with links to ../docs/index.html#build_dependencies
- Documentation: emphasized more strongly on the documentation, the
need to re-build bucts and/or flashrom before flashing a ROM image.
- build-release: flashrom, nvramtool, cbfstool and bucts are no longer
provided pre-compiled in binary archives, and are now in source form
only. (to maximize distro compatibility).
- Documentation: added ../docs/howtos/encrypted_trisquel.html showing
how to setup a fully encrypted Trisquel installation (including
/boot) and boot it from the GRUB payload.
- 'build' script: replaced grub.elf assembly instructons, it's now
handled by a utility added under resources/utilities/grub-assemble
- Moved resources/grub/keymap to
resources/utilities/grub-assemble/keymap, and updated that utility
to use it
- Documentation: removed useless links to pictures of keyboard layouts
and unmodified layouts.
- Removed all unused fonts from dejavu-fonts-ttf-2.34/ directory
- 'buildrom-withgrub' script: updated it to create 2 sets of ROM's for
each machine: one with text-mode, one with coreboot framebuffer.
- Documentation: updated ../docs/index.html#rom to reflect the above
- Deleted unused README and COPYING file from main directory
- Removed some rm -rf .git* instructions from the get* scripts and
moved them to build-release script
- Split up default grub.cfg into 6 parts:
extra/{common.cfg,txtmode.cfg,vesafb.cfg} and
menuentries/{common.cfg,txtmode.cfg,vesafb.cfg}
- buildrom-withgrub script uses these to generate the correct
grub.cfg for each type of configuration.
- grub_memdisk.cfg (used inside grub.elf) now only loads grub.cfg from
cbfs. It no longer enables serial output or sets
prefix. (menuentries/common.cfg does instead)
- resources/grub/config/extra/common.cfg, added:
- insmod instructions to load those modules: nativedisk, ehci, ohci,
uhci, usb, usbserial_pl2303, usbserial_ftdi, usbserial_usbdebug
- set prefix=(memdisk)/boot/grub
- For native graphics (recommended by coreboot wiki):
- gfxpayload=keep
- terminal_output --append gfxterm
- Play a beep on startup:
- play 480 440 1
- Documentation: added note about 'fb=false' workaround for text-mode
debian-installer (Trisquel net install) to
../docs/howtos/grub_boot_installer.html
- Documentation: updated ../docs/howtos/grub_cbfs.html to make it
safer (and easier) to follow.
Diffstat (limited to 'resources/memtest86')
-rw-r--r-- | resources/memtest86/patch/Makefile | 81 | ||||
-rw-r--r-- | resources/memtest86/patch/config.h | 52 | ||||
-rw-r--r-- | resources/memtest86/patch/diff | 40 |
3 files changed, 133 insertions, 40 deletions
diff --git a/resources/memtest86/patch/Makefile b/resources/memtest86/patch/Makefile new file mode 100644 index 0000000..1a187b6 --- /dev/null +++ b/resources/memtest86/patch/Makefile @@ -0,0 +1,81 @@ +# Makefile for MemTest86+ +# +# Author: Chris Brady +# Created: January 1, 1996 + + +# +# Path for the floppy disk device +# +FDISK=/dev/fd0 + +AS=as -32 +CC=gcc + +CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector + +OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ + config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \ + smp.o vmem.o random.o + + +all: clean memtest.bin memtest +# scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus + +# Link it statically once so I know I don't have undefined +# symbols and then link it dynamically so I have full +# relocation information +memtest_shared: $(OBJS) memtest_shared.lds Makefile + $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \ + -o $@ $(OBJS) && \ + $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) + +memtest_shared.bin: memtest_shared + objcopy -O binary $< memtest_shared.bin + +memtest: memtest_shared.bin memtest.lds + $(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@ + +head.s: head.S config.h defs.h test.h + $(CC) -E -traditional $< -o $@ + +bootsect.s: bootsect.S config.h defs.h + $(CC) -E -traditional $< -o $@ + +setup.s: setup.S config.h defs.h + $(CC) -E -traditional $< -o $@ + +memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds + $(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \ + memtest_shared.bin -o memtest.bin + +reloc.o: reloc.c + $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c + +test.o: test.c + $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c + +random.o: random.c + $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c + +# rule for build number generation +build_number: + sh make_buildnum.sh + +clean: + rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \ + memtest_shared.bin memtest.iso + +iso: + make all + ./makeiso.sh + +install: all + dd <memtest.bin >$(FDISK) bs=8192 + +install-precomp: + dd <precomp.bin >$(FDISK) bs=8192 + +dos: all + cat mt86+_loader memtest.bin > memtest.exe diff --git a/resources/memtest86/patch/config.h b/resources/memtest86/patch/config.h new file mode 100644 index 0000000..10ac525 --- /dev/null +++ b/resources/memtest86/patch/config.h @@ -0,0 +1,52 @@ +/* + * MemTest86+ V5 Specific code (GPL V2.0) + * By Samuel DEMEULEMEESTER, sdemeule@memtest.org + * http://www.canardpc.com - http://www.memtest.org + * ------------------------------------------------ + * config.h - MemTest-86 Version 3.3 + * + * Compile time configuration options + * + * Released under version 2 of the Gnu Public License. + * By Chris Brady + */ + +/* CONSERVATIVE_SMP - If set to 0, SMP will be enabled by default */ +/* Might be enabled in future revision after extensive testing */ +/* In all cases, SMP is disabled by defaut on server platform */ +#define CONSERVATIVE_SMP 1 + +/* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */ +#define BEEP_MODE 1 + +/* BEEP_END_NO_ERROR - Beep at end of each pass without error. Default off, Change to 1 to enable */ +#define BEEP_END_NO_ERROR 0 + +/* PARITY_MEM - Enables support for reporting memory parity errors */ +/* Experimental, normally enabled */ +#define PARITY_MEM + +/* SERIAL_CONSOLE_DEFAULT - The default state of the serial console. */ +/* This is normally off since it slows down testing. Change to a 1 */ +/* to enable. */ +#define SERIAL_CONSOLE_DEFAULT 0 + +/* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */ +#define SERIAL_TTY 0 + +/* SERIAL_BAUD_RATE - Baud rate for the serial console */ +#define SERIAL_BAUD_RATE 115200 + +/* SCRN_DEBUG - extra check for SCREEN_BUFFER + */ +/* #define SCRN_DEBUG */ + +/* APM - Turns off APM at boot time to avoid blanking the screen */ +/* Normally enabled */ +#define APM_OFF + +/* USB_WAR - Enables a workaround for errors caused by BIOS USB keyboard */ +/* and mouse support*/ +/* Normally enabled */ +#define USB_WAR + diff --git a/resources/memtest86/patch/diff b/resources/memtest86/patch/diff deleted file mode 100644 index 0abd8d0..0000000 --- a/resources/memtest86/patch/diff +++ /dev/null @@ -1,40 +0,0 @@ -diff -rupN memtest86+-5.01_/config.h memtest86+-5.01/config.h ---- memtest86+-5.01_/config.h 2014-06-25 22:57:47.893476783 +0100 -+++ memtest86+-5.01/config.h 2014-06-25 22:59:01.269840630 +0100 -@@ -17,7 +17,7 @@ - #define CONSERVATIVE_SMP 1 - - /* BEEP_MODE - Beep on error. Default off, Change to 1 to enable */ --#define BEEP_MODE 0 -+#define BEEP_MODE 1 - - /* BEEP_END_NO_ERROR - Beep at end of each pass without error. Default off, Change to 1 to enable */ - #define BEEP_END_NO_ERROR 0 -@@ -29,13 +29,13 @@ - /* SERIAL_CONSOLE_DEFAULT - The default state of the serial console. */ - /* This is normally off since it slows down testing. Change to a 1 */ - /* to enable. */ --#define SERIAL_CONSOLE_DEFAULT 0 -+#define SERIAL_CONSOLE_DEFAULT 1 - - /* SERIAL_TTY - The default serial port to use. 0=ttyS0, 1=ttyS1 */ - #define SERIAL_TTY 0 - - /* SERIAL_BAUD_RATE - Baud rate for the serial console */ --#define SERIAL_BAUD_RATE 9600 -+#define SERIAL_BAUD_RATE 115200 - - /* SCRN_DEBUG - extra check for SCREEN_BUFFER - */ -diff -rupN memtest86+-5.01_/Makefile memtest86+-5.01/Makefile ---- memtest86+-5.01_/Makefile 2014-06-25 22:57:47.893476783 +0100 -+++ memtest86+-5.01/Makefile 2014-06-25 22:59:19.237929751 +0100 -@@ -21,7 +21,7 @@ OBJS= head.o reloc.o main.o test.o init. - - - all: clean memtest.bin memtest -- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus -+# scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus - - # Link it statically once so I know I don't have undefined - # symbols and then link it dynamically so I have full |