mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +00:00
1bfecd9358
These changes are all specific to one board only. We're trying to keep the number of board files low, but generally board level updates are ok on platforms that are working on moving towards DT based probing, which will eventually lead to removing them. The board-ams-delta.c board file gets a conflict between the removal of ams_delta_config and the addition of a lot of other data. The Kconfig file has two changes in the same line, and in exynos, the power domain cleanup conflicts with the addition of the image sensor device. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: Amended a fix for a mismerge to board-omap4panda.c] Signed-off-by: Olof Johansson <olof@lixom.net> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPckIXAAoJEIwa5zzehBx35uUP/jns0renNAMmiu2vBHGQtn4z xiNXjDTJ8DeD4mKf17rjn/uaJgQ0w3Doq2nEsi5rPqLK4Uqqk+NG1zYa77QBWHbx FUgBPz+oViTDkanp4G8cygXvGfNkb1GvuJxEBvxQ1mwuG4JhwlFbQxGIaS8ZwOAN DIyVCgSXy40B+748RwdZ2AY7CYvWiQWrQYsIH6NO0rtZIXjyV0kIsyVtEXZpqWtF xNz2HHXVMrui2JQ7FQ0zZglY8+YCxjeJk4v++FfqCJiMzU1yZJw7E30NjhcWAaR6 odJM2YIyhvunxPfx3ZUHimsNjfU+l/0uXgDHeLFSWVyIjPFXwqZDi/6onP3FI4Jc sIoTSwDAQpnZJ6KffAYkcyyfsWN61GOE96Xa2eRb6+78CEiMh7vJ8TIRieiOWxjm NbB0xzaKxa97F/8z7w6V6Z4dNhnokWJZvtJdgLZUYAqIgnxstFkJZ9+Tqt77G4t3 5iSbIMeFPsfh5sUeAVjr5+zVeUOm9PTRI0n0RY+Wd16Ke6DO1qobKAYOzrzI5idz k7ni76/zgGn3NS5F3TxdRHowkeGUwUU6poyopgQ0pyscDylVpzgMIqmAwLdzrVp5 joVEoKi6h4oqhAZtiysXuF85bUfCW0ziDUuib07SX8wcEIAIr+mWob1Ei+wJrefe g0Ch3ZbCRQMOwSOQ70Ci =HPiJ -----END PGP SIGNATURE----- Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson: "These changes are all specific to one board only. We're trying to keep the number of board files low, but generally board level updates are ok on platforms that are working on moving towards DT based probing, which will eventually lead to removing them. The board-ams-delta.c board file gets a conflict between the removal of ams_delta_config and the addition of a lot of other data. The Kconfig file has two changes in the same line, and in exynos, the power domain cleanup conflicts with the addition of the image sensor device. Signed-off-by: Arnd Bergmann <arnd@arndb.de> [olof: Amended a fix for a mismerge to board-omap4panda.c] Signed-off-by: Olof Johansson <olof@lixom.net>" Fixed up some fairly trivial conflicts manually. * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits) i.MX35-PDK: Add Camera support ARM : mx35: 3ds-board: add framebuffer device pxa/hx4700: Remove pcmcia platform_device structure ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35% ARM: pxa/hx4700: Remove unwanted request for GPIO105 ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board ARM: EXYNOS: Register JPEG on nuri ARM: EXYNOS: Register JPEG on universal_c210 ARM: S5PV210: Enable JPEG on SMDKV210 ARM: S5PV210: Add JPEG board definition ARM: EXYNOS: Enable JPEG on Origen ARM: EXYNOS: Enable JPEG on SMDKV310 ARM: EXYNOS: Add __init attribute to universal_camera_init() ARM: EXYNOS: Add __init attribute to nuri_camera_init() ARM: S5PV210: Enable FIMC on SMDKC110 ARM: S5PV210: Enable FIMC on SMDKV210 ARM: S5PV210: Enable MFC on SMDKC110 ARM: S5PV210: Enable MFC on SMDKV210 ARM: EXYNOS: Enable G2D on SMDKV310 ARM: tegra: update defconfig ...
175 lines
4.5 KiB
Plaintext
175 lines
4.5 KiB
Plaintext
if ARCH_OMAP1
|
|
|
|
menu "TI OMAP1 specific features"
|
|
|
|
comment "OMAP Core Type"
|
|
depends on ARCH_OMAP1
|
|
|
|
config ARCH_OMAP730
|
|
depends on ARCH_OMAP1
|
|
bool "OMAP730 Based System"
|
|
select CPU_ARM926T
|
|
select OMAP_MPU_TIMER
|
|
select ARCH_OMAP_OTG
|
|
|
|
config ARCH_OMAP850
|
|
depends on ARCH_OMAP1
|
|
bool "OMAP850 Based System"
|
|
select CPU_ARM926T
|
|
select ARCH_OMAP_OTG
|
|
|
|
config ARCH_OMAP15XX
|
|
depends on ARCH_OMAP1
|
|
default y
|
|
bool "OMAP15xx Based System"
|
|
select CPU_ARM925T
|
|
select OMAP_MPU_TIMER
|
|
|
|
config ARCH_OMAP16XX
|
|
depends on ARCH_OMAP1
|
|
bool "OMAP16xx Based System"
|
|
select CPU_ARM926T
|
|
select ARCH_OMAP_OTG
|
|
|
|
comment "OMAP Board Type"
|
|
depends on ARCH_OMAP1
|
|
|
|
config MACH_OMAP_INNOVATOR
|
|
bool "TI Innovator"
|
|
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)
|
|
help
|
|
TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
|
|
have such a board.
|
|
|
|
config MACH_OMAP_H2
|
|
bool "TI H2 Support"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP16XX
|
|
help
|
|
TI OMAP 1610/1611B H2 board support. Say Y here if you have such
|
|
a board.
|
|
|
|
config MACH_OMAP_H3
|
|
bool "TI H3 Support"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP16XX
|
|
help
|
|
TI OMAP 1710 H3 board support. Say Y here if you have such
|
|
a board.
|
|
|
|
config MACH_OMAP_HTCWIZARD
|
|
bool "HTC Wizard"
|
|
depends on ARCH_OMAP850
|
|
help
|
|
HTC Wizard smartphone support (AKA QTEK 9100, ...)
|
|
|
|
config MACH_HERALD
|
|
bool "HTC Herald"
|
|
depends on ARCH_OMAP850
|
|
help
|
|
HTC Herald smartphone support (AKA T-Mobile Wing, ...)
|
|
|
|
config MACH_OMAP_OSK
|
|
bool "TI OSK Support"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP16XX
|
|
help
|
|
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
|
|
if you have such a board.
|
|
|
|
config OMAP_OSK_MISTRAL
|
|
bool "Mistral QVGA board Support"
|
|
depends on MACH_OMAP_OSK
|
|
help
|
|
The OSK supports an optional add-on board with a Quarter-VGA
|
|
touchscreen, PDA-ish buttons, a resume button, bicolor LED,
|
|
and camera connector. Say Y here if you have this board.
|
|
|
|
config MACH_OMAP_PERSEUS2
|
|
bool "TI Perseus2"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP730
|
|
help
|
|
Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
|
|
a board.
|
|
|
|
config MACH_OMAP_FSAMPLE
|
|
bool "TI F-Sample"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP730
|
|
help
|
|
Support for TI OMAP 850 F-Sample board. Say Y here if you have such
|
|
a board.
|
|
|
|
config MACH_VOICEBLUE
|
|
bool "Voiceblue"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for Voiceblue GSM/VoIP gateway. Say Y here if you have
|
|
such a board.
|
|
|
|
config MACH_OMAP_PALMTE
|
|
bool "Palm Tungsten E"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for the Palm Tungsten E PDA. To boot the kernel, you'll
|
|
need a PalmOS compatible bootloader; check out
|
|
http://palmtelinux.sourceforge.net/ for more information.
|
|
Say Y here if you have this PDA model, say N otherwise.
|
|
|
|
config MACH_OMAP_PALMZ71
|
|
bool "Palm Zire71"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for the Palm Zire71 PDA. To boot the kernel,
|
|
you'll need a PalmOS compatible bootloader; check out
|
|
http://hackndev.com/palm/z71 for more information.
|
|
Say Y here if you have such a PDA, say N otherwise.
|
|
|
|
config MACH_OMAP_PALMTT
|
|
bool "Palm Tungsten|T"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for the Palm Tungsten|T PDA. To boot the kernel, you'll
|
|
need a PalmOS compatible bootloader (Garux); check out
|
|
http://garux.sourceforge.net/ for more information.
|
|
Say Y here if you have this PDA model, say N otherwise.
|
|
|
|
config MACH_SX1
|
|
bool "Siemens SX1"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
help
|
|
Support for the Siemens SX1 phone. To boot the kernel,
|
|
you'll need a SX1 compatible bootloader; check out
|
|
http://forum.oslik.ru and
|
|
http://www.handhelds.org/moin/moin.cgi/SiemensSX1
|
|
for more information.
|
|
Say Y here if you have such a phone, say NO otherwise.
|
|
|
|
config MACH_NOKIA770
|
|
bool "Nokia 770"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP16XX
|
|
help
|
|
Support for the Nokia 770 Internet Tablet. Say Y here if you
|
|
have such a device.
|
|
|
|
config MACH_AMS_DELTA
|
|
bool "Amstrad E3 (Delta)"
|
|
depends on ARCH_OMAP1 && ARCH_OMAP15XX
|
|
select FIQ
|
|
select GPIO_GENERIC_PLATFORM
|
|
select LEDS_GPIO_REGISTER
|
|
select REGULATOR
|
|
select REGULATOR_FIXED_VOLTAGE
|
|
help
|
|
Support for the Amstrad E3 (codename Delta) videophone. Say Y here
|
|
if you have such a device.
|
|
|
|
config MACH_OMAP_GENERIC
|
|
bool "Generic OMAP board"
|
|
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)
|
|
help
|
|
Support for generic OMAP-1510, 1610 or 1710 board with
|
|
no FPGA. Can be used as template for porting Linux to
|
|
custom OMAP boards. Say Y here if you have a custom
|
|
board.
|
|
|
|
endmenu
|
|
|
|
endif
|