summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Waychison <mikew@google.com>2011-04-30 02:39:31 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-30 03:09:35 +0200
commita1d9a09ae8003380a7f2297ee4367947cbdf874f (patch)
treeb250e6157a857dbc6e0923677518ab3b6fe34f54
parentdriver: Google Memory Console (diff)
downloadlinux-a1d9a09ae8003380a7f2297ee4367947cbdf874f.tar.xz
linux-a1d9a09ae8003380a7f2297ee4367947cbdf874f.zip
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>
-rw-r--r--drivers/firmware/Makefile2
-rw-r--r--drivers/firmware/google/Kconfig14
2 files changed, 15 insertions, 1 deletions
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index d7d600992d4a..47338c979126 100644
--- 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 640dc6bedd69..87096b6ca5c9 100644
--- 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