2010-02-05 19:14:49 +08:00
|
|
|
#
|
|
|
|
|
# Makefile for the linux kernel.
|
|
|
|
|
#
|
|
|
|
|
|
2013-07-18 04:31:09 +08:00
|
|
|
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
|
|
|
|
|
|
2010-02-05 19:14:49 +08:00
|
|
|
# Common objects
|
2013-07-18 04:30:59 +08:00
|
|
|
obj-y := timer.o console.o
|
2010-02-05 19:14:49 +08:00
|
|
|
|
|
|
|
|
# CPU objects
|
2013-07-18 04:30:59 +08:00
|
|
|
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
|
ARM: Renesas SoC cleanup, refactoring and more SMP support
Lots of cleanup and refactoring and some SMP additions for Renesas
platforms. Due to some inter-dependencies with other arm-soc
branches, this Renesas stuff was separated out for sending after the
other branches were merged.
Highlights:
- remove unused board support and cleanup of unused headers
- refactoring of init and device registration
- simplify IRQ initialization
Conflicts: Too many. Most of these are because Simon chose to send
some board updates through the V4L tree that ends up colliding with
the main platform changes. We'll work with him on sorting out his
workflow:
- arch/arm/boot/dts/r8a7740.dtsi:
- Add/add conflict in a devicetree file (keep both)
- arch/arm/mach-shmobile/Makefile:
- Splitting out of clock files collides with intc move to DT.
Keep HEAD version but remove intc-* files for R8A7740 and R8A7779.
- arch/arm/mach-shmobile/board-bockw.c:
- Keep HEAD but remove i2c, hspi and mmc device init calls
- arch/arm/mach-shmobile/board-marzen.c
- Remove mach/hardware.h include and r8a7779_add_usb_phy_device() call,
everything else stays.
- arch/arm/mach-shmobile/include/mach/r8a7778.h:
- From HEAD, Keep camera-rcar.h include and r8a7778_add_vin_device()
- From branch, keep everything
- arch/arm/mach-shmobile/include/mach/r8a7779.h:
- From HEAD, Keep only camera-rcar.h include and r8a7779_add_vin_device()
- arch/arm/mach-shmobile/setup-r8a7778.c
- Keep HEAD, but drop the MMC section (struct resource + add_mmc_device())
- take the new function name from our side (r8a7778_add_dt_devices())
- arch/arm/mach-shmobile/setup-r8a7779.c
- Keep HEAD, but drop r8a7779_add_usb_phy_device()
I've also pushed a test-merge2 branch where you can see how I resolved
them.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSLkaWAAoJEFk3GJrT+8Zl5l8P/3oJ83VJHcjD2fMpAb8Dz5b6
pdRLxFLJrLxN+WTC1LylPom3EsSAJuuaG3Z8Cr9Xa6yoWuUYLy/A6MwsyLXBOGLC
3tVWa96xt1cHhd3p/NAOQwvRz/CFdMLM7MStd0mgSihj/pq3jtc2V697+dRtmJih
J0mIc8+jnig+uwVl1DMCmBqdEmasccaDZeX30PcjaPL9ZDyZBeSXI8brdDx8A21e
5RiAsqn9HCxrLZjedL9TWA23BJ7NccsI3aVGpQVtCa9N/MHKp8gZft3v8FrWzFjk
cOeaZY55Xq8hbbbmkF1LoezLrlQDF5aJcj6tl85lyuSJfR5d5BXmLswI7bglw8Qy
ZU7/aF28pbhUT3oozNuRx5yl8oqpxmUoCwfP5hfnFf590OJ3noIELbOoIZQkJQUy
LsCf3GMUQaWzrvs0IenM1lMJmw5zfDXbrUWUti95OAd5bbTdBE30z7EouejoKRVh
1/Wg4keBdtem4CpU+C4fUVtLL4XJhe/uadbjKteA7DRpTRMvrLYNutQgyOAuQjRM
RiLvDPnsIZEGV+YMsj+IemN0hanae4kR3v8At+HwvVK1hROWEQWyL6cGxXH9n9jB
VToxoYoyiAOk01X2BnPVMVTXEl5XMAVgZ1IgZNhnhaIUxi3HKrUfNG4oXE5Jx8Lw
XruUAUKHknTUJ2Q/3y4D
=Fagt
-----END PGP SIGNATURE-----
Merge tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM Renesas SoC cleanup, refactoring and more SMP support from Kevin Hilman:
"Lots of cleanup and refactoring and some SMP additions for Renesas
platforms. Due to some inter-dependencies with other arm-soc
branches, this Renesas stuff was separated out for sending after the
other branches were merged.
Highlights:
- remove unused board support and cleanup of unused headers
- refactoring of init and device registration
- simplify IRQ initialization"
* tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (68 commits)
ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs
ARM: shmobile: Introduce per-CPU SMP boot / sleep code
ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779
ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0
ARM: shmobile: Add shared SCU CPU Hotplug code
ARM: shmobile: Use shared SCU SMP boot code on emev2
ARM: shmobile: Use shared SCU SMP boot code on r8a7779
ARM: shmobile: Use shared SCU SMP boot code on sh73a0
ARM: shmobile: Introduce shared SCU SMP boot code
ARM: shmobile: sh73a0: Remove global GPIO_NR definition
ARM: shmobile: kzm9d: remove nfsroot settings from bootargs
ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs
ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup
ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup
ARM: shmobile: bockw: add missing __initdata
ARM: shmobile: r8a7790: add missing __initdata
ARM: shmobile: r8a7779: add missing __initdata
ARM: shmobile: Remove unused shmobile_init_time()
ARM: shmobile: Use clocksource_of_init() on r8a7790
ARM: shmobile: Use default ->init_time() on KZM9G DT ref
...
2013-09-10 07:33:57 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o
|
2013-07-18 04:30:59 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
|
ARM: Renesas SoC cleanup, refactoring and more SMP support
Lots of cleanup and refactoring and some SMP additions for Renesas
platforms. Due to some inter-dependencies with other arm-soc
branches, this Renesas stuff was separated out for sending after the
other branches were merged.
Highlights:
- remove unused board support and cleanup of unused headers
- refactoring of init and device registration
- simplify IRQ initialization
Conflicts: Too many. Most of these are because Simon chose to send
some board updates through the V4L tree that ends up colliding with
the main platform changes. We'll work with him on sorting out his
workflow:
- arch/arm/boot/dts/r8a7740.dtsi:
- Add/add conflict in a devicetree file (keep both)
- arch/arm/mach-shmobile/Makefile:
- Splitting out of clock files collides with intc move to DT.
Keep HEAD version but remove intc-* files for R8A7740 and R8A7779.
- arch/arm/mach-shmobile/board-bockw.c:
- Keep HEAD but remove i2c, hspi and mmc device init calls
- arch/arm/mach-shmobile/board-marzen.c
- Remove mach/hardware.h include and r8a7779_add_usb_phy_device() call,
everything else stays.
- arch/arm/mach-shmobile/include/mach/r8a7778.h:
- From HEAD, Keep camera-rcar.h include and r8a7778_add_vin_device()
- From branch, keep everything
- arch/arm/mach-shmobile/include/mach/r8a7779.h:
- From HEAD, Keep only camera-rcar.h include and r8a7779_add_vin_device()
- arch/arm/mach-shmobile/setup-r8a7778.c
- Keep HEAD, but drop the MMC section (struct resource + add_mmc_device())
- take the new function name from our side (r8a7778_add_dt_devices())
- arch/arm/mach-shmobile/setup-r8a7779.c
- Keep HEAD, but drop r8a7779_add_usb_phy_device()
I've also pushed a test-merge2 branch where you can see how I resolved
them.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSLkaWAAoJEFk3GJrT+8Zl5l8P/3oJ83VJHcjD2fMpAb8Dz5b6
pdRLxFLJrLxN+WTC1LylPom3EsSAJuuaG3Z8Cr9Xa6yoWuUYLy/A6MwsyLXBOGLC
3tVWa96xt1cHhd3p/NAOQwvRz/CFdMLM7MStd0mgSihj/pq3jtc2V697+dRtmJih
J0mIc8+jnig+uwVl1DMCmBqdEmasccaDZeX30PcjaPL9ZDyZBeSXI8brdDx8A21e
5RiAsqn9HCxrLZjedL9TWA23BJ7NccsI3aVGpQVtCa9N/MHKp8gZft3v8FrWzFjk
cOeaZY55Xq8hbbbmkF1LoezLrlQDF5aJcj6tl85lyuSJfR5d5BXmLswI7bglw8Qy
ZU7/aF28pbhUT3oozNuRx5yl8oqpxmUoCwfP5hfnFf590OJ3noIELbOoIZQkJQUy
LsCf3GMUQaWzrvs0IenM1lMJmw5zfDXbrUWUti95OAd5bbTdBE30z7EouejoKRVh
1/Wg4keBdtem4CpU+C4fUVtLL4XJhe/uadbjKteA7DRpTRMvrLYNutQgyOAuQjRM
RiLvDPnsIZEGV+YMsj+IemN0hanae4kR3v8At+HwvVK1hROWEQWyL6cGxXH9n9jB
VToxoYoyiAOk01X2BnPVMVTXEl5XMAVgZ1IgZNhnhaIUxi3HKrUfNG4oXE5Jx8Lw
XruUAUKHknTUJ2Q/3y4D
=Fagt
-----END PGP SIGNATURE-----
Merge tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM Renesas SoC cleanup, refactoring and more SMP support from Kevin Hilman:
"Lots of cleanup and refactoring and some SMP additions for Renesas
platforms. Due to some inter-dependencies with other arm-soc
branches, this Renesas stuff was separated out for sending after the
other branches were merged.
Highlights:
- remove unused board support and cleanup of unused headers
- refactoring of init and device registration
- simplify IRQ initialization"
* tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (68 commits)
ARM: shmobile: Per-CPU SMP boot / sleep code for SCU SoCs
ARM: shmobile: Introduce per-CPU SMP boot / sleep code
ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779
ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0
ARM: shmobile: Add shared SCU CPU Hotplug code
ARM: shmobile: Use shared SCU SMP boot code on emev2
ARM: shmobile: Use shared SCU SMP boot code on r8a7779
ARM: shmobile: Use shared SCU SMP boot code on sh73a0
ARM: shmobile: Introduce shared SCU SMP boot code
ARM: shmobile: sh73a0: Remove global GPIO_NR definition
ARM: shmobile: kzm9d: remove nfsroot settings from bootargs
ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs
ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup
ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup
ARM: shmobile: bockw: add missing __initdata
ARM: shmobile: r8a7790: add missing __initdata
ARM: shmobile: r8a7779: add missing __initdata
ARM: shmobile: Remove unused shmobile_init_time()
ARM: shmobile: Use clocksource_of_init() on r8a7790
ARM: shmobile: Use default ->init_time() on KZM9G DT ref
...
2013-09-10 07:33:57 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o
|
2013-07-18 04:30:59 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o
|
2013-09-12 08:32:49 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o setup-rcar-gen2.o
|
2013-10-01 16:12:48 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o setup-rcar-gen2.o
|
2013-07-18 04:30:59 +08:00
|
|
|
obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
|
2013-09-19 04:11:11 +08:00
|
|
|
obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o
|
2013-07-18 04:30:59 +08:00
|
|
|
|
|
|
|
|
# Clock objects
|
|
|
|
|
obj-y += clock.o
|
2014-03-13 07:36:17 +08:00
|
|
|
ifndef CONFIG_COMMON_CLK
|
2013-07-18 04:30:59 +08:00
|
|
|
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
|
2013-09-04 11:45:57 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7791) += clock-r8a7791.o
|
2013-09-19 04:11:11 +08:00
|
|
|
obj-$(CONFIG_ARCH_R7S72100) += clock-r7s72100.o
|
2013-07-18 04:30:59 +08:00
|
|
|
endif
|
2010-02-05 19:14:49 +08:00
|
|
|
|
2010-12-14 15:56:55 +08:00
|
|
|
# SMP objects
|
|
|
|
|
smp-y := platsmp.o headsmp.o
|
2013-07-31 15:07:21 +08:00
|
|
|
smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o platsmp-scu.o
|
2013-07-31 15:07:31 +08:00
|
|
|
smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o platsmp-scu.o
|
2013-08-29 07:22:07 +08:00
|
|
|
smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o platsmp-apmu.o
|
2013-10-01 16:13:16 +08:00
|
|
|
smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o platsmp-apmu.o
|
2013-07-31 15:07:40 +08:00
|
|
|
smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o
|
2010-12-14 15:56:55 +08:00
|
|
|
|
2010-12-28 16:27:01 +08:00
|
|
|
# IRQ objects
|
|
|
|
|
obj-$(CONFIG_ARCH_SH7372) += entry-intc.o
|
|
|
|
|
|
2011-04-29 01:23:28 +08:00
|
|
|
# PM objects
|
|
|
|
|
obj-$(CONFIG_SUSPEND) += suspend.o
|
2011-04-29 01:36:07 +08:00
|
|
|
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
2013-07-09 18:40:01 +08:00
|
|
|
obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o pm-rmobile.o
|
2012-12-05 20:13:06 +08:00
|
|
|
obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o
|
2013-07-09 18:40:01 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o
|
2014-01-15 15:43:08 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o pm-rcar.o
|
2014-01-15 20:25:49 +08:00
|
|
|
obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o
|
2011-04-29 01:23:28 +08:00
|
|
|
|
2010-02-05 19:14:49 +08:00
|
|
|
# Board objects
|
2013-10-01 18:33:15 +08:00
|
|
|
ifdef CONFIG_ARCH_SHMOBILE_MULTI
|
2013-11-07 07:31:25 +08:00
|
|
|
obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o
|
2013-11-06 18:40:01 +08:00
|
|
|
obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o
|
2013-12-11 22:13:52 +08:00
|
|
|
obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o
|
2013-10-01 18:33:15 +08:00
|
|
|
else
|
2013-03-29 16:00:02 +08:00
|
|
|
obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o
|
2013-07-09 00:04:57 +08:00
|
|
|
obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o
|
2010-11-29 10:21:21 +08:00
|
|
|
obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
|
2013-03-21 18:03:38 +08:00
|
|
|
obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
|
2013-07-24 15:36:51 +08:00
|
|
|
obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
|
2013-09-19 04:11:29 +08:00
|
|
|
obj-$(CONFIG_MACH_GENMAI) += board-genmai.o
|
2011-12-14 00:36:12 +08:00
|
|
|
obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
|
2013-01-29 10:40:18 +08:00
|
|
|
obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o
|
2013-03-29 16:49:37 +08:00
|
|
|
obj-$(CONFIG_MACH_LAGER) += board-lager.o
|
2012-04-06 16:28:59 +08:00
|
|
|
obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
|
2013-04-17 18:34:06 +08:00
|
|
|
obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o
|
2013-09-04 11:46:49 +08:00
|
|
|
obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o
|
2012-04-11 11:57:31 +08:00
|
|
|
obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o
|
2012-11-21 23:34:25 +08:00
|
|
|
obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o
|
2013-10-01 18:33:15 +08:00
|
|
|
endif
|
2010-12-14 15:15:35 +08:00
|
|
|
|
|
|
|
|
# Framework support
|
2010-12-14 15:56:55 +08:00
|
|
|
obj-$(CONFIG_SMP) += $(smp-y)
|