diff options
author | Tony Lindgren <tony@atomide.com> | 2006-04-02 12:46:30 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-02 12:46:30 -0400 |
commit | 9b6553cd01ce3ea7a6a532f7b7e62e3535d6b102 (patch) | |
tree | 8b8bf4682ecf602fc35cd98e4ea2e888519b20cb /arch/arm/mach-omap1/Kconfig | |
parent | 120db2cba8e40c562e5a4aea44ede2f360a5de75 (diff) |
[ARM] 3433/1: ARM: OMAP: 8/8 Update board files
Patch from Tony Lindgren
This patch syncs OMAP board support with linux-omap tree.
The highlights of the patch are:
- Add support for Nokia 770 by Juha Yrjola
- Add support for Samsung Apollon by Kyungmin Park
- Add support for Amstrad E3 videophone by Jonathan McDowell
- Remove board-netstar.c board support as requested by Ladislav Michl
- Do platform_device registration in board files by Komal Shah et al.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1/Kconfig')
-rw-r--r-- | arch/arm/mach-omap1/Kconfig | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 86a0f0d14345..f8d716ccc1df 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
@@ -69,12 +69,6 @@ config MACH_VOICEBLUE | |||
69 | Support for Voiceblue GSM/VoIP gateway. Say Y here if you have | 69 | Support for Voiceblue GSM/VoIP gateway. Say Y here if you have |
70 | such a board. | 70 | such a board. |
71 | 71 | ||
72 | config MACH_NETSTAR | ||
73 | bool "NetStar" | ||
74 | depends on ARCH_OMAP1 && ARCH_OMAP15XX | ||
75 | help | ||
76 | Support for NetStar PBX. Say Y here if you have such a board. | ||
77 | |||
78 | config MACH_OMAP_PALMTE | 72 | config MACH_OMAP_PALMTE |
79 | bool "Palm Tungsten E" | 73 | bool "Palm Tungsten E" |
80 | depends on ARCH_OMAP1 && ARCH_OMAP15XX | 74 | depends on ARCH_OMAP1 && ARCH_OMAP15XX |
@@ -85,6 +79,20 @@ config MACH_OMAP_PALMTE | |||
85 | informations. | 79 | informations. |
86 | Say Y here if you have such a PDA, say NO otherwise. | 80 | Say Y here if you have such a PDA, say NO otherwise. |
87 | 81 | ||
82 | config MACH_NOKIA770 | ||
83 | bool "Nokia 770" | ||
84 | depends on ARCH_OMAP1 && ARCH_OMAP16XX | ||
85 | help | ||
86 | Support for the Nokia 770 Internet Tablet. Say Y here if you | ||
87 | have such a device. | ||
88 | |||
89 | config MACH_AMS_DELTA | ||
90 | bool "Amstrad E3 (Delta)" | ||
91 | depends on ARCH_OMAP1 && ARCH_OMAP15XX | ||
92 | help | ||
93 | Support for the Amstrad E3 (codename Delta) videophone. Say Y here | ||
94 | if you have such a device. | ||
95 | |||
88 | config MACH_OMAP_GENERIC | 96 | config MACH_OMAP_GENERIC |
89 | bool "Generic OMAP board" | 97 | bool "Generic OMAP board" |
90 | depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX) | 98 | depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX) |