aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2014-09-17 10:28:02 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-10-29 21:14:57 -0400
commit9e6edccf191fb15ad751796a7962128d2469e209 (patch)
tree31729abb7e0f18692f8360442e53d9a8b7a4760c
parent74c917076ab96f648b96a39ec1ce7a8a7ed361f5 (diff)
ARM: shmobile: koelsch: Remove reference board code
The Koelsch board is supported by the r8a7791 generic DT platform definition. Remove the board-specific definition along with its board file. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/configs/shmobile_defconfig1
-rw-r--r--arch/arm/mach-shmobile/Kconfig5
-rw-r--r--arch/arm/mach-shmobile/Makefile1
-rw-r--r--arch/arm/mach-shmobile/Makefile.boot1
-rw-r--r--arch/arm/mach-shmobile/board-koelsch-reference.c40
5 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index d7346ad51043..c8201a93b54d 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_R8A7779=y
17CONFIG_ARCH_R8A7790=y 17CONFIG_ARCH_R8A7790=y
18CONFIG_ARCH_R8A7791=y 18CONFIG_ARCH_R8A7791=y
19CONFIG_ARCH_R8A7794=y 19CONFIG_ARCH_R8A7794=y
20CONFIG_MACH_KOELSCH=y
21CONFIG_MACH_LAGER=y 20CONFIG_MACH_LAGER=y
22CONFIG_MACH_MARZEN=y 21CONFIG_MACH_MARZEN=y
23# CONFIG_SWP_EMULATE is not set 22# CONFIG_SWP_EMULATE is not set
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index e50402bc6e71..fcc181feebb1 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -73,11 +73,6 @@ config ARCH_R8A7794
73 73
74comment "Renesas ARM SoCs Board Type" 74comment "Renesas ARM SoCs Board Type"
75 75
76config MACH_KOELSCH
77 bool "Koelsch board"
78 depends on ARCH_R8A7791
79 select MICREL_PHY if SH_ETH
80
81config MACH_LAGER 76config MACH_LAGER
82 bool "Lager board" 77 bool "Lager board"
83 depends on ARCH_R8A7790 78 depends on ARCH_R8A7790
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index fbb7f85a4e7c..7d68eba53be3 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -56,7 +56,6 @@ obj-$(CONFIG_ARCH_SH7372) += entry-intc.o sleep-sh7372.o
56 56
57# Board objects 57# Board objects
58ifdef CONFIG_ARCH_SHMOBILE_MULTI 58ifdef CONFIG_ARCH_SHMOBILE_MULTI
59obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o
60obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o 59obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o
61obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o 60obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o
62else 61else
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index de9a23852fc8..57d00ed6ec0c 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -5,7 +5,6 @@ loadaddr-$(CONFIG_MACH_APE6EVM_REFERENCE) += 0x40008000
5loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 5loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
6loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 6loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
7loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 7loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
8loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000
9loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 8loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
10loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 9loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
11loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000 10loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
deleted file mode 100644
index 451ba624ce6e..000000000000
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ /dev/null
@@ -1,40 +0,0 @@
1/*
2 * Koelsch board support - Reference DT implementation
3 *
4 * Copyright (C) 2013 Renesas Electronics Corporation
5 * Copyright (C) 2013 Renesas Solutions Corp.
6 * Copyright (C) 2013 Magnus Damm
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; version 2 of the License.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 */
17
18#include <linux/kernel.h>
19#include <linux/of_platform.h>
20
21#include <asm/mach/arch.h>
22
23#include "common.h"
24#include "r8a7791.h"
25#include "rcar-gen2.h"
26
27static const char * const koelsch_boards_compat_dt[] __initconst = {
28 "renesas,koelsch",
29 "renesas,koelsch-reference",
30 NULL,
31};
32
33DT_MACHINE_START(KOELSCH_DT, "koelsch")
34 .smp = smp_ops(r8a7791_smp_ops),
35 .init_early = shmobile_init_delay,
36 .init_time = rcar_gen2_timer_init,
37 .init_late = shmobile_init_late,
38 .reserve = rcar_gen2_reserve,
39 .dt_compat = koelsch_boards_compat_dt,
40MACHINE_END