Allow this to be enabled separately in U-Boot proper and in SPL, since it is not needed in SPL.
Signed-off-by: Simon Glass sjg@chromium.org ---
boot/Kconfig | 13 +++++++++++++ boot/Makefile | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/boot/Kconfig b/boot/Kconfig index ebad2a8eca4..dcfbe6ae9e0 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -509,6 +509,19 @@ config VPL_BOOTMETH_VBE
if BOOTMETH_VBE
+config BOOTMETH_VBE_REQUEST + bool "Support for serving VBE OS requests" + default y + help + Enables support for looking that the requests made by the + Operating System being booted. These requests result in additions to + the device tree /chosen node, added during the device tree fixup + phase. + +config SPL_BOOTMETH_VBE_REQUEST + def_bool n # Support for serving VBE OS requests (SPL) + depends on SPL + config BOOTMETH_VBE_SIMPLE bool "Bootdev support for VBE 'simple' method" default y diff --git a/boot/Makefile b/boot/Makefile index f990e66f522..69c31adb77d 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -50,7 +50,8 @@ endif
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += expo.o scene.o scene_menu.o
-obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_request.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_REQUEST) += vbe_request.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE) += vbe_simple.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE_FW) += vbe_simple_fw.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE_OS) += vbe_simple_os.o