diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2017-10-25 18:55:04 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2017-10-25 18:55:04 +0000 |
| commit | 7562d7ddbd91976a746f57af61dbd3e5a9f28faa (patch) | |
| tree | 23220114511ec32fb680d812e817ed74c8f9c22b /sys/boot/efi | |
| parent | 3de0952fba9607fbcad3009366bc9c4d9c899b27 (diff) | |
Notes
Diffstat (limited to 'sys/boot/efi')
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 1 | ||||
| -rw-r--r-- | sys/boot/efi/loader/arch/amd64/Makefile.inc | 1 | ||||
| -rw-r--r-- | sys/boot/efi/loader/bootinfo.c | 7 | ||||
| -rw-r--r-- | sys/boot/efi/loader/framebuffer.c (renamed from sys/boot/efi/loader/arch/amd64/framebuffer.c) | 0 | ||||
| -rw-r--r-- | sys/boot/efi/loader/framebuffer.h (renamed from sys/boot/efi/loader/arch/amd64/framebuffer.h) | 0 |
5 files changed, 5 insertions, 4 deletions
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 9db19fb8d538..47c7a630227a 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -22,6 +22,7 @@ SRCS= autoload.c \ conf.c \ copy.c \ efi_main.c \ + framebuffer.c \ main.c \ self_reloc.c \ smbios.c \ diff --git a/sys/boot/efi/loader/arch/amd64/Makefile.inc b/sys/boot/efi/loader/arch/amd64/Makefile.inc index 071afa100611..d41977d59690 100644 --- a/sys/boot/efi/loader/arch/amd64/Makefile.inc +++ b/sys/boot/efi/loader/arch/amd64/Makefile.inc @@ -2,7 +2,6 @@ SRCS+= amd64_tramp.S \ start.S \ - framebuffer.c \ elf64_freebsd.c \ trap.c \ exc.S diff --git a/sys/boot/efi/loader/bootinfo.c b/sys/boot/efi/loader/bootinfo.c index bd4b3ee86217..ca06a6194f8d 100644 --- a/sys/boot/efi/loader/bootinfo.c +++ b/sys/boot/efi/loader/bootinfo.c @@ -48,9 +48,10 @@ __FBSDID("$FreeBSD$"); #if defined(__amd64__) #include <machine/specialreg.h> -#include "framebuffer.h" #endif +#include "framebuffer.h" + #if defined(LOADER_FDT_SUPPORT) #include <fdt_platform.h> #endif @@ -247,12 +248,12 @@ bi_load_efi_data(struct preloaded_file *kfp) UINT32 mmver; struct efi_map_header *efihdr; -#if defined(__amd64__) +#if defined(__amd64__) || defined(__aarch64__) struct efi_fb efifb; if (efi_find_framebuffer(&efifb) == 0) { printf("EFI framebuffer information:\n"); - printf("addr, size 0x%lx, 0x%lx\n", efifb.fb_addr, + printf("addr, size 0x%jx, 0x%jx\n", efifb.fb_addr, efifb.fb_size); printf("dimensions %d x %d\n", efifb.fb_width, efifb.fb_height); diff --git a/sys/boot/efi/loader/arch/amd64/framebuffer.c b/sys/boot/efi/loader/framebuffer.c index 37999ea1d372..37999ea1d372 100644 --- a/sys/boot/efi/loader/arch/amd64/framebuffer.c +++ b/sys/boot/efi/loader/framebuffer.c diff --git a/sys/boot/efi/loader/arch/amd64/framebuffer.h b/sys/boot/efi/loader/framebuffer.h index 2ec9017dc3ee..2ec9017dc3ee 100644 --- a/sys/boot/efi/loader/arch/amd64/framebuffer.h +++ b/sys/boot/efi/loader/framebuffer.h |