video: Rename structs and functions to avoid VBE
Rename these to VESA, itself an abbreviation, to avoid a conflict with
Verified Boot for Embedded.
Rename this to avoid referencing VBE.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 81f0fd8..6aa4e27 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -681,7 +681,7 @@
debug("%s: is_broadwell=%d\n", __func__, is_broadwell);
ret = igd_pre_init(dev, is_broadwell);
if (!ret) {
- ret = vbe_setup_video(dev, broadwell_igd_int15_handler);
+ ret = vesa_setup_video(dev, broadwell_igd_int15_handler);
if (ret)
debug("failed to run video BIOS: %d\n", ret);
}
diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c
index 3efc65d..d2d87c7 100644
--- a/drivers/video/coreboot.c
+++ b/drivers/video/coreboot.c
@@ -57,7 +57,7 @@
goto err;
}
- ret = vbe_setup_video_priv(vesa, uc_priv, plat);
+ ret = vesa_setup_video_priv(vesa, uc_priv, plat);
if (ret) {
ret = log_msg_ret("setup", ret);
goto err;
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index d60b6e2..b11e42c 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -149,7 +149,7 @@
if (ret)
goto err;
- ret = vbe_setup_video_priv(vesa, uc_priv, plat);
+ ret = vesa_setup_video_priv(vesa, uc_priv, plat);
if (ret)
goto err;
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 18672a1..9264dd6 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -762,7 +762,7 @@
rev = gma_func0_init(dev);
if (rev < 0)
return rev;
- ret = vbe_setup_video(dev, int15_handler);
+ ret = vesa_setup_video(dev, int15_handler);
if (ret)
return ret;
diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c
index 91da939..cac3bb0 100644
--- a/drivers/video/vesa.c
+++ b/drivers/video/vesa.c
@@ -17,7 +17,7 @@
ulong fbbase;
int ret;
- ret = vbe_setup_video(dev, NULL);
+ ret = vesa_setup_video(dev, NULL);
if (ret)
return log_ret(ret);