mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-18 00:24:58 +08:00
c67d9ce166
The bulk of this branch is updates for Renesas Shmobile. They are still doing some enablement for classic boards first, and then come up with DT bindings when they've had a chance to learn more about the hardware. Not necessarily a bad way to go about it, and they're looking at moving some of the temporary board code resulting from it to drivers/staging instead to avoid the churn here. As a result of the shmobile clock cleanups, we end up merging quite a bit of SH code here as well. We ended up merging it here instead of in the cleanup branch due to the other board changes depending on it. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTjNClAAoJEIwa5zzehBx3Q7wP+wYzWTAU0+3BnnjJpQM79hsX 1hP89RaM6DEyTf6PiL/AKOHsnDponUhNzZu1W5FvNG6cFVenh/nxbmO65FKX9CrY Ap2pkQW+/IcpmIKZ+Hln2bkCc54a6yPouK+5pd9W14X5TtqNmLbdh1qhoq9UjFTo zgLfhch5tyNqfpNOj0vFsmvTw0ZGJ0Neq6olRqQbXmyAaRaWzDa64lmEKVupMdk7 2Fh/8jeXlVlryi7p7CvNoAmZEMm7+We5ZMVsQXLk8b9zcwuCWK0DZzNW4DnRCB1d lsNM/Sygi3Y5zRj2XogNANVhNDIih0f50FX7uuKtmevWNJE9n4To7uFUMTk/3zBt 1hvJLL8w4WHhzkg5v5nFsiCTx65pFaTD/LocPj8lhQ1AYzUvWN5sKPxW0uC1lvJ9 Unlwdc0C4EWs3yq6hAPUZS2eB7owmzNUWdjdkgKfdc74u5RnRay0pUmbRMJm2l20 OKoDSwaluQZUeHrxPnTSLdgpkBbPRn9M5DbswEQsuPyI6yROgCRxaRQ4XcpM93dV 4obCF+fOvX6dtsdIUBCtdhvmJ/iHqhQlPLc2avpt2gyti7eWjQkt5it12hjjOF6A DVBdNHv215EEgvB0MbPJvFVKBLw4boxdeBx+FqMQCqvAbqefHo4gcQZcsUGAv/pX zJ8jgkYhlt7XTd+6GlJu =lWof -----END PGP SIGNATURE----- Merge tag 'boards-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next Pull ARM SoC board support updates from Olof Johansson: "The bulk of this branch is updates for Renesas Shmobile. They are still doing some enablement for classic boards first, and then come up with DT bindings when they've had a chance to learn more about the hardware. Not necessarily a bad way to go about it, and they're looking at moving some of the temporary board code resulting from it to drivers/staging instead to avoid the churn here. As a result of the shmobile clock cleanups, we end up merging quite a bit of SH code here as well. We ended up merging it here instead of in the cleanup branch due to the other board changes depending on it" * tag 'boards-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (130 commits) ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL ARM: add drivers for Colibri T30 to multi_v7_defconfig ARM: shmobile: Remove Genmai reference DTS ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB ARM: shmobile: Sync Genmai DTS with Genmai reference DTS ARM: shmobile: genmai-reference: Remove legacy clock support ARM: shmobile: Remove non-multiplatform Genmai reference support ARM: configs: enable XHCI mvebu support in multi_v7_defconfig ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP ARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01 ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH ARM: OMAP: remove some dead code ARM: OMAP: omap3stalker: remove two Kconfig macros ARM: tegra: tegra_defconfig updates ARM: shmobile: r7s72100: use workaround for non DT-clocks ARM: shmobile: Add forward declaration of struct clk to silence warning ARM: shmobile: r7s72100: remove SPI DT clocks from legacy clock support ARM: shmobile: r7s72100: add spi clocks to dtsi ARM: shmobile: r7s72100: remove I2C DT clocks from legacy clock support ARM: shmobile: r7s72100: add i2c clocks to dtsi ...
81 lines
3.0 KiB
Makefile
81 lines
3.0 KiB
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
|
|
|
|
# Common objects
|
|
obj-y := timer.o console.o
|
|
|
|
# CPU objects
|
|
obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o
|
|
obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o
|
|
obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o
|
|
obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o
|
|
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
|
|
obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o
|
|
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o
|
|
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o setup-rcar-gen2.o
|
|
obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o setup-rcar-gen2.o
|
|
obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
|
|
obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o
|
|
|
|
# Clock objects
|
|
obj-y += clock.o
|
|
ifndef CONFIG_COMMON_CLK
|
|
obj-$(CONFIG_ARCH_SH7372) += clock-sh7372.o
|
|
obj-$(CONFIG_ARCH_SH73A0) += clock-sh73a0.o
|
|
obj-$(CONFIG_ARCH_R8A73A4) += clock-r8a73a4.o
|
|
obj-$(CONFIG_ARCH_R8A7740) += clock-r8a7740.o
|
|
obj-$(CONFIG_ARCH_R8A7778) += clock-r8a7778.o
|
|
obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o
|
|
obj-$(CONFIG_ARCH_R8A7790) += clock-r8a7790.o
|
|
obj-$(CONFIG_ARCH_R8A7791) += clock-r8a7791.o
|
|
obj-$(CONFIG_ARCH_R7S72100) += clock-r7s72100.o
|
|
endif
|
|
|
|
# SMP objects
|
|
smp-y := platsmp.o headsmp.o
|
|
smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o platsmp-scu.o
|
|
smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o platsmp-scu.o
|
|
smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o platsmp-apmu.o
|
|
smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o platsmp-apmu.o
|
|
smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o
|
|
|
|
# IRQ objects
|
|
obj-$(CONFIG_ARCH_SH7372) += entry-intc.o
|
|
|
|
# PM objects
|
|
obj-$(CONFIG_SUSPEND) += suspend.o
|
|
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
|
obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o pm-rmobile.o
|
|
obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o
|
|
obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o
|
|
obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o pm-rcar.o
|
|
obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o
|
|
|
|
# Board objects
|
|
ifdef CONFIG_ARCH_SHMOBILE_MULTI
|
|
obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o
|
|
obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o
|
|
obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o
|
|
else
|
|
obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o
|
|
obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o
|
|
obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
|
|
obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
|
|
obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
|
|
obj-$(CONFIG_MACH_GENMAI) += board-genmai.o
|
|
obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
|
|
obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o
|
|
obj-$(CONFIG_MACH_LAGER) += board-lager.o
|
|
obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
|
|
obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o
|
|
obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o
|
|
obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o
|
|
obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o
|
|
endif
|
|
|
|
# Framework support
|
|
obj-$(CONFIG_SMP) += $(smp-y)
|