diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 08:30:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 08:30:53 +0100 |
| commit | 86dd04a22a9880a9f790473d535f77edee5f621f (patch) | |
| tree | e105aab1465bddf69a72103b3904ee45507eac2e /arch/arm/boot/dts | |
| parent | 21220a7a32c907d620ab60098c7da5bfdba24c13 (diff) | |
| parent | 79e69d179cb3391040a3693fca8bc12ec03c05fc (diff) | |
Merge tag 'renesas-koelsch-board-removal-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Pull "Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19" from Simon Horman:
* Remove lecacy C koelsh board support
* tag 'renesas-koelsch-board-removal-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: koelsch dts: Drop console= bootargs parameter
ARM: dts: koelsch: Stop building r8a7791-koelsch.dtb in legacy builds
MAINTAINERS: Remove reference to shmobile / koelsch_defconfig
ARM: shmobile: koelsch: Remove reference board code
ARM: shmobile: r8a7791: Remove legacy code
ARM: shmobile: koelsch: Remove legacy C board code
ARM: shmobile: Remove shmobile_clk_workaround() implementation
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 93feee3473f..fe92f5df9d3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -384,7 +384,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \ r8a7778-bockw-reference.dtb \ r8a7779-marzen.dtb \ r8a7790-lager.dtb \ - r8a7791-koelsch.dtb \ sh7372-mackerel.dtb \ sh73a0-kzm9g.dtb \ sh73a0-kzm9g-reference.dtb diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index 5e4d833ae49..924183817b0 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -25,7 +25,7 @@ }; chosen { - bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; + bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp"; stdout-path = &scif0; }; |