sh: mach-snapgear: Kill off machtype, consolidate board def.

Only the secureedge5410 was ever supported by this code, so make the board specification explicit rather than perpetuating a mach group. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
git-mirror · Oct 29, 2010 · f6eec8d · f6eec8d
1 parent 39c1198
commit f6eec8d
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 8 deletions.
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
@@ -133,7 +133,6 @@ machdir-$(CONFIG_SOLUTION_ENGINE)		+= mach-se
 machdir-$(CONFIG_SH_HP6XX)			+= mach-hp6xx
 machdir-$(CONFIG_SH_DREAMCAST)			+= mach-dreamcast
 machdir-$(CONFIG_SH_SH03)			+= mach-sh03
-machdir-$(CONFIG_SH_SECUREEDGE5410)		+= mach-snapgear
 machdir-$(CONFIG_SH_RTS7751R2D)			+= mach-r2d
 machdir-$(CONFIG_SH_7751_SYSTEMH)		+= mach-systemh
 machdir-$(CONFIG_SH_EDOSK7705)			+= mach-edosk7705

diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile
@@ -2,6 +2,7 @@
 # Specific board support, not covered by a mach group.
 #
 obj-$(CONFIG_SH_MAGIC_PANEL_R2)	+= board-magicpanelr2.o
+obj-$(CONFIG_SH_SECUREEDGE5410)	+= board-secureedge5410.o
 obj-$(CONFIG_SH_SH2007)		+= board-sh2007.o
 obj-$(CONFIG_SH_SH7785LCR)	+= board-sh7785lcr.o
 obj-$(CONFIG_SH_URQUELL)	+= board-urquell.o

diff --git a/arch/sh/boards/mach-snapgear/setup.c → arch/sh/boards/board-secureedge5410.c b/arch/sh/boards/mach-snapgear/setup.c → arch/sh/boards/board-secureedge5410.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/machvec.h>
-#include <mach/snapgear.h>
+#include <mach/secureedge5410.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <cpu/timer.h>

diff --git a/arch/sh/boards/mach-snapgear/Makefile b/arch/sh/boards/mach-snapgear/Makefile
diff --git a/arch/sh/configs/snapgear_defconfig → arch/sh/configs/secureedge5410_defconfig b/arch/sh/configs/snapgear_defconfig → arch/sh/configs/secureedge5410_defconfig
diff --git a/arch/sh/include/mach-common/mach/snapgear.h → ...include/mach-common/mach/secureedge5410.h b/arch/sh/include/mach-common/mach/snapgear.h → ...include/mach-common/mach/secureedge5410.h
diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c
@@ -35,7 +35,7 @@
 
 #ifdef CONFIG_SH_SECUREEDGE5410
 #include <asm/rtc.h>
-#include <mach/snapgear.h>
+#include <mach/secureedge5410.h>
 
 #define	RTC_RESET	0x1000
 #define	RTC_IODATA	0x0800