diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-04 14:32:21 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-04 14:32:21 -0800 |
| commit | 5d3e1cf2452e847ef3ddf8ff042c7f1ac17ede31 (patch) | |
| tree | 20a0d0b65c84dbe784e95cd6777ea922e475fd77 /arch/arm/boot/dts/Makefile | |
| parent | a3206509f634fd5838e50330c72eee0ce318332f (diff) | |
| parent | 120f038cf04b95dc895cba503a7516ff75561438 (diff) | |
Merge tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:
* Add chosen/stdout-path to DTS files for shmobile boards
* Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
- The corresponding board file has already been removed
* Sort dts nodes by address
* Sort SHMOBILE dtbs alphabetically in Makefile
* tag 'renesas-dt-cleanups-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: kzm9d dts: Add chosen/stdout-path
ARM: shmobile: kzm9g-reference dts: Add chosen/stdout-path
ARM: shmobile: alt dts: Add chosen/stdout-path
ARM: shmobile: koelsch dts: Add chosen/stdout-path
ARM: shmobile: henninger dts: Add chosen/stdout-path
ARM: shmobile: lager dts: Add chosen/stdout-path
ARM: shmobile: marzen dts: Add chosen/stdout-path
ARM: shmobile: bockw-reference dts: Add chosen/stdout-path
ARM: shmobile: armadillo800eva dts: Add chosen/stdout-path
ARM: shmobile: ape6evm-reference dts: Add chosen/stdout-path
ARM: shmobile: genmai dts: Add chosen/stdout-path
ARM: shmobile: emev2 dtsi: Add uart* labels for easier referencing
ARM: shmobile: emev2 dtsi: Use generic names for device nodes
ARM: shmobile: r7s72100: Remove r7s72100-genmai.dtb for ARCH_SHMOBILE_LEGACY
ARM: shmobile: r8a73a4: sort dtsi file by address
ARM: shmobile: kzm9d: sort dts file by address
ARM: shmobile: r7s72100: sort dtsi file by address
ARM: shmobile: r8a73a4: Remove spurious dma-multiplexer base addresses
ARM: dts: Sort SHMOBILE dtbs alphabetically
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 818c63e90ee3..387b69114036 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -378,25 +378,25 @@ dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-aquila.dtb \ s5pv210-smdkc110.dtb \ s5pv210-smdkv210.dtb \ s5pv210-torbreck.dtb -dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \ +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \ + r8a73a4-ape6evm.dtb \ + r8a73a4-ape6evm-reference.dtb \ r8a7740-armadillo800eva.dtb \ r8a7778-bockw.dtb \ r8a7778-bockw-reference.dtb \ r8a7779-marzen.dtb \ - r8a7791-koelsch.dtb \ r8a7790-lager.dtb \ + r8a7791-koelsch.dtb \ + sh7372-mackerel.dtb \ sh73a0-kzm9g.dtb \ - sh73a0-kzm9g-reference.dtb \ - r8a73a4-ape6evm.dtb \ - r8a73a4-ape6evm-reference.dtb \ - sh7372-mackerel.dtb + sh73a0-kzm9g-reference.dtb dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ r7s72100-genmai.dtb \ r8a7740-armadillo800eva.dtb \ + r8a7779-marzen.dtb \ + r8a7790-lager.dtb \ r8a7791-henninger.dtb \ r8a7791-koelsch.dtb \ - r8a7790-lager.dtb \ - r8a7779-marzen.dtb \ r8a7794-alt.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \ socfpga_cyclone5_socdk.dtb \ |