aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2014-10-29 03:47:07 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-12-21 03:03:44 -0500
commita483dcbfa21f919c7666cb897e293eff785e3bee (patch)
treefa723ec382a7873cbff171143d50ce63ddfdb885
parentbe2902416cc6f26d05a9b7308b78d093ad69062c (diff)
ARM: shmobile: lager: Remove legacy board support
Lager legacy support level is same as the DT case so remove the legacy code and force people to move over to using Multiplatform and DT. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> [Remove lager_defconfig and don't build the dtb for legacy kernels] Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--MAINTAINERS1
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/configs/lager_defconfig150
-rw-r--r--arch/arm/mach-shmobile/Kconfig7
-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-lager.c827
7 files changed, 0 insertions, 988 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ddb9ac8d32b3..f1f41fc48bb8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1395,7 +1395,6 @@ F: arch/arm/configs/ape6evm_defconfig
1395F: arch/arm/configs/armadillo800eva_defconfig 1395F: arch/arm/configs/armadillo800eva_defconfig
1396F: arch/arm/configs/bockw_defconfig 1396F: arch/arm/configs/bockw_defconfig
1397F: arch/arm/configs/kzm9g_defconfig 1397F: arch/arm/configs/kzm9g_defconfig
1398F: arch/arm/configs/lager_defconfig
1399F: arch/arm/configs/mackerel_defconfig 1398F: arch/arm/configs/mackerel_defconfig
1400F: arch/arm/configs/marzen_defconfig 1399F: arch/arm/configs/marzen_defconfig
1401F: arch/arm/configs/shmobile_defconfig 1400F: arch/arm/configs/shmobile_defconfig
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 91bd5bd62857..19cb6fcecf89 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -410,7 +410,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
410 r8a7778-bockw.dtb \ 410 r8a7778-bockw.dtb \
411 r8a7778-bockw-reference.dtb \ 411 r8a7778-bockw-reference.dtb \
412 r8a7779-marzen.dtb \ 412 r8a7779-marzen.dtb \
413 r8a7790-lager.dtb \
414 sh7372-mackerel.dtb \ 413 sh7372-mackerel.dtb \
415 sh73a0-kzm9g.dtb \ 414 sh73a0-kzm9g.dtb \
416 sh73a0-kzm9g-reference.dtb 415 sh73a0-kzm9g-reference.dtb
diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
deleted file mode 100644
index a82afc916a89..000000000000
--- a/arch/arm/configs/lager_defconfig
+++ /dev/null
@@ -1,150 +0,0 @@
1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_IKCONFIG=y
4CONFIG_IKCONFIG_PROC=y
5CONFIG_LOG_BUF_SHIFT=16
6CONFIG_CC_OPTIMIZE_FOR_SIZE=y
7CONFIG_SYSCTL_SYSCALL=y
8CONFIG_EMBEDDED=y
9CONFIG_PERF_EVENTS=y
10CONFIG_SLAB=y
11# CONFIG_LBDAF is not set
12# CONFIG_BLK_DEV_BSG is not set
13# CONFIG_IOSCHED_DEADLINE is not set
14# CONFIG_IOSCHED_CFQ is not set
15CONFIG_ARCH_SHMOBILE_LEGACY=y
16CONFIG_ARCH_R8A7790=y
17CONFIG_MACH_LAGER=y
18# CONFIG_SH_TIMER_TMU is not set
19# CONFIG_EM_TIMER_STI is not set
20CONFIG_ARM_ERRATA_430973=y
21CONFIG_ARM_ERRATA_458693=y
22CONFIG_ARM_ERRATA_460075=y
23CONFIG_ARM_ERRATA_743622=y
24CONFIG_ARM_ERRATA_754322=y
25CONFIG_PCI=y
26CONFIG_PCI_RCAR_GEN2=y
27CONFIG_PCI_RCAR_GEN2_PCIE=y
28CONFIG_HAVE_ARM_ARCH_TIMER=y
29CONFIG_AEABI=y
30# CONFIG_OABI_COMPAT is not set
31CONFIG_FORCE_MAX_ZONEORDER=13
32CONFIG_ZBOOT_ROM_TEXT=0x0
33CONFIG_ZBOOT_ROM_BSS=0x0
34CONFIG_ARM_APPENDED_DTB=y
35CONFIG_KEXEC=y
36CONFIG_AUTO_ZRELADDR=y
37CONFIG_VFP=y
38CONFIG_NEON=y
39# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40CONFIG_PM=y
41CONFIG_NET=y
42CONFIG_PACKET=y
43CONFIG_UNIX=y
44CONFIG_INET=y
45CONFIG_IP_PNP=y
46CONFIG_IP_PNP_DHCP=y
47# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
48# CONFIG_INET_XFRM_MODE_TUNNEL is not set
49# CONFIG_INET_XFRM_MODE_BEET is not set
50# CONFIG_INET_LRO is not set
51# CONFIG_INET_DIAG is not set
52# CONFIG_IPV6 is not set
53# CONFIG_WIRELESS is not set
54CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
55CONFIG_DEVTMPFS=y
56CONFIG_DEVTMPFS_MOUNT=y
57CONFIG_MTD=y
58CONFIG_MTD_M25P80=y
59CONFIG_MTD_SPI_NOR=y
60CONFIG_BLK_DEV_SD=y
61CONFIG_ATA=y
62CONFIG_SATA_RCAR=y
63CONFIG_NETDEVICES=y
64# CONFIG_NET_CORE is not set
65# CONFIG_NET_VENDOR_ARC is not set
66# CONFIG_NET_CADENCE is not set
67# CONFIG_NET_VENDOR_BROADCOM is not set
68# CONFIG_NET_VENDOR_CIRRUS is not set
69# CONFIG_NET_VENDOR_FARADAY is not set
70# CONFIG_NET_VENDOR_INTEL is not set
71# CONFIG_NET_VENDOR_MARVELL is not set
72# CONFIG_NET_VENDOR_MICREL is not set
73# CONFIG_NET_VENDOR_NATSEMI is not set
74CONFIG_SH_ETH=y
75# CONFIG_NET_VENDOR_SEEQ is not set
76# CONFIG_NET_VENDOR_SMSC is not set
77# CONFIG_NET_VENDOR_STMICRO is not set
78# CONFIG_NET_VENDOR_VIA is not set
79# CONFIG_NET_VENDOR_WIZNET is not set
80# CONFIG_WLAN is not set
81# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
82CONFIG_INPUT_EVDEV=y
83# CONFIG_KEYBOARD_ATKBD is not set
84CONFIG_KEYBOARD_GPIO=y
85# CONFIG_INPUT_MOUSE is not set
86# CONFIG_SERIO is not set
87# CONFIG_LEGACY_PTYS is not set
88CONFIG_SERIAL_SH_SCI=y
89CONFIG_SERIAL_SH_SCI_NR_UARTS=10
90CONFIG_SERIAL_SH_SCI_CONSOLE=y
91# CONFIG_HW_RANDOM is not set
92CONFIG_I2C_GPIO=y
93CONFIG_I2C_SH_MOBILE=y
94CONFIG_I2C_RCAR=y
95CONFIG_SPI=y
96CONFIG_SPI_RSPI=y
97CONFIG_SPI_SH_MSIOF=y
98CONFIG_GPIO_SH_PFC=y
99CONFIG_GPIOLIB=y
100CONFIG_GPIO_RCAR=y
101# CONFIG_HWMON is not set
102CONFIG_THERMAL=y
103CONFIG_RCAR_THERMAL=y
104CONFIG_REGULATOR=y
105CONFIG_REGULATOR_FIXED_VOLTAGE=y
106CONFIG_REGULATOR_DA9210=y
107CONFIG_REGULATOR_GPIO=y
108CONFIG_MEDIA_SUPPORT=y
109CONFIG_MEDIA_CAMERA_SUPPORT=y
110CONFIG_V4L_PLATFORM_DRIVERS=y
111CONFIG_SOC_CAMERA=y
112CONFIG_SOC_CAMERA_PLATFORM=y
113CONFIG_VIDEO_RCAR_VIN=y
114# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
115CONFIG_VIDEO_ADV7180=y
116CONFIG_DRM=y
117CONFIG_DRM_RCAR_DU=y
118CONFIG_SOUND=y
119CONFIG_SND=y
120CONFIG_SND_SOC=y
121CONFIG_SND_SOC_RCAR=y
122# CONFIG_USB_SUPPORT is not set
123CONFIG_MMC=y
124CONFIG_MMC_SDHI=y
125CONFIG_MMC_SH_MMCIF=y
126CONFIG_NEW_LEDS=y
127CONFIG_LEDS_CLASS=y
128CONFIG_LEDS_GPIO=y
129CONFIG_RTC_CLASS=y
130CONFIG_DMADEVICES=y
131CONFIG_SH_DMAE=y
132# CONFIG_IOMMU_SUPPORT is not set
133# CONFIG_DNOTIFY is not set
134CONFIG_MSDOS_FS=y
135CONFIG_VFAT_FS=y
136CONFIG_TMPFS=y
137CONFIG_CONFIGFS_FS=y
138# CONFIG_MISC_FILESYSTEMS is not set
139CONFIG_NFS_FS=y
140CONFIG_NFS_V3_ACL=y
141CONFIG_NFS_V4=y
142CONFIG_NFS_V4_1=y
143CONFIG_ROOT_NFS=y
144CONFIG_NLS_CODEPAGE_437=y
145CONFIG_NLS_ISO8859_1=y
146# CONFIG_ENABLE_WARN_DEPRECATED is not set
147# CONFIG_ENABLE_MUST_CHECK is not set
148# CONFIG_ARM_UNWIND is not set
149# CONFIG_CRYPTO_ANSI_CPRNG is not set
150# CONFIG_CRYPTO_HW is not set
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 859f391aa6e1..d4211cba3513 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -203,13 +203,6 @@ config MACH_MARZEN
203 select REGULATOR_FIXED_VOLTAGE if REGULATOR 203 select REGULATOR_FIXED_VOLTAGE if REGULATOR
204 select USE_OF 204 select USE_OF
205 205
206config MACH_LAGER
207 bool "Lager board"
208 depends on ARCH_R8A7790
209 select USE_OF
210 select MICREL_PHY if SH_ETH
211 select SND_SOC_AK4642 if SND_SIMPLE_CARD
212
213config MACH_KZM9G 206config MACH_KZM9G
214 bool "KZM-A9-GT board" 207 bool "KZM-A9-GT board"
215 depends on ARCH_SH73A0 208 depends on ARCH_SH73A0
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 85692c9a1cef..3eefe7dc74b6 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -65,7 +65,6 @@ obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
65obj-$(CONFIG_MACH_BOCKW) += board-bockw.o 65obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
66obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o 66obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
67obj-$(CONFIG_MACH_MARZEN) += board-marzen.o 67obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
68obj-$(CONFIG_MACH_LAGER) += board-lager.o
69obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o 68obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o