video: Renname vbe.h to vesa.h

We want to use VBE to mean Verfiied Boot for Embedded in U-Boot. Rename
the existing VBE (Vesa BIOS extensions) to allow this.

Verified Boot for Embedded is documented doc/develop/vbe.rst

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c
index 98cc05de2eb5bf660b50d21351290aa301b290a4..087539ba7db24329e5cf805d743e7957b938e032 100644 (file)
--- a/arch/x86/lib/bios.c
+++ b/arch/x86/lib/bios.c
@@ -10,7 +10,7 @@
 #include <bios_emul.h>
 #include <irq_func.h>
 #include <log.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <linux/linkage.h>
 #include <asm/cache.h>
 #include <asm/processor.h>

diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c
index 6eab0452fda63248a8a272e522cbff427c40d6cd..05519d851a9d65b1c133252b3f45cb75b0dd5045 100644 (file)
--- a/arch/x86/lib/coreboot_table.c
+++ b/arch/x86/lib/coreboot_table.c
@@ -6,7 +6,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <acpi/acpi_s3.h>
 #include <asm/coreboot_tables.h>
 #include <asm/e820.h>

diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index 02fd05c9fafd5e2bede3a97268e7ac9a8c6f8649..6a7552e6956ac8578abb2f68700e6eacda511897 100644 (file)
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -9,7 +9,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <video.h>
 #include <acpi/acpi_table.h>
 #include <asm/fsp/fsp_support.h>

diff --git a/cmd/elf.c b/cmd/elf.c
index 2b33c50bd026b31ea359d323d783a44d89e8a2a1..ce40d3f72a7c9c67e21c8e385e0107b1dbfd7a13 100644 (file)
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -14,7 +14,7 @@
 #include <net.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
-#include <vbe.h>
+#include <vesa.h>
 #include <asm/cache.h>
 #include <asm/e820.h>
 #include <linux/linkage.h>

diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index cdc5ba6ad908222eac02d58f7f458cf79c121f70..09da76bc5d92436e40bb125f2e6231a412ff3fb2 100644 (file)
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -51,7 +51,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <linux/delay.h>
 #include "biosemui.h"
 

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 73d15e797fc58324289cc4030174fd8143df8bd4..ceeb59d1fe4cca4a6cf06ac5094f75aff28d3704 100644 (file)
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -34,7 +34,7 @@
 #include <malloc.h>
 #include <pci.h>
 #include <pci_rom.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <video.h>
 #include <acpi/acpi_s3.h>
 #include <asm/global_data.h>

diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 2551f162e8f92ae9a62f3438d876cdb7ab00d045..81f0fd8c01984a96ba9a9be09388b36a1564a6cf 100644 (file)
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -11,7 +11,7 @@
 #include <dm.h>
 #include <init.h>
 #include <log.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <video.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>

diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c
index 7237542c0765f35d7cb8a969042c0cb959831fa9..3efc65daa2bd5aef25a14b00e5989e2fc0dfc92e 100644 (file)
--- a/drivers/video/coreboot.c
+++ b/drivers/video/coreboot.c
@@ -6,7 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <init.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <video.h>
 #include <asm/cb_sysinfo.h>
 

diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index 5f9031f2ec56bf6b59b4870120118c21bf4829bc..d60b6e27569490d5a0a0ff5a5d2d3f66dd310af6 100644 (file)
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -9,7 +9,7 @@
 #include <dm.h>
 #include <efi_api.h>
 #include <log.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <video.h>
 
 struct pixel {

diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 1aa5317dd5f3ac4e3bb9db2ae4227b71f5cb2af6..18672a1897363835120f5c3b0fa6ee2572163baf 100644 (file)
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -10,7 +10,7 @@
 #include <fdtdec.h>
 #include <log.h>
 #include <pci_rom.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <video.h>
 #include <asm/global_data.h>
 #include <asm/intel_regs.h>

diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c
index 869e54697328cc172913050d1567e97af936640e..91da939e59b7ef37b8d4ae98a920859384a519b6 100644 (file)
--- a/drivers/video/vesa.c
+++ b/drivers/video/vesa.c
@@ -7,7 +7,7 @@
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
-#include <vbe.h>
+#include <vesa.h>
 #include <video.h>
 #include <asm/mtrr.h>
 

diff --git a/include/vbe.h b/include/vbe.h
deleted file mode 100644 (file)
index 1631260..0000000
--- a/include/vbe.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
-/******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation
- * Copyright (c) 2009 Pattrick Hueper <phueper@hueper.net>
- * All rights reserved.
- *
- * Contributors:
- *     IBM Corporation - initial implementation
- *****************************************************************************/
-#ifndef _VBE_H
-#define _VBE_H
-
-/* these structs are for input from and output to OF */
-struct __packed vbe_screen_info {
-       u8 display_type;        /* 0=NONE, 1= analog, 2=digital */
-       u16 screen_width;
-       u16 screen_height;
-       /* bytes per line in framebuffer, may be more than screen_width */
-       u16 screen_linebytes;
-       u8 color_depth; /* color depth in bits per pixel */
-       u32 framebuffer_address;
-       u8 edid_block_zero[128];
-};
-
-struct __packed vbe_screen_info_input {
-       u8 signature[4];
-       u16 size_reserved;
-       u8 monitor_number;
-       u16 max_screen_width;
-       u8 color_depth;
-};
-
-/* these structs only store the required a subset of the VBE-defined fields */
-struct __packed vbe_info {
-       char signature[4];
-       u16 version;
-       u32 oem_string_ptr;
-       u32 capabilities;
-       u32 modes_ptr;
-       u16 total_memory;
-       u16 oem_version;
-       u32 vendor_name_ptr;
-       u32 product_name_ptr;
-       u32 product_rev_ptr;
-};
-
-struct __packed vesa_mode_info {
-       u16 mode_attributes;    /* 00 */
-       u8 win_a_attributes;    /* 02 */
-       u8 win_b_attributes;    /* 03 */
-       u16 win_granularity;    /* 04 */
-       u16 win_size;           /* 06 */
-       u16 win_a_segment;      /* 08 */
-       u16 win_b_segment;      /* 0a */
-       u32 win_func_ptr;       /* 0c */
-       u16 bytes_per_scanline; /* 10 */
-       u16 x_resolution;       /* 12 */
-       u16 y_resolution;       /* 14 */
-       u8 x_charsize;          /* 16 */
-       u8 y_charsize;          /* 17 */
-       u8 number_of_planes;    /* 18 */
-       u8 bits_per_pixel;      /* 19 */
-       u8 number_of_banks;     /* 20 */
-       u8 memory_model;        /* 21 */
-       u8 bank_size;           /* 22 */
-       u8 number_of_image_pages; /* 23 */
-       u8 reserved_page;
-       u8 red_mask_size;
-       u8 red_mask_pos;
-       u8 green_mask_size;
-       u8 green_mask_pos;
-       u8 blue_mask_size;
-       u8 blue_mask_pos;
-       u8 reserved_mask_size;
-       u8 reserved_mask_pos;
-       u8 direct_color_mode_info;
-       u32 phys_base_ptr;
-       u32 offscreen_mem_offset;
-       u16 offscreen_mem_size;
-       u8 reserved[206];
-};
-
-struct vbe_mode_info {
-       u16 video_mode;
-       bool valid;
-       union {
-               struct vesa_mode_info vesa;
-               u8 mode_info_block[256];
-       };
-};
-
-struct vbe_ddc_info {
-       u8 port_number; /* i.e. monitor number */
-       u8 edid_transfer_time;
-       u8 ddc_level;
-       u8 edid_block_zero[128];
-};
-
-#define VESA_GET_INFO          0x4f00
-#define VESA_GET_MODE_INFO     0x4f01
-#define VESA_SET_MODE          0x4f02
-#define VESA_GET_CUR_MODE      0x4f03
-
-extern struct vbe_mode_info mode_info;
-
-struct video_priv;
-struct video_uc_plat;
-int vbe_setup_video_priv(struct vesa_mode_info *vesa,
-                        struct video_priv *uc_priv,
-                        struct video_uc_plat *plat);
-int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void));
-
-#endif

diff --git a/include/vesa.h b/include/vesa.h
new file mode 100644 (file)
index 0000000..30df58a
--- /dev/null
+++ b/include/vesa.h
@@ -0,0 +1,113 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+/******************************************************************************
+ * Copyright (c) 2004, 2008 IBM Corporation
+ * Copyright (c) 2009 Pattrick Hueper <phueper@hueper.net>
+ * All rights reserved.
+ *
+ * Contributors:
+ *     IBM Corporation - initial implementation
+ *****************************************************************************/
+#ifndef _VESA_H
+#define _VESA_H
+
+/* these structs are for input from and output to OF */
+struct __packed vbe_screen_info {
+       u8 display_type;        /* 0=NONE, 1= analog, 2=digital */
+       u16 screen_width;
+       u16 screen_height;
+       /* bytes per line in framebuffer, may be more than screen_width */
+       u16 screen_linebytes;
+       u8 color_depth; /* color depth in bits per pixel */
+       u32 framebuffer_address;
+       u8 edid_block_zero[128];
+};
+
+struct __packed vbe_screen_info_input {
+       u8 signature[4];
+       u16 size_reserved;
+       u8 monitor_number;
+       u16 max_screen_width;
+       u8 color_depth;
+};
+
+/* these structs only store the required a subset of the VBE-defined fields */
+struct __packed vbe_info {
+       char signature[4];
+       u16 version;
+       u32 oem_string_ptr;
+       u32 capabilities;
+       u32 modes_ptr;
+       u16 total_memory;
+       u16 oem_version;
+       u32 vendor_name_ptr;
+       u32 product_name_ptr;
+       u32 product_rev_ptr;
+};
+
+struct __packed vesa_mode_info {
+       u16 mode_attributes;    /* 00 */
+       u8 win_a_attributes;    /* 02 */
+       u8 win_b_attributes;    /* 03 */
+       u16 win_granularity;    /* 04 */
+       u16 win_size;           /* 06 */
+       u16 win_a_segment;      /* 08 */
+       u16 win_b_segment;      /* 0a */
+       u32 win_func_ptr;       /* 0c */
+       u16 bytes_per_scanline; /* 10 */
+       u16 x_resolution;       /* 12 */
+       u16 y_resolution;       /* 14 */
+       u8 x_charsize;          /* 16 */
+       u8 y_charsize;          /* 17 */
+       u8 number_of_planes;    /* 18 */
+       u8 bits_per_pixel;      /* 19 */
+       u8 number_of_banks;     /* 20 */
+       u8 memory_model;        /* 21 */
+       u8 bank_size;           /* 22 */
+       u8 number_of_image_pages; /* 23 */
+       u8 reserved_page;
+       u8 red_mask_size;
+       u8 red_mask_pos;
+       u8 green_mask_size;
+       u8 green_mask_pos;
+       u8 blue_mask_size;
+       u8 blue_mask_pos;
+       u8 reserved_mask_size;
+       u8 reserved_mask_pos;
+       u8 direct_color_mode_info;
+       u32 phys_base_ptr;
+       u32 offscreen_mem_offset;
+       u16 offscreen_mem_size;
+       u8 reserved[206];
+};
+
+struct vbe_mode_info {
+       u16 video_mode;
+       bool valid;
+       union {
+               struct vesa_mode_info vesa;
+               u8 mode_info_block[256];
+       };
+};
+
+struct vbe_ddc_info {
+       u8 port_number; /* i.e. monitor number */
+       u8 edid_transfer_time;
+       u8 ddc_level;
+       u8 edid_block_zero[128];
+};
+
+#define VESA_GET_INFO          0x4f00
+#define VESA_GET_MODE_INFO     0x4f01
+#define VESA_SET_MODE          0x4f02
+#define VESA_GET_CUR_MODE      0x4f03
+
+extern struct vbe_mode_info mode_info;
+
+struct video_priv;
+struct video_uc_plat;
+int vbe_setup_video_priv(struct vesa_mode_info *vesa,
+                        struct video_priv *uc_priv,
+                        struct video_uc_plat *plat);
+int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void));
+
+#endif

diff --git a/lib/elf.c b/lib/elf.c
index d074e4e0a7d9bed1f28c0ac7c285eba660b7bfba..0476b2614c33f484c672fc563c8c917bc3f35a88 100644 (file)
--- a/lib/elf.c
+++ b/lib/elf.c
@@ -11,7 +11,7 @@
 #include <net.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
-#include <vbe.h>
+#include <vesa.h>
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif