kotovalexarian-likes-gitlab/bztsrc--bootboot
1
0
Fork 0
mirror of https://gitlab.com/bztsrc/bootboot.git synced 2023-02-13 20:54:32 -05:00
Code Releases Activity

Optional memory scan on UEFI, fixed issue #19

Browse source
This commit is contained in:
bzt 2020-09-02 11:35:56 +02:00
parent 563a4a1aba
commit c03ac0fca8
11 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bootboot_spec_1_kiad.pdf
View file

Binary file not shown.

BIN
bootboot_spec_1st_ed.pdf
View file

Binary file not shown.

BIN
dist/bootboot.efi vendored
View file

Binary file not shown.

BIN
dist/bootboot.rom vendored
View file

Binary file not shown.

BIN
images/disk-x86.img.gz
View file

Binary file not shown.

BIN
mkbootimg-Linux.zip
View file

Binary file not shown.

2
mkbootimg/data.c
View file

File diff suppressed because one or more lines are too long

2
mkbootimg/data.h
View file

@ -2,7 +2,7 @@
extern unsigned char binary_boot_bin[512]; extern unsigned char binary_boot_bin[512];
extern unsigned char binary_bootboot_bin[11776]; extern unsigned char binary_bootboot_bin[11776];
extern unsigned char binary_bootboot_efi[95926]; extern unsigned char binary_bootboot_efi[96950];
extern unsigned char binary_bootboot_img[34616]; extern unsigned char binary_bootboot_img[34616];
extern unsigned char binary_LICENCE_broadcom[1594]; extern unsigned char binary_LICENCE_broadcom[1594];
extern unsigned char binary_bootcode_bin[52480]; extern unsigned char binary_bootcode_bin[52480];

2
x86_64-efi/OLVASSEL.md
View file

@ -43,7 +43,7 @@ DESCRIPTION
Additional "key=value" command line arguments will be appended to the Additional "key=value" command line arguments will be appended to the
environment. If INITRD not found, it will use the first bootable partition environment. If INITRD not found, it will use the first bootable partition
in GPT. If CONFIG not found, it will look for /sys/config inside the in GPT. If CONFIG not found, it will look for /sys/config inside the
INITRD (or partition). INITRD (or partition). With -s it will scan the memory for an initrd ROM.
As this is a loader, it is not supposed to return control to the shell. As this is a loader, it is not supposed to return control to the shell.

4
x86_64-efi/README.md
View file

@ -33,7 +33,7 @@ FS0:\> EFI\BOOT\BOOTX64.EFI /?
BOOTBOOT LOADER (build Oct 11 2017) BOOTBOOT LOADER (build Oct 11 2017)
SYNOPSIS SYNOPSIS
BOOTBOOT.EFI [ -h | -? | /h | /? ] [ INITRDFILE [ ENVIRONMENTFILE [...] ] ] BOOTBOOT.EFI [ -h | -? | /h | /? | -s ] [ INITRDFILE [ ENVIRONFILE [...] ] ]
DESCRIPTION DESCRIPTION
Bootstraps an operating system via the BOOTBOOT Protocol. Bootstraps an operating system via the BOOTBOOT Protocol.
@ -43,7 +43,7 @@ DESCRIPTION
Additional "key=value" command line arguments will be appended to the Additional "key=value" command line arguments will be appended to the
environment. If INITRD not found, it will use the first bootable partition environment. If INITRD not found, it will use the first bootable partition
in GPT. If CONFIG not found, it will look for /sys/config inside the in GPT. If CONFIG not found, it will look for /sys/config inside the
INITRD (or partition). INITRD (or partition). With -s it will scan the memory for an initrd ROM.
As this is a loader, it is not supposed to return control to the shell. As this is a loader, it is not supposed to return control to the shell.

15
x86_64-efi/bootboot.c
View file

@ -1353,8 +1353,8 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
MMapEnt *mmapent, *last=NULL; MMapEnt *mmapent, *last=NULL;
file_t ret={NULL,0}; file_t ret={NULL,0};
CHAR16 **argv, *initrdfile, *configfile, *help= CHAR16 **argv, *initrdfile, *configfile, *help=
L"SYNOPSIS\n BOOTBOOT.EFI [ -h | -? | /h | /? ] [ INITRDFILE [ ENVIRONMENTFILE [...] ] ]\n\nDESCRIPTION\n Bootstraps an operating system via the BOOTBOOT Protocol.\n If arguments not given, defaults to\n FS0:\\BOOTBOOT\\INITRD as ramdisk image and\n FS0:\\BOOTBOOT\\CONFIG for boot environment.\n Additional \"key=value\" command line arguments will be appended to the\n environment. If INITRD not found, it will use the first bootable partition\n in GPT. If CONFIG not found, it will look for /sys/config inside the\n INITRD (or partition).\n\n As this is a loader, it is not supposed to return control to the shell.\n\n"; L"SYNOPSIS\n BOOTBOOT.EFI [ -h | -? | /h | /? | -s ] [ INITRDFILE [ ENVIRONFILE [...] ] ]\n\nDESCRIPTION\n Bootstraps an operating system via the BOOTBOOT Protocol.\n If arguments not given, defaults to\n FS0:\\BOOTBOOT\\INITRD as ramdisk image and\n FS0:\\BOOTBOOT\\CONFIG for boot environment.\n Additional \"key=value\" command line arguments will be appended to the\n environment. If INITRD not found, it will use the first bootable partition\n in GPT. If CONFIG not found, it will look for /sys/config inside the\n INITRD (or partition). With -s it will scan the memory for an initrd ROM.\n\n As this is a loader, it is not supposed to return control to the shell.\n\n";
INTN argc; INTN argc, scanmemory=0;
// Initialize UEFI Library // Initialize UEFI Library
InitializeLib(image, systab); InitializeLib(image, systab);
@ -1369,6 +1369,11 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
Print(L"BOOTBOOT LOADER (build %s)\n\n%s",a2u(__DATE__),help); Print(L"BOOTBOOT LOADER (build %s)\n\n%s",a2u(__DATE__),help);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
if(argv[1][0]=='-'||argv[1][0]=='s') {
argc--; argv++; scanmemory = 1;
}
}
if(argc>1) {
initrdfile=argv[1]; initrdfile=argv[1];
} else { } else {
initrdfile=L"\\BOOTBOOT\\INITRD"; initrdfile=L"\\BOOTBOOT\\INITRD";
@ -1414,7 +1419,7 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
} }
} }
//if not found, scan memory //if not found, scan memory
if(EFI_ERROR(status) || initrd.ptr==NULL){ if(scanmemory && (EFI_ERROR(status) || initrd.ptr==NULL)){
status = uefi_call_wrapper(BS->GetMemoryMap, 5, status = uefi_call_wrapper(BS->GetMemoryMap, 5,
&memory_map_size, memory_map, NULL, &desc_size, NULL); &memory_map_size, memory_map, NULL, &desc_size, NULL);
if (status!=EFI_BUFFER_TOO_SMALL || memory_map_size==0) { if (status!=EFI_BUFFER_TOO_SMALL || memory_map_size==0) {
@ -1436,11 +1441,11 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *systab)
if(mement==NULL || (mement->PhysicalStart==0 && mement->NumberOfPages==0)) if(mement==NULL || (mement->PhysicalStart==0 && mement->NumberOfPages==0))
break; break;
// skip free and ACPI memory // skip free and ACPI memory
if(mement->Type==7||mement->Type==9||mement->Type==10) if(mement->Type==7||(mement->Type>=9&&mement->Type<=13))
continue; continue;
// according to spec, EFI Option ROMs must start on 512 bytes boundary, not 2048 // according to spec, EFI Option ROMs must start on 512 bytes boundary, not 2048
for(ret.ptr=(UINT8*)mement->PhysicalStart; for(ret.ptr=(UINT8*)mement->PhysicalStart;
ret.ptr<(UINT8*)mement->PhysicalStart+mement->NumberOfPages*PAGESIZE; ret.ptr+512<(UINT8*)mement->PhysicalStart+mement->NumberOfPages*PAGESIZE;
ret.ptr+=512) { ret.ptr+=512) {
if(ret.ptr[0]==0x55 && ret.ptr[1]==0xAA && !CompareMem(ret.ptr+8,(const CHAR8 *)"INITRD",6)) { if(ret.ptr[0]==0x55 && ret.ptr[1]==0xAA && !CompareMem(ret.ptr+8,(const CHAR8 *)"INITRD",6)) {
CopyMem(&initrd.size,ret.ptr+16,4); CopyMem(&initrd.size,ret.ptr+16,4);