diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2018-04-11 22:02:19 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2018-04-16 22:38:52 +0800 |
| commit | 447ae4f7adb2c667eec1e0861e2346694c57a2e0 (patch) | |
| tree | 7b3534e1445335105f1d9f9d87c27c2d2e2f3a99 /cmd | |
| parent | 611309383d19ec806bdf38bea70fc2d7636ae64f (diff) | |
| download | u-boot-447ae4f7adb2c667eec1e0861e2346694c57a2e0.tar.gz u-boot-447ae4f7adb2c667eec1e0861e2346694c57a2e0.tar.xz u-boot-447ae4f7adb2c667eec1e0861e2346694c57a2e0.zip | |
bootvx: x86: Make VxWorks EFI console driver happy
When booting from EFI BIOS, VxWorks bootloader stores the EFI GOP
framebuffer info at a pre-defined offset @ 0x6100. When VxWorks
kernel boots up, its EFI console driver tries to find such a block
and if the signature matches, the framebuffer information will be
used to initialize the driver.
However it is not necessary to prepare an EFI environment for
VxWorks's EFI console driver to function (eg: EFI loader in
U-Boot). If U-Boot has already initialized the graphics card and
set it to a VESA mode that is compatible with EFI GOP, we can
simply prepare such a block for VxWorks.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/elf.c | 19 |
1 files changed, 19 insertions, 0 deletions
@@ -20,6 +20,7 @@ #include <net.h> #include <vxworks.h> #ifdef CONFIG_X86 +#include <vbe.h> #include <asm/e820.h> #include <linux/linkage.h> #endif @@ -254,6 +255,8 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong base; struct e820_info *info; struct e820_entry *data; + struct efi_gop_info *gop; + struct vesa_mode_info *vesa = &mode_info.vesa; #endif /* @@ -397,6 +400,22 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * available memory size for the kernel is insane. */ *(u32 *)(base + BOOT_IMAGE_SIZE_OFFSET) = 0; + + /* + * Prepare compatible framebuffer information block. + * The VESA mode has to be 32-bit RGBA. + */ + if (vesa->x_resolution && vesa->y_resolution) { + gop = (struct efi_gop_info *)(base + EFI_GOP_INFO_OFFSET); + gop->magic = EFI_GOP_INFO_MAGIC; + gop->info.version = 0; + gop->info.width = vesa->x_resolution; + gop->info.height = vesa->y_resolution; + gop->info.pixel_format = EFI_GOT_RGBA8; + gop->info.pixels_per_scanline = vesa->bytes_per_scanline / 4; + gop->fb_base = vesa->phys_base_ptr; + gop->fb_size = vesa->bytes_per_scanline * vesa->y_resolution; + } #endif /* |