Skip to contentSkip to conversation

ARM: shmobile: Remove G3EVM machine support

PATCH New Nobuhiro Iwamatsu 2 participants 6 messages Nov 6, 2012

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/4 ARM: shmobile: Remove G3EVM machine support

This machine is using old CPU of shmobile (SH7367) and cannot obtain machine, either.
Therefore, remove G3EVM support.

---
 arch/arm/configs/g3evm_defconfig     |   57 ------
 arch/arm/mach-shmobile/Kconfig       |    7 -
 arch/arm/mach-shmobile/Makefile      |    1 -
 arch/arm/mach-shmobile/board-g3evm.c |  343 ----------------------------------
 4 files changed, 408 deletions(-)
 delete mode 100644 arch/arm/configs/g3evm_defconfig
 delete mode 100644 arch/arm/mach-shmobile/board-g3evm.c
arch/arm/configs/g3evm_defconfig deleted +0 -57
deleted file mode 100644
index 4a336ab..0000000
@@ -1,57 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_SLAB=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
-CONFIG_ARCH_SH7367=y
-CONFIG_MACH_G3EVM=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySC1,115200 earlyprintk=sh-sci.1,115200"
-CONFIG_KEXEC=y
-CONFIG_PM=y
-# CONFIG_SUSPEND is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-# CONFIG_BLK_DEV is not set
-# CONFIG_MISC_DEVICES is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=8
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-CONFIG_TMPFS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_FTRACE is not set
-# CONFIG_CRC32 is not set
arch/arm/mach-shmobile/Kconfig +0 -7
index 8ae100c..614121f 100644
@@ -50,11 +50,6 @@ config ARCH_EMEV2
 
 comment "SH-Mobile Board Type"
 
-config MACH_G3EVM
-	bool "G3EVM board"
-	depends on ARCH_SH7367
-	select ARCH_REQUIRE_GPIOLIB
-
 config MACH_G4EVM
 	bool "G4EVM board"
 	depends on ARCH_SH7377
@@ -146,7 +141,6 @@ menu "Memory configuration"
 
 config MEMORY_START
 	hex "Physical memory start address"
-	default "0x50000000" if MACH_G3EVM
 	default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
 				MACH_MACKEREL || MACH_BONITO || \
 				MACH_ARMADILLO800EVA
@@ -159,7 +153,6 @@ config MEMORY_START
 
 config MEMORY_SIZE
 	hex "Physical memory size"
-	default "0x08000000" if MACH_G3EVM
 	default "0x08000000" if MACH_G4EVM
 	default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \
 				MACH_ARMADILLO800EVA
arch/arm/mach-shmobile/Makefile +0 -1
index fe2c97c..30a6c83 100644
@@ -45,7 +45,6 @@ obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o
 
 # Board objects
-obj-$(CONFIG_MACH_G3EVM)	+= board-g3evm.o
 obj-$(CONFIG_MACH_G4EVM)	+= board-g4evm.o
 obj-$(CONFIG_MACH_AP4EVB)	+= board-ap4evb.o
 obj-$(CONFIG_MACH_AG5EVM)	+= board-ag5evm.o
arch/arm/mach-shmobile/board-g3evm.c deleted +0 -343

343 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 2/4 ARM: shmobile: Remove SH7367 support

This is old CPU of shmobile, and the machine by which this CPU is used cannot be obtained.
Therefore, remove SH7367 support.

---

V2: Remove arch/arm/mach-shmobile/pfc-sh7372.c from patch.

 arch/arm/mach-shmobile/Kconfig               |    6 -
 arch/arm/mach-shmobile/Makefile              |    3 -
 arch/arm/mach-shmobile/clock-sh7367.c        |  355 ------
 arch/arm/mach-shmobile/include/mach/common.h |    9 -
 arch/arm/mach-shmobile/include/mach/sh7367.h |  332 -----
 arch/arm/mach-shmobile/intc-sh7367.c         |  413 ------
 arch/arm/mach-shmobile/pfc-sh7367.c          | 1727 --------------------------
 arch/arm/mach-shmobile/setup-sh7367.c        |  481 -------
 8 files changed, 3326 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/clock-sh7367.c
 delete mode 100644 arch/arm/mach-shmobile/include/mach/sh7367.h
 delete mode 100644 arch/arm/mach-shmobile/intc-sh7367.c
 delete mode 100644 arch/arm/mach-shmobile/pfc-sh7367.c
 delete mode 100644 arch/arm/mach-shmobile/setup-sh7367.c
arch/arm/mach-shmobile/Kconfig +0 -6
index 614121f..d3bc963 100644
@@ -2,12 +2,6 @@ if ARCH_SHMOBILE
 
 comment "SH-Mobile System Type"
 
-config ARCH_SH7367
-	bool "SH-Mobile G3 (SH7367)"
-	select ARCH_WANT_OPTIONAL_GPIOLIB
-	select CPU_V6
-	select SH_CLK_CPG
-
 config ARCH_SH7377
 	bool "SH-Mobile G4 (SH7377)"
 	select ARCH_WANT_OPTIONAL_GPIOLIB
arch/arm/mach-shmobile/Makefile +0 -3
index 30a6c83..7cad2bc 100644
@@ -6,7 +6,6 @@
 obj-y				:= timer.o console.o clock.o
 
 # CPU objects
-obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o
 obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7377.o intc-sh7377.o
 obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7372.o intc-sh7372.o
 obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
@@ -23,7 +22,6 @@ smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o
 
 # Pinmux setup
 pfc-y				:=
-pfc-$(CONFIG_ARCH_SH7367)	+= pfc-sh7367.o
 pfc-$(CONFIG_ARCH_SH7377)	+= pfc-sh7377.o
 pfc-$(CONFIG_ARCH_SH7372)	+= pfc-sh7372.o
 pfc-$(CONFIG_ARCH_SH73A0)	+= pfc-sh73a0.o
@@ -31,7 +29,6 @@ pfc-$(CONFIG_ARCH_R8A7740)	+= pfc-r8a7740.o
 pfc-$(CONFIG_ARCH_R8A7779)	+= pfc-r8a7779.o
 
 # IRQ objects
-obj-$(CONFIG_ARCH_SH7367)	+= entry-intc.o
 obj-$(CONFIG_ARCH_SH7377)	+= entry-intc.o
 obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o
 obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc.o
arch/arm/mach-shmobile/clock-sh7367.c deleted +0 -355

355 lines not on this page · raw message

arch/arm/mach-shmobile/include/mach/common.h +0 -9
index d47e215..f96fc29 100644
@@ -18,15 +18,6 @@ extern int shmobile_enter_wfi(struct cpuidle_device *dev,
 			      struct cpuidle_driver *drv, int index);
 extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
 
-extern void sh7367_init_irq(void);
-extern void sh7367_map_io(void);
-extern void sh7367_add_early_devices(void);
-extern void sh7367_add_standard_devices(void);
-extern void sh7367_clock_init(void);
-extern void sh7367_pinmux_init(void);
-extern struct clk sh7367_extalb1_clk;
-extern struct clk sh7367_extal2_clk;
-
 extern void sh7377_init_irq(void);
 extern void sh7377_map_io(void);
 extern void sh7377_add_early_devices(void);
arch/arm/mach-shmobile/include/mach/sh7367.h deleted +0 -332

332 lines not on this page · raw message

arch/arm/mach-shmobile/intc-sh7367.c deleted +0 -413

413 lines not on this page · raw message

arch/arm/mach-shmobile/pfc-sh7367.c deleted +0 -1727

1,727 lines not on this page · raw message

arch/arm/mach-shmobile/setup-sh7367.c deleted +0 -481

125 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.10.4

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH v2 3/4 ARM: shmobile: Remove G4EVM machine support

In reply to Nobuhiro Iwamatsu

This machine is using old CPU of shmobile (sh7377) and cannot obtain machine, either.
Therefore, remove G4EVM support.

---
 arch/arm/configs/g4evm_defconfig     |   57 -----
 arch/arm/mach-shmobile/Kconfig       |    9 +-
 arch/arm/mach-shmobile/Makefile      |    1 -
 arch/arm/mach-shmobile/board-g4evm.c |  384 ----------------------------------
 4 files changed, 1 insertion(+), 450 deletions(-)
 delete mode 100644 arch/arm/configs/g4evm_defconfig
 delete mode 100644 arch/arm/mach-shmobile/board-g4evm.c
arch/arm/configs/g4evm_defconfig deleted +0 -57
deleted file mode 100644
index 21c6d03..0000000
@@ -1,57 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_SLAB=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
-CONFIG_ARCH_SH7377=y
-CONFIG_MACH_G4EVM=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySC4,115200 earlyprintk=sh-sci.4,115200"
-CONFIG_KEXEC=y
-CONFIG_PM=y
-# CONFIG_SUSPEND is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-# CONFIG_BLK_DEV is not set
-# CONFIG_MISC_DEVICES is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=8
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-CONFIG_TMPFS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_FTRACE is not set
-# CONFIG_CRC32 is not set
arch/arm/mach-shmobile/Kconfig +1 -8
index d3bc963..5a067b0 100644
@@ -44,12 +44,6 @@ config ARCH_EMEV2
 
 comment "SH-Mobile Board Type"
 
-config MACH_G4EVM
-	bool "G4EVM board"
-	depends on ARCH_SH7377
-	select ARCH_REQUIRE_GPIOLIB
-	select REGULATOR_FIXED_VOLTAGE if REGULATOR
-
 config MACH_AP4EVB
 	bool "AP4EVB board"
 	depends on ARCH_SH7372
@@ -135,7 +129,7 @@ menu "Memory configuration"
 
 config MEMORY_START
 	hex "Physical memory start address"
-	default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
+	default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \
 				MACH_MACKEREL || MACH_BONITO || \
 				MACH_ARMADILLO800EVA
 	default "0x41000000" if MACH_KOTA2
@@ -147,7 +141,6 @@ config MEMORY_START
 
 config MEMORY_SIZE
 	hex "Physical memory size"
-	default "0x08000000" if MACH_G4EVM
 	default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \
 				MACH_ARMADILLO800EVA
 	default "0x1e000000" if MACH_KOTA2
arch/arm/mach-shmobile/Makefile +0 -1
index 7cad2bc..8c01194 100644
@@ -42,7 +42,6 @@ obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o
 
 # Board objects
-obj-$(CONFIG_MACH_G4EVM)	+= board-g4evm.o
 obj-$(CONFIG_MACH_AP4EVB)	+= board-ap4evb.o
 obj-$(CONFIG_MACH_AG5EVM)	+= board-ag5evm.o
 obj-$(CONFIG_MACH_MACKEREL)	+= board-mackerel.o
arch/arm/mach-shmobile/board-g4evm.c deleted +0 -384

384 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#3 lore raw

PATCH v2 4/4 ARM: shmobile: Remove SH7377 support

In reply to Nobuhiro Iwamatsu

This is old CPU of shmobile, and the machine by which this CPU is used cannot be obtained.
Therefore, remove SH7377 support.

---
 arch/arm/boot/dts/sh7377.dtsi                |   21 -
 arch/arm/mach-shmobile/Kconfig               |    6 -
 arch/arm/mach-shmobile/Makefile              |    3 -
 arch/arm/mach-shmobile/clock-sh7377.c        |  366 ------
 arch/arm/mach-shmobile/include/mach/common.h |    9 -
 arch/arm/mach-shmobile/include/mach/sh7377.h |  360 ------
 arch/arm/mach-shmobile/intc-sh7377.c         |  592 ---------
 arch/arm/mach-shmobile/pfc-sh7377.c          | 1688 --------------------------
 arch/arm/mach-shmobile/setup-sh7377.c        |  549 ---------
 9 files changed, 3594 deletions(-)
 delete mode 100644 arch/arm/boot/dts/sh7377.dtsi
 delete mode 100644 arch/arm/mach-shmobile/clock-sh7377.c
 delete mode 100644 arch/arm/mach-shmobile/include/mach/sh7377.h
 delete mode 100644 arch/arm/mach-shmobile/intc-sh7377.c
 delete mode 100644 arch/arm/mach-shmobile/pfc-sh7377.c
 delete mode 100644 arch/arm/mach-shmobile/setup-sh7377.c
arch/arm/boot/dts/sh7377.dtsi deleted +0 -21
deleted file mode 100644
index 767ee07..0000000
@@ -1,21 +0,0 @@
-/*
- * Device Tree Source for the sh7377 SoC
- *
- * Copyright (C) 2012 Renesas Solutions Corp.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-/include/ "skeleton.dtsi"
-
-/ {
-	compatible = "renesas,sh7377";
-
-	cpus {
-		cpu at 0 {
-			compatible = "arm,cortex-a8";
-		};
-	};
-};
arch/arm/mach-shmobile/Kconfig +0 -6
index 5a067b0..f12eca7 100644
@@ -2,12 +2,6 @@ if ARCH_SHMOBILE
 
 comment "SH-Mobile System Type"
 
-config ARCH_SH7377
-	bool "SH-Mobile G4 (SH7377)"
-	select ARCH_WANT_OPTIONAL_GPIOLIB
-	select CPU_V7
-	select SH_CLK_CPG
-
 config ARCH_SH7372
 	bool "SH-Mobile AP4 (SH7372)"
 	select ARCH_WANT_OPTIONAL_GPIOLIB
arch/arm/mach-shmobile/Makefile +0 -3
index 8c01194..0b71479 100644
@@ -6,7 +6,6 @@
 obj-y				:= timer.o console.o clock.o
 
 # CPU objects
-obj-$(CONFIG_ARCH_SH7377)	+= setup-sh7377.o clock-sh7377.o intc-sh7377.o
 obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o clock-sh7372.o intc-sh7372.o
 obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
 obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o
@@ -22,14 +21,12 @@ smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o
 
 # Pinmux setup
 pfc-y				:=
-pfc-$(CONFIG_ARCH_SH7377)	+= pfc-sh7377.o
 pfc-$(CONFIG_ARCH_SH7372)	+= pfc-sh7372.o
 pfc-$(CONFIG_ARCH_SH73A0)	+= pfc-sh73a0.o
 pfc-$(CONFIG_ARCH_R8A7740)	+= pfc-r8a7740.o
 pfc-$(CONFIG_ARCH_R8A7779)	+= pfc-r8a7779.o
 
 # IRQ objects
-obj-$(CONFIG_ARCH_SH7377)	+= entry-intc.o
 obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o
 obj-$(CONFIG_ARCH_R8A7740)	+= entry-intc.o
 
arch/arm/mach-shmobile/clock-sh7377.c deleted +0 -366

366 lines not on this page · raw message

arch/arm/mach-shmobile/include/mach/common.h +0 -9
index f96fc29..dfeca79 100644
@@ -18,15 +18,6 @@ extern int shmobile_enter_wfi(struct cpuidle_device *dev,
 			      struct cpuidle_driver *drv, int index);
 extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
 
-extern void sh7377_init_irq(void);
-extern void sh7377_map_io(void);
-extern void sh7377_add_early_devices(void);
-extern void sh7377_add_standard_devices(void);
-extern void sh7377_clock_init(void);
-extern void sh7377_pinmux_init(void);
-extern struct clk sh7377_extalc1_clk;
-extern struct clk sh7377_extal2_clk;
-
 extern void sh7372_init_irq(void);
 extern void sh7372_map_io(void);
 extern void sh7372_add_early_devices(void);
arch/arm/mach-shmobile/include/mach/sh7377.h deleted +0 -360

360 lines not on this page · raw message

arch/arm/mach-shmobile/intc-sh7377.c deleted +0 -592

592 lines not on this page · raw message

arch/arm/mach-shmobile/pfc-sh7377.c deleted +0 -1688

1,613 lines not on this page · raw message

arch/arm/mach-shmobile/setup-sh7377.c deleted +0 -549

549 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.10.4

Part of the diff is not shown here. View the raw message.

#4 lore raw

PATCH v2 1/4 ARM: shmobile: Remove G3EVM machine support

In reply to Nobuhiro Iwamatsu
Quoted 3 lines · Nobuhiro Iwamatsu

This machine is using old CPU of shmobile (SH7367) and cannot obtain machine, either.
Therefore, remove G3EVM support.

Hi Iwamatsu-san,

I am a little confused as I have already sent pull requests including v1 of the patches in this series.

#5 lore raw

PATCH v2 1/4 ARM: shmobile: Remove G3EVM machine support

Quoted 9 lines · Simon Horman
Quoted 3 lines · Nobuhiro Iwamatsu

This machine is using old CPU of shmobile (SH7367) and cannot obtain machine, either.
Therefore, remove G3EVM support.

Hi Iwamatsu-san,

I am a little confused as I have already sent pull requests including v1 of the patches in this series.

Confusion resolved in another thread, thanks.