We want to use VBE to mean Verfiied Boot for Embedded in U-Boot. Rename the existing VBE (Vesa BIOS extensions) to allow this.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/x86/lib/bios.c | 2 +- arch/x86/lib/coreboot_table.c | 2 +- arch/x86/lib/fsp/fsp_graphics.c | 2 +- cmd/elf.c | 2 +- drivers/bios_emulator/atibios.c | 2 +- drivers/pci/pci_rom.c | 2 +- drivers/video/broadwell_igd.c | 2 +- drivers/video/coreboot.c | 2 +- drivers/video/efi.c | 2 +- drivers/video/ivybridge_igd.c | 2 +- drivers/video/vesa.c | 2 +- include/{vbe.h => vesa.h} | 4 ++-- lib/elf.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) rename include/{vbe.h => vesa.h} (98%)
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index 98cc05de2eb..087539ba7db 100644 --- 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 6eab0452fda..05519d851a9 100644 --- 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 02fd05c9faf..6a7552e6956 100644 --- 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 2b33c50bd02..ce40d3f72a7 100644 --- 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 cdc5ba6ad90..09da76bc5d9 100644 --- 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 73d15e797fc..ceeb59d1fe4 100644 --- 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 2551f162e8f..81f0fd8c019 100644 --- 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 7237542c076..3efc65daa2b 100644 --- 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 5f9031f2ec5..d60b6e27569 100644 --- 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 1aa5317dd5f..18672a18973 100644 --- 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 869e5469732..91da939e59b 100644 --- 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/vesa.h similarity index 98% rename from include/vbe.h rename to include/vesa.h index 1631260eb73..30df58a9f1b 100644 --- a/include/vbe.h +++ b/include/vesa.h @@ -7,8 +7,8 @@ * Contributors: * IBM Corporation - initial implementation *****************************************************************************/ -#ifndef _VBE_H -#define _VBE_H +#ifndef _VESA_H +#define _VESA_H
/* these structs are for input from and output to OF */ struct __packed vbe_screen_info { diff --git a/lib/elf.c b/lib/elf.c index d074e4e0a7d..0476b2614c3 100644 --- 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