libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit d406f8beccb29e2eff4b62fae2dca59fa571ca44
parent 7c25df4580a8fcd763497214ee66c9e2e192a757
Author: Klemens Nanni <contact@autoboot.org>
Date:   Thu, 27 Aug 2015 18:20:49 +0200

Make memtest86plus be named consistently

Conflicts:
	resources/utilities/grub-assemble/gen.sh

Diffstat:
resources/memtest86/patch/COPYING | 6------
resources/memtest86/patch/Makefile | 81-------------------------------------------------------------------------------
resources/memtest86/patch/config.h | 52----------------------------------------------------
resources/memtest86plus/patch/COPYING | 6++++++
resources/memtest86plus/patch/Makefile | 81+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
resources/memtest86plus/patch/config.h | 52++++++++++++++++++++++++++++++++++++++++++++++++++++
resources/scripts/helpers/build/module/memtest86plus | 2+-
resources/scripts/helpers/download/memtest86plus | 10+++++++---
8 files changed, 147 insertions(+), 143 deletions(-)

diff --git a/resources/memtest86/patch/COPYING b/resources/memtest86/patch/COPYING @@ -1,6 +0,0 @@ -the "gitdiff" file is a patch for MemTest86+ so check that project's copyright information -to see what conditions apply. - -Look in ../../../docs/RELEASE.html for information about where to get libreboot_src.tar.gz -or libreboot_meta.tar.gz, both of which contain information about the version of MemTest86+ -used and where it came from. diff --git a/resources/memtest86/patch/Makefile b/resources/memtest86/patch/Makefile @@ -1,81 +0,0 @@ -# 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 @@ -1,52 +0,0 @@ -/* - * 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/memtest86plus/patch/COPYING b/resources/memtest86plus/patch/COPYING @@ -0,0 +1,6 @@ +the "gitdiff" file is a patch for MemTest86+ so check that project's copyright information +to see what conditions apply. + +Look in ../../../docs/RELEASE.html for information about where to get libreboot_src.tar.gz +or libreboot_meta.tar.gz, both of which contain information about the version of MemTest86+ +used and where it came from. diff --git a/resources/memtest86plus/patch/Makefile b/resources/memtest86plus/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/memtest86plus/patch/config.h b/resources/memtest86plus/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/scripts/helpers/build/module/memtest86plus b/resources/scripts/helpers/build/module/memtest86plus @@ -30,7 +30,7 @@ set -u -e printf "Building MemTest86+\n" -cd "memtest86+-5.01/" +cd "memtest86plus/1" # clean it first make clean diff --git a/resources/scripts/helpers/download/memtest86plus b/resources/scripts/helpers/download/memtest86plus @@ -4,6 +4,7 @@ # # Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> # Copyright (C) 2015 Joseph Michael Thompson <jmt@josepht.me> +# Copyright (C) 2015 Klemens Nanni <contact@autoboot.org> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -54,19 +55,22 @@ tar -xzf "memtest86+-5.01.tar.gz" # delete the tar file (no longer needed) rm -f "memtest86+-5.01.tar.gz" +# make direcotory name consistent +mv "memtest86+-5.01" "memtest86plus" + # there are modifications required -cd "memtest86+-5.01/" +cd "memtest86plus/" # Apply necessary patches # ------------------------------------------------------------------------------ # place the right config rm -f "config.h" -cp "../resources/memtest86/patch/config.h" . +cp "../resources/memtest86plus/patch/config.h" . # place the right Makefile rm -f "Makefile" -cp "../resources/memtest86/patch/Makefile" . +cp "../resources/memtest86plus/patch/Makefile" . # (diff them with defaults to see what changed)