aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorJun Nakajima <jnakajim@gmail.com>2013-01-21 12:23:09 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2013-01-21 15:09:19 -0500
commitddd70cf93d784af3698c86315aa0ded87ca0a0c5 (patch)
tree68835c5351c42a865fc714abfda52da0416b2660 /arch/x86/Kconfig
parent7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff)
goldfish: platform device for x86
Based on code by Jun Nakajima but stripped of all the old x86 mach-foo stuff and turned into a single file for the Goldfish virtual bus layer. The actual created platform device and bus enumeration is portable between the ARM and x86 Goldfish emulations. Signed-off-by: Sheng Yang <sheng@linux.intel.com> Link: http://lkml.kernel.org/r/20130121172205.19517.22535.stgit@bob.linux.org.uk Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> [Ported to 3.7 and reorganised so that we can keep most of the code shared properly] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 79795af59810..46fb28c93f76 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -320,6 +320,10 @@ config X86_BIGSMP
320 ---help--- 320 ---help---
321 This option is needed for the systems that have more than 8 CPUs 321 This option is needed for the systems that have more than 8 CPUs
322 322
323config GOLDFISH
324 def_bool y
325 depends on X86_GOLDFISH
326
323if X86_32 327if X86_32
324config X86_EXTENDED_PLATFORM 328config X86_EXTENDED_PLATFORM
325 bool "Support for extended (non-PC) x86 platforms" 329 bool "Support for extended (non-PC) x86 platforms"
@@ -402,6 +406,14 @@ config X86_UV
402# Following is an alphabetically sorted list of 32 bit extended platforms 406# Following is an alphabetically sorted list of 32 bit extended platforms
403# Please maintain the alphabetic order if and when there are additions 407# Please maintain the alphabetic order if and when there are additions
404 408
409config X86_GOLDFISH
410 bool "Goldfish (Virtual Platform)"
411 depends on X86_32
412 ---help---
413 Enable support for the Goldfish virtual platform used primarily
414 for Android development. Unless you are building for the Android
415 Goldfish emulator say N here.
416
405config X86_INTEL_CE 417config X86_INTEL_CE
406 bool "CE4100 TV platform" 418 bool "CE4100 TV platform"
407 depends on PCI 419 depends on PCI