40e71e7015
These are 18 branches on 9 platforms with board specific changes, mostly for defconfig files, but nothing really exciting in here. Since the shmobile platform still uses board files for some of the newer machines, we get a few changes there as the result of drivers getting enabled for those boards. This causes some conflicts with contents getting added from multiple branches in sh-mobile specific files. Renesas is putting a lot of work into migrating to device-tree based setup, which will make all those files obsolete in the future and avoid both the conflicts and the need to have these files in the first place. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnmmCrR//JCVInAQKNuxAAxXpBslUGRpI8O28KHA3EeL+9HR5wBoKo K6q6fQlAv9dcGJOx7fkyHU4UfE1kV+M6l4R9BM8VcjflQjCnG4GrQo8qgJNY14nf OpQKSIHEtdBHzFpHEIxogByR1i05hL8nrm21TElgi/aYlDwKbXnApY23ubApPif4 oXmES9ppXvnz1D7bCE7PaZf+TIgufpPFkioQYcV93nD0x5tYu1mZn2xSfYDekAyU mUe1p2oX+77U0lohVQCo1H/ZOJBdoAN1U//2QCiL8YKJitQf/vOVs3QtHEUywIiU CyUaDhfM7sX4QKBWzwjxoVOcT6QC/qhaaqaases0gjgjepKaSqUTZMBdLI7oyF3o 2ExYv8BMGilbIyNUYoxeoqz9zA3IQ7wDxaBh3G1JY9k0/BhKmsEwtGYkSJPdOgpt XyX7N/xKzy0lTWf1N4eSWUiccfXdVjLFf3Jp2xA7e/KJfzFAF/RJXdGiV2Kzdr7m mZ7ESYRk+S3ENgpI/QI4C6kQ7EBynQjhn5t2+iK9k4gKNspNZ3TjLCQif0v0xE3H IIsaSqLBuj9IZ1r13fpQJZIyTr+dHsx2s6QQBFXYzeQ/cjfSRGZP4FmYyweGctfR Hh1AAshrOAwNl4ZdXgIT08JKtBocaGFUtt4syvPfAFYoojMN58xg5EG4FYtKpKHp xU6w43o6KnQ= =7bgc -----END PGP SIGNATURE----- Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC board specific changes from Arnd Bergmann: "These are 18 branches on 9 platforms with board specific changes, mostly for defconfig files, but nothing really exciting in here. Since the shmobile platform still uses board files for some of the newer machines, we get a few changes there as the result of drivers getting enabled for those boards. This causes some conflicts with contents getting added from multiple branches in sh-mobile specific files. Renesas is putting a lot of work into migrating to device-tree based setup, which will make all those files obsolete in the future and avoid both the conflicts and the need to have these files in the first place." * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits) arm: multi_v7_defconfig: Enable initrd/initramfs support arm: multi_v7_defconfig: Enable Zynq UART driver ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV ARM: OMAP1: nokia770: enable Tahvo ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN arm: omap: board-overo: reset GPIO for SMSC911x ARM: shmobile: BOCK-W: change Ether device name ARM: ux500: board-mop500: remove unused pin modes ARM: shmobile: bockw: add MMCIF support ARM: shmobile: bockw: add SPI FLASH support ARM: shmobile: bockw: add I2C device support ARM: shmobile: BOCK-W: add Ether support ARM: tegra: defconfig updates ARM: shmobile: bockw defconfig: add MMCIF support ARM: shmobile: bockw defconfig: add M25P80 support ARM: shmobile: bockw defconfig: add RTC RX8581 support ARM: shmobile: marzen: keep local function as static ARM: shmobile: bockw: add SDHI0 support ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC ARM: shmobile: lager: support GPIO switches ...
324 lines
9.4 KiB
Plaintext
324 lines
9.4 KiB
Plaintext
if ARCH_KIRKWOOD
|
|
|
|
menu "Marvell Kirkwood Implementations"
|
|
|
|
config MACH_D2NET_V2
|
|
bool "LaCie d2 Network v2 NAS Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
LaCie d2 Network v2 NAS.
|
|
|
|
config MACH_DOCKSTAR
|
|
bool "Seagate FreeAgent DockStar"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Seagate FreeAgent DockStar.
|
|
|
|
config MACH_ESATA_SHEEVAPLUG
|
|
bool "Marvell eSATA SheevaPlug Reference Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell eSATA SheevaPlug Reference Board.
|
|
|
|
config MACH_GURUPLUG
|
|
bool "Marvell GuruPlug Reference Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell GuruPlug Reference Board.
|
|
|
|
config MACH_INETSPACE_V2
|
|
bool "LaCie Internet Space v2 NAS Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
LaCie Internet Space v2 NAS.
|
|
|
|
config MACH_MV88F6281GTW_GE
|
|
bool "Marvell 88F6281 GTW GE Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell 88F6281 GTW GE Board.
|
|
|
|
config MACH_NET2BIG_V2
|
|
bool "LaCie 2Big Network v2 NAS Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
LaCie 2Big Network v2 NAS.
|
|
|
|
config MACH_NET5BIG_V2
|
|
bool "LaCie 5Big Network v2 NAS Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
LaCie 5Big Network v2 NAS.
|
|
|
|
config MACH_NETSPACE_MAX_V2
|
|
bool "LaCie Network Space Max v2 NAS Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
LaCie Network Space Max v2 NAS.
|
|
|
|
config MACH_NETSPACE_V2
|
|
bool "LaCie Network Space v2 NAS Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
LaCie Network Space v2 NAS.
|
|
|
|
config MACH_OPENRD
|
|
bool
|
|
|
|
config MACH_OPENRD_BASE
|
|
bool "Marvell OpenRD Base Board"
|
|
select MACH_OPENRD
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell OpenRD Base Board.
|
|
|
|
config MACH_OPENRD_CLIENT
|
|
bool "Marvell OpenRD Client Board"
|
|
select MACH_OPENRD
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell OpenRD Client Board.
|
|
|
|
config MACH_OPENRD_ULTIMATE
|
|
bool "Marvell OpenRD Ultimate Board"
|
|
select MACH_OPENRD
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell OpenRD Ultimate Board.
|
|
|
|
config MACH_RD88F6192_NAS
|
|
bool "Marvell RD-88F6192-NAS Reference Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell RD-88F6192-NAS Reference Board.
|
|
|
|
config MACH_RD88F6281
|
|
bool "Marvell RD-88F6281 Reference Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell RD-88F6281 Reference Board.
|
|
|
|
config MACH_SHEEVAPLUG
|
|
bool "Marvell SheevaPlug Reference Board"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell SheevaPlug Reference Board.
|
|
|
|
config MACH_T5325
|
|
bool "HP t5325 Thin Client"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
HP t5325 Thin Client.
|
|
|
|
config MACH_TS219
|
|
bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
|
|
TS-219P+ Turbo NAS devices.
|
|
|
|
config MACH_TS41X
|
|
bool "QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo NAS"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo
|
|
NAS devices.
|
|
|
|
comment "Device tree entries"
|
|
|
|
config ARCH_KIRKWOOD_DT
|
|
bool "Marvell Kirkwood Flattened Device Tree"
|
|
select KIRKWOOD_CLK
|
|
select POWER_SUPPLY
|
|
select POWER_RESET
|
|
select POWER_RESET_GPIO
|
|
select REGULATOR
|
|
select REGULATOR_FIXED_VOLTAGE
|
|
select USE_OF
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell Kirkwood using flattened device tree.
|
|
|
|
config MACH_CLOUDBOX_DT
|
|
bool "LaCie CloudBox NAS (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the LaCie
|
|
CloudBox NAS, using Flattened Device Tree.
|
|
|
|
config MACH_DB88F628X_BP_DT
|
|
bool "Marvell DB-88F628x-BP Development Board (Flattened Device Tree)"
|
|
help
|
|
Say 'Y' here if you want your kernel to support the Marvell
|
|
DB-88F6281-BP and DB-88F6282-BP Development Board (Flattened
|
|
Device Tree).
|
|
|
|
config MACH_DLINK_KIRKWOOD_DT
|
|
bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,
|
|
using Flattened Device Tree.
|
|
|
|
config MACH_DOCKSTAR_DT
|
|
bool "Seagate FreeAgent Dockstar (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Seagate FreeAgent Dockstar (Flattened Device Tree).
|
|
|
|
config MACH_DREAMPLUG_DT
|
|
bool "Marvell DreamPlug (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell DreamPlug (Flattened Device Tree).
|
|
|
|
config MACH_GOFLEXNET_DT
|
|
bool "Seagate GoFlex Net (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Seagate GoFlex Net (Flattened Device Tree).
|
|
|
|
config MACH_GURUPLUG_DT
|
|
bool "Marvell GuruPlug Reference Board (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell GuruPlug Reference Board (Flattened Device Tree).
|
|
|
|
config MACH_IB62X0_DT
|
|
bool "RaidSonic IB-NAS6210, IB-NAS6220 (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
|
|
Flattened Device Tree.
|
|
|
|
config MACH_ICONNECT_DT
|
|
bool "Iomega Iconnect (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here to enable Iomega Iconnect support.
|
|
|
|
config MACH_INETSPACE_V2_DT
|
|
bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the LaCie
|
|
Internet Space v2 NAS, using Flattened Device Tree.
|
|
|
|
config MACH_IOMEGA_IX2_200_DT
|
|
bool "Iomega StorCenter ix2-200 (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Iomega StorCenter ix2-200 (Flattened Device Tree).
|
|
|
|
config MACH_KM_KIRKWOOD_DT
|
|
bool "Keymile Kirkwood Reference Design (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
|
|
|
|
config MACH_LSXL_DT
|
|
bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
select POWER_RESET_RESTART
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using
|
|
Flattened Device Tree.
|
|
|
|
config MACH_MPLCEC4_DT
|
|
bool "MPL CEC4 (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
MPL CEC4 (Flattened Device Tree).
|
|
|
|
config MACH_NETSPACE_LITE_V2_DT
|
|
bool "LaCie Network Space Lite v2 NAS (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the LaCie
|
|
Network Space Lite v2 NAS, using Flattened Device Tree.
|
|
|
|
config MACH_NETSPACE_MAX_V2_DT
|
|
bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the LaCie
|
|
Network Space Max v2 NAS, using Flattened Device Tree.
|
|
|
|
config MACH_NETSPACE_MINI_V2_DT
|
|
bool "LaCie Network Space Mini v2 NAS (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the LaCie
|
|
Network Space Mini v2 NAS using Flattened Device Tree.
|
|
|
|
This board is embedded in a product named CloudBox, which
|
|
provides automatic backup on a 100GB cloud storage. This
|
|
should not confused with a more recent LaCie NAS also named
|
|
CloudBox. For this last, the disk capacity is 1TB or above.
|
|
|
|
config MACH_NETSPACE_V2_DT
|
|
bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the LaCie
|
|
Network Space v2 NAS, using Flattened Device Tree.
|
|
|
|
config MACH_OPENBLOCKS_A6_DT
|
|
bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Plat'Home OpenBlocks A6 (Flattened Device Tree).
|
|
|
|
config MACH_READYNAS_DT
|
|
bool "NETGEAR ReadyNAS Duo v2 (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
select ARM_APPENDED_DTB
|
|
select ARM_ATAG_DTB_COMPAT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
NETGEAR ReadyNAS Duo v2 using Fattened Device Tree.
|
|
|
|
config MACH_SHEEVAPLUG_DT
|
|
bool "Marvell (eSATA) SheevaPlug (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell (eSATA) SheevaPlug (Flattened Device Tree).
|
|
|
|
config MACH_TOPKICK_DT
|
|
bool "USI Topkick (Flattened Device Tree)"
|
|
select ARCH_KIRKWOOD_DT
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
USI Topkick, using Flattened Device Tree
|
|
|
|
config MACH_TS219_DT
|
|
bool "Device Tree for QNAP TS-11X, TS-21X NAS"
|
|
select ARCH_KIRKWOOD_DT
|
|
select ARM_APPENDED_DTB
|
|
select ARM_ATAG_DTB_COMPAT
|
|
select POWER_RESET_QNAP
|
|
help
|
|
Say 'Y' here if you want your kernel to support the QNAP
|
|
TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
|
|
TS-219P+ Turbo NAS devices using Fattened Device Tree.
|
|
There are two different Device Tree descriptions, depending
|
|
on if the device is based on an if the board uses the MV6281
|
|
or MV6282. If you have the wrong one, the buttons will not
|
|
work.
|
|
|
|
endmenu
|
|
|
|
endif
|