vbe: Rename vbe_fixup to vbe_request

The vbe_fixup file handles device tree fixups, but these are called OS
requests in VBE. Rename the file to reflect its wider purpose.

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

diff --git a/boot/Makefile b/boot/Makefile
index dd45d786f8cc166baf2ff3d28a276459cf180d1e..19d628d748a5fda72da1265132b44c59a3b4f178 100644 (file)
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -47,5 +47,5 @@ ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o
 endif
 
-obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_fixup.o
+obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_request.o
 obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE) += vbe_simple.o

diff --git a/boot/vbe_fixup.c b/boot/vbe_request.c
similarity index 98%
rename from boot/vbe_fixup.c
rename to boot/vbe_request.c
index 53d88678c924fbe01cf171bc7abeea0e61aa8ade..fa0189246375c4ba67013923b28c1e003673f509 100644 (file)
--- a/boot/vbe_fixup.c
+++ b/boot/vbe_request.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Verified Boot for Embedded (VBE) device tree fixup functions
+ * Verified Boot for Embedded (VBE) OS request (device tree fixup) functions
  *
  * Copyright 2022 Google LLC
  * Written by Simon Glass <sjg@chromium.org>

diff --git a/test/py/tests/test_event_dump.py b/test/py/tests/test_event_dump.py
index 674df2ea001d6a7c8e0377fb3357f8860525dc6e..0984efaf3c14c033ac4d99c0175217c840a4c6e8 100644 (file)
--- a/test/py/tests/test_event_dump.py
+++ b/test/py/tests/test_event_dump.py
@@ -16,7 +16,7 @@ def test_event_dump(u_boot_console):
     out = util.run_and_log(cons, ['scripts/event_dump.py', sandbox])
     expect = '''.*Event type            Id                              Source location
 --------------------  ------------------------------  ------------------------------
-EVT_FT_FIXUP          bootmeth_vbe_ft_fixup           .*vbe_fixup.c:.*
+EVT_FT_FIXUP          bootmeth_vbe_ft_fixup           .*vbe_request.c:.*
 EVT_FT_FIXUP          bootmeth_vbe_simple_ft_fixup    .*vbe_simple.c:.*
 EVT_MISC_INIT_F       sandbox_misc_init_f             .*start.c:'''
     assert re.match(expect, out, re.MULTILINE) is not None