[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20121203150417.16826.70816.stgit@bob.linux.org.uk>
Date: Mon, 03 Dec 2012 15:04:19 +0000
From: Alan Cox <alan@...ux.intel.com>
To: arve@...roid.com, x86@...nel.org, linux-kernel@...r.kernel.org,
mikechan@...gle.com
Subject: [PATCH 1/9] goldfish: definitions for Goldfish on x86 platforms
From: Jun Nakajima <jnakajim@...il.com>
Based on code by Jun Nakajima but stripped of all the old x86 mach-foo
stuff and turned into a single include file for the Goldfish virtual bus
layer
Signed-off-by: Sheng Yang <sheng@...ux.intel.com>
Signed-off-by: Yunhong Jiang <yunhong.jiang@...el.com>
Signed-off-by: Xiaohui Xin <xiaohui.xin@...el.com>
Signed-off-by: Jun Nakajima <jun.nakajima@...el.com>
Signed-off-by: Bruce Beare <bruce.j.beare@...el.com>
[Ported to 3.7 and reorganised so that we can keep most of the code
shared properly]
Signed-off-by: Alan Cox <alan@...ux.intel.com>
---
arch/x86/Kconfig | 12 ++++++++++++
arch/x86/include/asm/goldfish.h | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
create mode 100644 arch/x86/include/asm/goldfish.h
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cd98a44..dbe8baa 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -326,6 +326,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"
@@ -407,6 +411,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
diff --git a/arch/x86/include/asm/goldfish.h b/arch/x86/include/asm/goldfish.h
new file mode 100644
index 0000000..d5fcf6d
--- /dev/null
+++ b/arch/x86/include/asm/goldfish.h
@@ -0,0 +1,36 @@
+/*
+ *
+ * arch/x86/include/asm/mach-goldfish/hardware.h
+ *
+ * Copyright (C) 2007 Google, Inc.
+ * Copyright (C) 2012 Intel, Corp.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __X86_ARCH_HARDWARE_H
+#define __X86_ARCH_HARDWARE_H
+
+/*
+ * Where in virtual memory the IO devices (timers, system controllers
+ * and so on)
+ */
+
+#define GOLDFISH_IO_SIZE 0x00800000 /* How much? */
+#define GOLDFISH_IO_START 0xff000000 /* PA of IO */
+
+#define GOLDFISH_PDEV_BUS_BASE (0x1000)
+#define GOLDFISH_PDEV_BUS_END (0x100)
+#define GOLDFISH_PDEV_BUS_IRQ (4)
+
+#define GOLDFISH_TTY_BASE (0x2000)
+
+#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists