Merge tag 'u-boot-rockchip-20191124' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / include / vxworks.h

diff --git a/include/vxworks.h b/include/vxworks.h
index 4a83a34dfbabc8b97fb0e5910ed807782e2d7954..1a29509460b63df62b8b536bf4d3c62f7b6f123a 100644 (file)
--- a/include/vxworks.h
+++ b/include/vxworks.h
@@ -1,19 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008
  * Niklaus Giger, niklaus.giger@member.fsf.org
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _VXWORKS_H_
 #define _VXWORKS_H_
 
+#include <efi_api.h>
+
 /*
  * Physical address of memory base for VxWorks x86
  * This is LOCAL_MEM_LOCAL_ADRS in the VxWorks kernel configuration.
  */
 #define VXWORKS_PHYS_MEM_BASE  0x100000
 
+/* x86 bootline offset relative to LOCAL_MEM_LOCAL_ADRS in VxWorks */
+#define X86_BOOT_LINE_OFFSET   0x1200
+
 /*
  * VxWorks x86 E820 related stuff
  *
@@ -52,9 +56,32 @@ struct e820_info {
  */
 #define BOOT_IMAGE_SIZE_OFFSET 0x5004
 
+/*
+ * 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.
+ */
+#define EFI_GOP_INFO_OFFSET    0x6100
+
+/* EFI GOP info signatiure */
+#define EFI_GOP_INFO_MAGIC     0xfeedface
+
+struct efi_gop_info {
+       u32 magic;                      /* signature */
+       struct efi_gop_mode_info info;  /* EFI GOP mode info structure */
+       phys_addr_t fb_base;            /* framebuffer base address */
+       u32 fb_size;                    /* framebuffer size */
+};
+
 int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 void boot_prep_vxworks(bootm_headers_t *images);
 void boot_jump_vxworks(bootm_headers_t *images);
-void do_bootvx_fdt(bootm_headers_t *images);
 
 #endif