Skip to contentSkip to conversation

goldfish: platform device for x86

tip:x86/platform tip-bot for Jun Nakajima 1 participant 1 message Jan 21, 2013 1 message not in the archive x86

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive
Commit-ID:  ddd70cf93d784af3698c86315aa0ded87ca0a0c5
Gitweb:     http://git.kernel.org/tip/ddd70cf93d784af3698c86315aa0ded87ca0a0c5
Author:     Jun Nakajima <[email protected]>
AuthorDate: Mon, 21 Jan 2013 17:23:09 +0000
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 21 Jan 2013 12:09:19 -0800

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.

[Ported to 3.7 and reorganised so that we can keep most of the code
shared properly]

---
 arch/x86/Kconfig                      | 12 +++++++++
 arch/x86/platform/Makefile            |  1 +
 arch/x86/platform/goldfish/Makefile   |  1 +
 arch/x86/platform/goldfish/goldfish.c | 51 +++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)
arch/x86/Kconfig +12 -0
index 79795af..46fb28c 100644
@@ -320,6 +320,10 @@ config X86_BIGSMP
 	---help---
 	  This option is needed for the systems that have more than 8 CPUs
 
+config GOLDFISH
+       def_bool y
+       depends on X86_GOLDFISH
+
 if X86_32
 config X86_EXTENDED_PLATFORM
 	bool "Support for extended (non-PC) x86 platforms"
@@ -402,6 +406,14 @@ config X86_UV
 # Following is an alphabetically sorted list of 32 bit extended platforms
 # Please maintain the alphabetic order if and when there are additions
 
+config X86_GOLDFISH
+       bool "Goldfish (Virtual Platform)"
+       depends on X86_32
+       ---help---
+	 Enable support for the Goldfish virtual platform used primarily
+	 for Android development. Unless you are building for the Android
+	 Goldfish emulator say N here.
+
 config X86_INTEL_CE
 	bool "CE4100 TV platform"
 	depends on PCI
arch/x86/platform/Makefile +1 -0
index 8d87439..bfe917f 100644
@@ -2,6 +2,7 @@
 obj-y	+= ce4100/
 obj-y	+= efi/
 obj-y	+= geode/
+obj-y	+= goldfish/
 obj-y	+= iris/
 obj-y	+= mrst/
 obj-y	+= olpc/
arch/x86/platform/goldfish/Makefile new file +1 -0
new file mode 100644
index 0000000..f030b53
@@ -0,0 +1 @@
+obj-$(CONFIG_GOLDFISH)	+= goldfish.o
arch/x86/platform/goldfish/goldfish.c new file +51 -0

51 lines not on this page · raw message