mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 04:42:12 +00:00
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 ...
45 lines
2.3 KiB
Makefile
45 lines
2.3 KiB
Makefile
obj-y += common.o irq.o pcie.o mpp.o
|
|
|
|
obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o
|
|
obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
|
|
obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
|
|
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
|
|
obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o
|
|
obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
|
|
obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
|
|
obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
|
|
obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o lacie_v2-common.o
|
|
obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o
|
|
obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o
|
|
obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o
|
|
obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o
|
|
obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
|
|
obj-$(CONFIG_MACH_T5325) += t5325-setup.o
|
|
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
|
|
obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o
|
|
|
|
obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o
|
|
obj-$(CONFIG_MACH_CLOUDBOX_DT) += board-ns2.o
|
|
obj-$(CONFIG_MACH_DB88F628X_BP_DT) += board-db88f628x-bp.o
|
|
obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o
|
|
obj-$(CONFIG_MACH_DOCKSTAR_DT) += board-dockstar.o
|
|
obj-$(CONFIG_MACH_DREAMPLUG_DT) += board-dreamplug.o
|
|
obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o
|
|
obj-$(CONFIG_MACH_GURUPLUG_DT) += board-guruplug.o
|
|
obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o
|
|
obj-$(CONFIG_MACH_ICONNECT_DT) += board-iconnect.o
|
|
obj-$(CONFIG_MACH_INETSPACE_V2_DT) += board-ns2.o
|
|
obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT) += board-iomega_ix2_200.o
|
|
obj-$(CONFIG_MACH_KM_KIRKWOOD_DT) += board-km_kirkwood.o
|
|
obj-$(CONFIG_MACH_LSXL_DT) += board-lsxl.o
|
|
obj-$(CONFIG_MACH_MPLCEC4_DT) += board-mplcec4.o
|
|
obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT) += board-ns2.o
|
|
obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT) += board-ns2.o
|
|
obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT) += board-ns2.o
|
|
obj-$(CONFIG_MACH_NETSPACE_V2_DT) += board-ns2.o
|
|
obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT) += board-openblocks_a6.o
|
|
obj-$(CONFIG_MACH_READYNAS_DT) += board-readynas.o
|
|
obj-$(CONFIG_MACH_SHEEVAPLUG_DT) += board-sheevaplug.o
|
|
obj-$(CONFIG_MACH_TOPKICK_DT) += board-usi_topkick.o
|
|
obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o
|