vbatts/elilo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

release 3.16

Browse source 
https://sourceforge.net/projects/elilo/files/elilo/elilo-3.16/
This commit is contained in:
Stephane Eranian 2013-03-29 09:49:53 -04:00 • committed by Vincent Batts
parent 82f7288853
commit 2b5c5002e1
21 changed files with 708 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ia32/Makefile
View file

@ -23,10 +23,15 @@
# to use this program.
#
include ../Make.defaults
include ../Make.rules
SRCDIR = .
VPATH = $(SRCDIR)
include $(SRCDIR)/../Make.defaults
include $(SRCDIR)/../Make.rules
TOPDIR=$(SRCDIR)/..
TOPDIR=$(CDIR)/..
FILES=system.o config.o bzimage.o plain_loader.o gzip_loader.o gzip.o
@ -37,13 +42,13 @@ all: $(TARGET)
system.o: rmswitch.h
rmswitch.h: bin_to_h.c rmswitch.S
$(CC) -o bin_to_h bin_to_h.c
$(AS) -o rmswitch.o rmswitch.S
$(CC) -o bin_to_h $(SRCDIR)/bin_to_h.c
$(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S
$(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o
./bin_to_h <rmswitch >rmswitch.h
$(TARGET): $(FILES)
$(LD) -r -o $@ $(FILES)
$(LD) $(LD3264) -r -o $@ $(FILES)
clean:
$(RM) -f $(TARGET) $(FILES)

18
ia32/system.c
View file

@ -207,19 +207,8 @@ static INTN get_video_info(boot_params_t * bp) {
(VOID **)Gop_handle);
if (EFI_ERROR(efi_status) && efi_status != EFI_BUFFER_TOO_SMALL) {
Print(L"LocateHandle GopProtocol failed.\n");
Print(L"--Either no graphics head is installed,\n" \
"--efi console is set to serial, or,\n" \
"--the EFI firmware version of this machine is\n" \
"--older than UEFI 2.0. and does not support GOP");
Print(L"you can SAFELY IGNORE this error. elilo will\n" \
"default to text-mode.\n Alternatively you can " \
"now force text mode by setting config variable\n" \
"text_mode=1 for x86 in elilo.conf or via cmdline.\n\n");
Print(L"However if this is the last text output you see\n" \
"ensure that your kernel console command line\n " \
"variable matches up with the actual efi boot menu\n" \
"console output settings. for example efi console\n\n");
Print(L"EFI returned no GoP handle, No Graphics Output Device?\n");
Print(L"--Elilo will try to default to console text mode.\n");
return -1;
}
Gop_handle = alloc(size, 0);
@ -488,9 +477,6 @@ sysdeps_create_boot_params(
*/
if (param_start != NULL) {
CopyMem(bp, param_start, 0x2000);
free(param_start);
param_start = NULL;
param_size = 0;
}
/*
* Save off our header revision information.