Introduce CONFIG_GOOGLE_FIRMWARE

In order to keep Google's firmware drivers organized amongst themselves,
all Google firmware drivers are gated on CONFIG_GOOGLE_FIRMWARE=y, which
defaults to 'n' in the kernel build.

Signed-off-by: Mike Waychison <mikew@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index d7d600992d4a614c0829beaa3a09e85b685ea60b..47338c9791263e849a9db97b34fb9f777afa2145 100644 (file)
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -14,4 +14,4 @@ obj-$(CONFIG_ISCSI_IBFT)      += iscsi_ibft.o
 obj-$(CONFIG_FIRMWARE_MEMMAP)  += memmap.o
 obj-$(CONFIG_SIGMA)            += sigma.o
 
-obj-y  += google/
+obj-$(CONFIG_GOOGLE_FIRMWARE)  += google/

diff --git a/drivers/firmware/google/Kconfig b/drivers/firmware/google/Kconfig
index 640dc6bedd694ed4d85dfa95c57607fc9dfe24e3..87096b6ca5c96473b46b97a907ad15863e37268d 100644 (file)
--- a/drivers/firmware/google/Kconfig
+++ b/drivers/firmware/google/Kconfig
@@ -1,3 +1,15 @@
+config GOOGLE_FIRMWARE
+       bool "Google Firmware Drivers"
+       depends on X86
+       default n
+       help
+         These firmware drivers are used by Google's servers.  They are
+         only useful if you are working directly on one of their
+         proprietary servers.  If in doubt, say "N".
+
+menu "Google Firmware Drivers"
+       depends on GOOGLE_FIRMWARE
+
 config GOOGLE_SMI
        tristate "SMI interface for Google platforms"
        depends on ACPI && DMI
@@ -15,3 +27,5 @@ config GOOGLE_MEMCONSOLE
          This option enables the kernel to search for a firmware log in
          the EBDA on Google servers.  If found, this log is exported to
          userland in the file /sys/firmware/log.
+
+endmenu