Jin Qian <[email protected]> writes: > From: Greg Hackmann <[email protected]> > > On new virtual devices, the goldfish virtual bus can be replaced with > autoprobing infrastructure like Device Tree. Refactor the goldfish > kernel configs to better accommodate this.
Should there be a header for this series? Does Google want to upstream the android pipe into mainline while we are still examining VirtIO alternatives? > > Move the goldfish platform into a menuconfig in the style of the chrome > platform, and separate the goldfish bus into its own config option. > > Signed-off-by: Greg Hackmann <[email protected]> > (cherry picked from commit 711910868190ee3645c1c52701bdde844447783f) > Signed-off-by: Jin Qian <[email protected]> > --- > drivers/platform/Kconfig | 3 +-- > drivers/platform/goldfish/Kconfig | 18 ++++++++++++++++++ > drivers/platform/goldfish/Makefile | 2 +- > 3 files changed, 20 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig > index 0adccbf..c11db8b 100644 > --- a/drivers/platform/Kconfig > +++ b/drivers/platform/Kconfig > @@ -4,8 +4,7 @@ endif > if MIPS > source "drivers/platform/mips/Kconfig" > endif > -if GOLDFISH > + > source "drivers/platform/goldfish/Kconfig" > -endif > > source "drivers/platform/chrome/Kconfig" > diff --git a/drivers/platform/goldfish/Kconfig > b/drivers/platform/goldfish/Kconfig > index 635ef25..1ae3690 100644 > --- a/drivers/platform/goldfish/Kconfig > +++ b/drivers/platform/goldfish/Kconfig > @@ -1,5 +1,23 @@ > +menuconfig GOLDFISH > + bool "Platform support for Goldfish virtual devices" > + depends on X86_32 || X86_64 || ARM || ARM64 > + ---help--- > + Say Y here to get to see options for the Goldfish virtual platform. > + This option alone does not add any kernel code. > + > + Unless you are building for the Android Goldfish emulator say N here. > + > +if GOLDFISH > + > +config GOLDFISH_BUS > + tristate "Goldfish platform bus" > + ---help--- > + This is a virtual bus to host Goldfish Android Virtual Devices. > + > config GOLDFISH_PIPE > tristate "Goldfish virtual device for QEMU pipes" > ---help--- > This is a virtual device to drive the QEMU pipe interface used by > the Goldfish Android Virtual Device. > + > +endif # GOLDFISH > diff --git a/drivers/platform/goldfish/Makefile > b/drivers/platform/goldfish/Makefile > index a002239..d348712 100644 > --- a/drivers/platform/goldfish/Makefile > +++ b/drivers/platform/goldfish/Makefile > @@ -1,5 +1,5 @@ > # > # Makefile for Goldfish platform specific drivers > # > -obj-$(CONFIG_GOLDFISH) += pdev_bus.o > +obj-$(CONFIG_GOLDFISH_BUS) += pdev_bus.o > obj-$(CONFIG_GOLDFISH_PIPE) += goldfish_pipe.o > -- > 2.6.0.rc2.230.g3dd15c0 -- Alex Bennée -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
