mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-16 23:45:31 +08:00
e5ac320de1
The changes here belong to two main platforms:
- Atmel At91 is flipping the bit and going multiplatform. This includes some
cleanups and removal of code, and the final flip of config dependencies
- Shmobile has several platforms that are going multiplatform, but this
branch also contains a bunch of cleanups that they weren't able to keep
separate in a good way. THere's also a removal of one of their SoCs and the
corresponding boards (sh7372 and mackerel).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVNzfJAAoJEIwa5zzehBx3iRcP/1v9Rw2yk4NpUDaz5EUwhwN6
y5l29gW8jJmVuHWqLUqsgh61dsj5AEEAL7fEEbR8e8848s+RxsehjsGPIxFOkR74
KaKSRlrUgxKcsFN97Jo/WqT3seC83hg6zWQapwNypX33gBtrRLPhM9FEb05asYA8
6x7N29kFeH9M3A6lrabXGWz5tPRZSthwuBSmomHOfgqa5zbgkoaK59j867Yac0q+
Pemh0eJZHC3Pyrmh7ZcVaCaSvr1QO6ructmLopmHAXfls2Fi21wq3IN3641aiitC
G7hhb1/c961MpE3p+0dQyrXs645qIgYv/fDxp72T8YwA7FhjMmIscX/WiITXMlvC
Mg/fDJXqgRkTPWjvVM6xF8TKCSdvqfmErWtHt2dtgvbFWL0ffSeoYF35AF5BODVG
jp8RR6vQ/CHKFao5iJmTpm0ccjnzdS82FEb0PrhG0vY+u6uCsKMim5tn8wUBuBkM
QU2FipNt6STC5ZcCSb+p7r5ihod9rG+BlNL/eXJ+pBHuVnjSgltEaZBP9qIiFjZl
MLRjm7JaEY3LpAR/TVurtSrUnh0zC0RRSzptK4RekmFIwyL+mqq/I1yrksdnVjgf
upj1dZwFRsVtD5PcaU3LyTYCOLSI8L9+b6vVvfFH0Sq4V7TkaBkI/kxnhI2WfkBc
CJ+3vptpyphw6zHAngAN
=Vq4N
-----END PGP SIGNATURE-----
Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC multiplatform code changes from Olof Johansson:
"The changes here belong to two main platforms:
- Atmel At91 is flipping the bit and going multiplatform. This
includes some cleanups and removal of code, and the final flip of
config dependencies
- Shmobile has several platforms that are going multiplatform, but
this branch also contains a bunch of cleanups that they weren't
able to keep separate in a good way. THere's also a removal of one
of their SoCs and the corresponding boards (sh7372 and mackerel)"
* tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
ARM: at91/pm: move the standby functions to pm.c
ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
ARM: at91: add a Kconfig dependency on multi-platform
ARM: at91: drop AT91_TIMER_HZ
ARM: at91: remove hardware.h
ARM: at91: remove SoC headers
ARM: at91: remove useless mach/cpu.h
ARM: at91: remove unused headers
ARM: at91: switch at91_dt_defconfig to multiplatform
ARM: at91: switch to multiplatform
ARM: shmobile: r8a7778: enable multiplatform target
ARM: shmobile: bockw: add sound to DT
ARM: shmobile: r8a7778: add sound to DT
ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
DT: i2c: add trivial binding for OKI ML86V7667 video decoder
ARM: shmobile: r8a7778: common clock framework CPG driver
ARM: shmobile: bockw dts: set extal clock frequency
ARM: shmobile: bockw dts: Move Ethernet node to BSC
ARM: shmobile: r8a73a4: Remove legacy code
...
66 lines
2.1 KiB
Makefile
66 lines
2.1 KiB
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
# Common objects
|
|
obj-y := timer.o console.o
|
|
|
|
# CPU objects
|
|
obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o pm-sh73a0.o
|
|
obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o
|
|
obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o
|
|
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
|
|
obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o pm-r8a7779.o
|
|
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o
|
|
obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o
|
|
obj-$(CONFIG_ARCH_R8A7794) += setup-r8a7794.o
|
|
obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
|
|
obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o
|
|
|
|
# Clock objects
|
|
ifndef CONFIG_COMMON_CLK
|
|
obj-y += clock.o
|
|
obj-$(CONFIG_ARCH_SH73A0) += clock-sh73a0.o
|
|
obj-$(CONFIG_ARCH_R8A7740) += clock-r8a7740.o
|
|
obj-$(CONFIG_ARCH_R8A7778) += clock-r8a7778.o
|
|
obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o
|
|
endif
|
|
|
|
# CPU reset vector handling objects
|
|
cpu-y := platsmp.o headsmp.o
|
|
|
|
# Shared SoC family objects
|
|
obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)
|
|
CFLAGS_setup-rcar-gen2.o += -march=armv7-a
|
|
obj-$(CONFIG_ARCH_R8A7790) += regulator-quirk-rcar-gen2.o
|
|
obj-$(CONFIG_ARCH_R8A7791) += regulator-quirk-rcar-gen2.o
|
|
|
|
# SMP objects
|
|
smp-y := $(cpu-y)
|
|
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
|
|
smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o
|
|
smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o
|
|
|
|
# PM objects
|
|
obj-$(CONFIG_SUSPEND) += suspend.o
|
|
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
|
|
obj-$(CONFIG_PM_RCAR) += pm-rcar.o
|
|
obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o
|
|
obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o
|
|
|
|
# Board objects
|
|
ifdef CONFIG_ARCH_SHMOBILE_MULTI
|
|
obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o
|
|
else
|
|
obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
|
|
obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
|
|
obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
|
|
obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
|
|
obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o intc-sh73a0.o
|
|
endif
|
|
|
|
# Framework support
|
|
obj-$(CONFIG_SMP) += $(smp-y)
|