boot: Add Kconfigs for BOOTMETH_VBE_REQUEST

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>

diff --git a/boot/Kconfig b/boot/Kconfig
index 5f491625c820801d616ba12eb143f2879937a958..b89916c109c5e065e5b37d329a6cce9f3a67576c 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -528,6 +528,26 @@ 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
+       bool "Support for serving VBE OS requests (SPL)"
+       depends on SPL
+       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.
+
+         This is only useful if you are booting an OS direct from SPL.
+
 config BOOTMETH_VBE_SIMPLE
        bool "Bootdev support for VBE 'simple' method"
        default y

diff --git a/boot/Makefile b/boot/Makefile
index b9a122367986db330ed4bd6dacb8752f0318aafc..88193a1b60eb3e348efb588aa61fa1fb85c8bd84 100644 (file)
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -52,7 +52,8 @@ endif
 
 obj-$(CONFIG_$(SPL_TPL_)EXPO) += 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