sh: Shuffle the board directories in to mach groups.

This flattens out the board directories in to individual mach groups,
we will use this for getting rid of unneeded directories, simplifying
the build system, and becoming more coherent with the refactored
arch/sh/include topology.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 81eaa4b..83d170c 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -594,11 +594,11 @@ config SH_CAYMAN
 
 endmenu
 
-source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
-source "arch/sh/boards/renesas/r7780rp/Kconfig"
-source "arch/sh/boards/renesas/sdk7780/Kconfig"
-source "arch/sh/boards/renesas/migor/Kconfig"
-source "arch/sh/boards/magicpanelr2/Kconfig"
+source "arch/sh/boards/mach-r2d/Kconfig"
+source "arch/sh/boards/mach-highlander/Kconfig"
+source "arch/sh/boards/mach-sdk7780/Kconfig"
+source "arch/sh/boards/mach-migor/Kconfig"
+source "arch/sh/boards/mach-magicpanelr2/Kconfig"
 
 menu "Timer and clock configuration"
 

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index f2b07b5..47bbfd8 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -102,36 +102,36 @@ core-y                            += arch/sh/kernel/ arch/sh/mm/
 core-$(CONFIG_SH_FPU_EMU)      += arch/sh/math-emu/
 
 # Boards
-machdir-$(CONFIG_SH_SOLUTION_ENGINE)           += se/770x
-machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)      += se/7722
-machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)      += se/7751
-machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)      += se/7780
-machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)      += se/7343
-machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE)      += se/7721
-machdir-$(CONFIG_SH_HP6XX)                     += hp6xx
-machdir-$(CONFIG_SH_DREAMCAST)                 += dreamcast
-machdir-$(CONFIG_SH_SH03)                      += sh03
-machdir-$(CONFIG_SH_SECUREEDGE5410)            += snapgear
-machdir-$(CONFIG_SH_RTS7751R2D)                        += renesas/rts7751r2d
-machdir-$(CONFIG_SH_7751_SYSTEMH)              += renesas/systemh
-machdir-$(CONFIG_SH_EDOSK7705)                 += renesas/edosk7705
-machdir-$(CONFIG_SH_HIGHLANDER)                        += renesas/r7780rp
-machdir-$(CONFIG_SH_MIGOR)                     += renesas/migor
-machdir-$(CONFIG_SH_SDK7780)                   += renesas/sdk7780
-machdir-$(CONFIG_SH_X3PROTO)                   += renesas/x3proto
-machdir-$(CONFIG_SH_RSK7203)                   += renesas/rsk7203
-machdir-$(CONFIG_SH_AP325RXA)                  += renesas/ap325rxa
-machdir-$(CONFIG_SH_SH7763RDP)                 += renesas/sh7763rdp
-machdir-$(CONFIG_SH_SH7785LCR)                 += renesas/sh7785lcr
-machdir-$(CONFIG_SH_SH4202_MICRODEV)           += superh/microdev
-machdir-$(CONFIG_SH_LANDISK)                   += landisk
-machdir-$(CONFIG_SH_TITAN)                     += titan
-machdir-$(CONFIG_SH_SHMIN)                     += shmin
-machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)      += se/7206
-machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)      += se/7619
-machdir-$(CONFIG_SH_LBOX_RE2)                  += lboxre2
-machdir-$(CONFIG_SH_MAGIC_PANEL_R2)            += magicpanelr2
-machdir-$(CONFIG_SH_CAYMAN)                    += cayman
+machdir-$(CONFIG_SH_SOLUTION_ENGINE)           += mach-se/770x
+machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE)      += mach-se/7206
+machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE)      += mach-se/7619
+machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE)      += mach-se/7722
+machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE)      += mach-se/7751
+machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE)      += mach-se/7780
+machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE)      += mach-se/7343
+machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE)      += mach-se/7721
+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
+machdir-$(CONFIG_SH_HIGHLANDER)                        += mach-highlander
+machdir-$(CONFIG_SH_MIGOR)                     += mach-migor
+machdir-$(CONFIG_SH_SDK7780)                   += mach-sdk7780
+machdir-$(CONFIG_SH_X3PROTO)                   += mach-x3proto
+machdir-$(CONFIG_SH_RSK7203)                   += mach-rsk7203
+machdir-$(CONFIG_SH_AP325RXA)                  += mach-ap325rxa
+machdir-$(CONFIG_SH_SH7763RDP)                 += mach-sh7763rdp
+machdir-$(CONFIG_SH_SH7785LCR)                 += mach-sh7785lcr
+machdir-$(CONFIG_SH_SH4202_MICRODEV)           += mach-microdev
+machdir-$(CONFIG_SH_LANDISK)                   += mach-landisk
+machdir-$(CONFIG_SH_TITAN)                     += mach-titan
+machdir-$(CONFIG_SH_SHMIN)                     += mach-shmin
+machdir-$(CONFIG_SH_LBOX_RE2)                  += mach-lboxre2
+machdir-$(CONFIG_SH_MAGIC_PANEL_R2)            += mach-magicpanelr2
+machdir-$(CONFIG_SH_CAYMAN)                    += mach-cayman
 
 incdir-y       := $(notdir $(machdir-y))
 

diff --git a/arch/sh/boards/renesas/ap325rxa/Makefile b/arch/sh/boards/mach-ap325rxa/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/ap325rxa/Makefile
rename to arch/sh/boards/mach-ap325rxa/Makefile

diff --git a/arch/sh/boards/renesas/ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/ap325rxa/setup.c
rename to arch/sh/boards/mach-ap325rxa/setup.c

diff --git a/arch/sh/boards/cayman/Makefile b/arch/sh/boards/mach-cayman/Makefile
similarity index 100%
rename from arch/sh/boards/cayman/Makefile
rename to arch/sh/boards/mach-cayman/Makefile

diff --git a/arch/sh/boards/cayman/irq.c b/arch/sh/boards/mach-cayman/irq.c
similarity index 100%
rename from arch/sh/boards/cayman/irq.c
rename to arch/sh/boards/mach-cayman/irq.c

diff --git a/arch/sh/boards/cayman/led.c b/arch/sh/boards/mach-cayman/led.c
similarity index 100%
rename from arch/sh/boards/cayman/led.c
rename to arch/sh/boards/mach-cayman/led.c

diff --git a/arch/sh/boards/cayman/setup.c b/arch/sh/boards/mach-cayman/setup.c
similarity index 100%
rename from arch/sh/boards/cayman/setup.c
rename to arch/sh/boards/mach-cayman/setup.c

diff --git a/arch/sh/boards/dreamcast/Makefile b/arch/sh/boards/mach-dreamcast/Makefile
similarity index 100%
rename from arch/sh/boards/dreamcast/Makefile
rename to arch/sh/boards/mach-dreamcast/Makefile

diff --git a/arch/sh/boards/dreamcast/irq.c b/arch/sh/boards/mach-dreamcast/irq.c
similarity index 100%
rename from arch/sh/boards/dreamcast/irq.c
rename to arch/sh/boards/mach-dreamcast/irq.c

diff --git a/arch/sh/boards/dreamcast/rtc.c b/arch/sh/boards/mach-dreamcast/rtc.c
similarity index 100%
rename from arch/sh/boards/dreamcast/rtc.c
rename to arch/sh/boards/mach-dreamcast/rtc.c

diff --git a/arch/sh/boards/dreamcast/setup.c b/arch/sh/boards/mach-dreamcast/setup.c
similarity index 100%
rename from arch/sh/boards/dreamcast/setup.c
rename to arch/sh/boards/mach-dreamcast/setup.c

diff --git a/arch/sh/boards/renesas/edosk7705/Makefile b/arch/sh/boards/mach-edosk7705/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/edosk7705/Makefile
rename to arch/sh/boards/mach-edosk7705/Makefile

diff --git a/arch/sh/boards/renesas/edosk7705/io.c b/arch/sh/boards/mach-edosk7705/io.c
similarity index 100%
rename from arch/sh/boards/renesas/edosk7705/io.c
rename to arch/sh/boards/mach-edosk7705/io.c

diff --git a/arch/sh/boards/renesas/edosk7705/setup.c b/arch/sh/boards/mach-edosk7705/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/edosk7705/setup.c
rename to arch/sh/boards/mach-edosk7705/setup.c

diff --git a/arch/sh/boards/renesas/r7780rp/Kconfig b/arch/sh/boards/mach-highlander/Kconfig
similarity index 100%
rename from arch/sh/boards/renesas/r7780rp/Kconfig
rename to arch/sh/boards/mach-highlander/Kconfig

diff --git a/arch/sh/boards/renesas/r7780rp/Makefile b/arch/sh/boards/mach-highlander/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/r7780rp/Makefile
rename to arch/sh/boards/mach-highlander/Makefile

diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7780mp.c b/arch/sh/boards/mach-highlander/irq-r7780mp.c
similarity index 100%
rename from arch/sh/boards/renesas/r7780rp/irq-r7780mp.c
rename to arch/sh/boards/mach-highlander/irq-r7780mp.c

diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7780rp.c b/arch/sh/boards/mach-highlander/irq-r7780rp.c
similarity index 100%
rename from arch/sh/boards/renesas/r7780rp/irq-r7780rp.c
rename to arch/sh/boards/mach-highlander/irq-r7780rp.c

diff --git a/arch/sh/boards/renesas/r7780rp/irq-r7785rp.c b/arch/sh/boards/mach-highlander/irq-r7785rp.c
similarity index 100%
rename from arch/sh/boards/renesas/r7780rp/irq-r7785rp.c
rename to arch/sh/boards/mach-highlander/irq-r7785rp.c

diff --git a/arch/sh/boards/renesas/r7780rp/psw.c b/arch/sh/boards/mach-highlander/psw.c
similarity index 100%
rename from arch/sh/boards/renesas/r7780rp/psw.c
rename to arch/sh/boards/mach-highlander/psw.c

diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/mach-highlander/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/r7780rp/setup.c
rename to arch/sh/boards/mach-highlander/setup.c

diff --git a/arch/sh/boards/hp6xx/Makefile b/arch/sh/boards/mach-hp6xx/Makefile
similarity index 100%
rename from arch/sh/boards/hp6xx/Makefile
rename to arch/sh/boards/mach-hp6xx/Makefile

diff --git a/arch/sh/boards/hp6xx/hp6xx_apm.c b/arch/sh/boards/mach-hp6xx/hp6xx_apm.c
similarity index 100%
rename from arch/sh/boards/hp6xx/hp6xx_apm.c
rename to arch/sh/boards/mach-hp6xx/hp6xx_apm.c

diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c
similarity index 100%
rename from arch/sh/boards/hp6xx/pm.c
rename to arch/sh/boards/mach-hp6xx/pm.c

diff --git a/arch/sh/boards/hp6xx/pm_wakeup.S b/arch/sh/boards/mach-hp6xx/pm_wakeup.S
similarity index 100%
rename from arch/sh/boards/hp6xx/pm_wakeup.S
rename to arch/sh/boards/mach-hp6xx/pm_wakeup.S

diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c
similarity index 100%
rename from arch/sh/boards/hp6xx/setup.c
rename to arch/sh/boards/mach-hp6xx/setup.c

diff --git a/arch/sh/boards/landisk/Makefile b/arch/sh/boards/mach-landisk/Makefile
similarity index 100%
rename from arch/sh/boards/landisk/Makefile
rename to arch/sh/boards/mach-landisk/Makefile

diff --git a/arch/sh/boards/landisk/gio.c b/arch/sh/boards/mach-landisk/gio.c
similarity index 100%
rename from arch/sh/boards/landisk/gio.c
rename to arch/sh/boards/mach-landisk/gio.c

diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/mach-landisk/irq.c
similarity index 100%
rename from arch/sh/boards/landisk/irq.c
rename to arch/sh/boards/mach-landisk/irq.c

diff --git a/arch/sh/boards/landisk/psw.c b/arch/sh/boards/mach-landisk/psw.c
similarity index 100%
rename from arch/sh/boards/landisk/psw.c
rename to arch/sh/boards/mach-landisk/psw.c

diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c
similarity index 100%
rename from arch/sh/boards/landisk/setup.c
rename to arch/sh/boards/mach-landisk/setup.c

diff --git a/arch/sh/boards/lboxre2/Makefile b/arch/sh/boards/mach-lboxre2/Makefile
similarity index 100%
rename from arch/sh/boards/lboxre2/Makefile
rename to arch/sh/boards/mach-lboxre2/Makefile

diff --git a/arch/sh/boards/lboxre2/irq.c b/arch/sh/boards/mach-lboxre2/irq.c
similarity index 100%
rename from arch/sh/boards/lboxre2/irq.c
rename to arch/sh/boards/mach-lboxre2/irq.c

diff --git a/arch/sh/boards/lboxre2/setup.c b/arch/sh/boards/mach-lboxre2/setup.c
similarity index 100%
rename from arch/sh/boards/lboxre2/setup.c
rename to arch/sh/boards/mach-lboxre2/setup.c

diff --git a/arch/sh/boards/magicpanelr2/Kconfig b/arch/sh/boards/mach-magicpanelr2/Kconfig
similarity index 100%
rename from arch/sh/boards/magicpanelr2/Kconfig
rename to arch/sh/boards/mach-magicpanelr2/Kconfig

diff --git a/arch/sh/boards/magicpanelr2/Makefile b/arch/sh/boards/mach-magicpanelr2/Makefile
similarity index 100%
rename from arch/sh/boards/magicpanelr2/Makefile
rename to arch/sh/boards/mach-magicpanelr2/Makefile

diff --git a/arch/sh/boards/magicpanelr2/setup.c b/arch/sh/boards/mach-magicpanelr2/setup.c
similarity index 100%
rename from arch/sh/boards/magicpanelr2/setup.c
rename to arch/sh/boards/mach-magicpanelr2/setup.c

diff --git a/arch/sh/boards/superh/microdev/Makefile b/arch/sh/boards/mach-microdev/Makefile
similarity index 100%
rename from arch/sh/boards/superh/microdev/Makefile
rename to arch/sh/boards/mach-microdev/Makefile

diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/mach-microdev/io.c
similarity index 100%
rename from arch/sh/boards/superh/microdev/io.c
rename to arch/sh/boards/mach-microdev/io.c

diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/mach-microdev/irq.c
similarity index 100%
rename from arch/sh/boards/superh/microdev/irq.c
rename to arch/sh/boards/mach-microdev/irq.c

diff --git a/arch/sh/boards/superh/microdev/led.c b/arch/sh/boards/mach-microdev/led.c
similarity index 100%
rename from arch/sh/boards/superh/microdev/led.c
rename to arch/sh/boards/mach-microdev/led.c

diff --git a/arch/sh/boards/superh/microdev/setup.c b/arch/sh/boards/mach-microdev/setup.c
similarity index 100%
rename from arch/sh/boards/superh/microdev/setup.c
rename to arch/sh/boards/mach-microdev/setup.c

diff --git a/arch/sh/boards/renesas/migor/Kconfig b/arch/sh/boards/mach-migor/Kconfig
similarity index 100%
rename from arch/sh/boards/renesas/migor/Kconfig
rename to arch/sh/boards/mach-migor/Kconfig

diff --git a/arch/sh/boards/renesas/migor/Makefile b/arch/sh/boards/mach-migor/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/migor/Makefile
rename to arch/sh/boards/mach-migor/Makefile

diff --git a/arch/sh/boards/renesas/migor/lcd_qvga.c b/arch/sh/boards/mach-migor/lcd_qvga.c
similarity index 100%
rename from arch/sh/boards/renesas/migor/lcd_qvga.c
rename to arch/sh/boards/mach-migor/lcd_qvga.c

diff --git a/arch/sh/boards/renesas/migor/setup.c b/arch/sh/boards/mach-migor/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/migor/setup.c
rename to arch/sh/boards/mach-migor/setup.c

diff --git a/arch/sh/boards/renesas/rts7751r2d/Kconfig b/arch/sh/boards/mach-r2d/Kconfig
similarity index 100%
rename from arch/sh/boards/renesas/rts7751r2d/Kconfig
rename to arch/sh/boards/mach-r2d/Kconfig

diff --git a/arch/sh/boards/renesas/rts7751r2d/Makefile b/arch/sh/boards/mach-r2d/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/rts7751r2d/Makefile
rename to arch/sh/boards/mach-r2d/Makefile

diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/mach-r2d/irq.c
similarity index 100%
rename from arch/sh/boards/renesas/rts7751r2d/irq.c
rename to arch/sh/boards/mach-r2d/irq.c

diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/mach-r2d/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/rts7751r2d/setup.c
rename to arch/sh/boards/mach-r2d/setup.c

diff --git a/arch/sh/boards/renesas/rsk7203/Makefile b/arch/sh/boards/mach-rsk7203/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/rsk7203/Makefile
rename to arch/sh/boards/mach-rsk7203/Makefile

diff --git a/arch/sh/boards/renesas/rsk7203/setup.c b/arch/sh/boards/mach-rsk7203/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/rsk7203/setup.c
rename to arch/sh/boards/mach-rsk7203/setup.c

diff --git a/arch/sh/boards/renesas/sdk7780/Kconfig b/arch/sh/boards/mach-sdk7780/Kconfig
similarity index 100%
rename from arch/sh/boards/renesas/sdk7780/Kconfig
rename to arch/sh/boards/mach-sdk7780/Kconfig

diff --git a/arch/sh/boards/renesas/sdk7780/Makefile b/arch/sh/boards/mach-sdk7780/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/sdk7780/Makefile
rename to arch/sh/boards/mach-sdk7780/Makefile

diff --git a/arch/sh/boards/renesas/sdk7780/irq.c b/arch/sh/boards/mach-sdk7780/irq.c
similarity index 100%
rename from arch/sh/boards/renesas/sdk7780/irq.c
rename to arch/sh/boards/mach-sdk7780/irq.c

diff --git a/arch/sh/boards/renesas/sdk7780/setup.c b/arch/sh/boards/mach-sdk7780/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/sdk7780/setup.c
rename to arch/sh/boards/mach-sdk7780/setup.c

diff --git a/arch/sh/boards/se/7206/Makefile b/arch/sh/boards/mach-se/7206/Makefile
similarity index 100%
rename from arch/sh/boards/se/7206/Makefile
rename to arch/sh/boards/mach-se/7206/Makefile

diff --git a/arch/sh/boards/se/7206/io.c b/arch/sh/boards/mach-se/7206/io.c
similarity index 100%
rename from arch/sh/boards/se/7206/io.c
rename to arch/sh/boards/mach-se/7206/io.c

diff --git a/arch/sh/boards/se/7206/irq.c b/arch/sh/boards/mach-se/7206/irq.c
similarity index 100%
rename from arch/sh/boards/se/7206/irq.c
rename to arch/sh/boards/mach-se/7206/irq.c

diff --git a/arch/sh/boards/se/7206/setup.c b/arch/sh/boards/mach-se/7206/setup.c
similarity index 100%
rename from arch/sh/boards/se/7206/setup.c
rename to arch/sh/boards/mach-se/7206/setup.c

diff --git a/arch/sh/boards/se/7343/Makefile b/arch/sh/boards/mach-se/7343/Makefile
similarity index 100%
rename from arch/sh/boards/se/7343/Makefile
rename to arch/sh/boards/mach-se/7343/Makefile

diff --git a/arch/sh/boards/se/7343/io.c b/arch/sh/boards/mach-se/7343/io.c
similarity index 100%
rename from arch/sh/boards/se/7343/io.c
rename to arch/sh/boards/mach-se/7343/io.c

diff --git a/arch/sh/boards/se/7343/irq.c b/arch/sh/boards/mach-se/7343/irq.c
similarity index 100%
rename from arch/sh/boards/se/7343/irq.c
rename to arch/sh/boards/mach-se/7343/irq.c

diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/mach-se/7343/setup.c
similarity index 100%
rename from arch/sh/boards/se/7343/setup.c
rename to arch/sh/boards/mach-se/7343/setup.c

diff --git a/arch/sh/boards/se/7619/Makefile b/arch/sh/boards/mach-se/7619/Makefile
similarity index 100%
rename from arch/sh/boards/se/7619/Makefile
rename to arch/sh/boards/mach-se/7619/Makefile

diff --git a/arch/sh/boards/se/7619/setup.c b/arch/sh/boards/mach-se/7619/setup.c
similarity index 100%
rename from arch/sh/boards/se/7619/setup.c
rename to arch/sh/boards/mach-se/7619/setup.c

diff --git a/arch/sh/boards/se/770x/Makefile b/arch/sh/boards/mach-se/770x/Makefile
similarity index 100%
rename from arch/sh/boards/se/770x/Makefile
rename to arch/sh/boards/mach-se/770x/Makefile

diff --git a/arch/sh/boards/se/770x/io.c b/arch/sh/boards/mach-se/770x/io.c
similarity index 100%
rename from arch/sh/boards/se/770x/io.c
rename to arch/sh/boards/mach-se/770x/io.c

diff --git a/arch/sh/boards/se/770x/irq.c b/arch/sh/boards/mach-se/770x/irq.c
similarity index 100%
rename from arch/sh/boards/se/770x/irq.c
rename to arch/sh/boards/mach-se/770x/irq.c

diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/mach-se/770x/setup.c
similarity index 100%
rename from arch/sh/boards/se/770x/setup.c
rename to arch/sh/boards/mach-se/770x/setup.c

diff --git a/arch/sh/boards/se/7721/Makefile b/arch/sh/boards/mach-se/7721/Makefile
similarity index 100%
rename from arch/sh/boards/se/7721/Makefile
rename to arch/sh/boards/mach-se/7721/Makefile

diff --git a/arch/sh/boards/se/7721/irq.c b/arch/sh/boards/mach-se/7721/irq.c
similarity index 100%
rename from arch/sh/boards/se/7721/irq.c
rename to arch/sh/boards/mach-se/7721/irq.c

diff --git a/arch/sh/boards/se/7721/setup.c b/arch/sh/boards/mach-se/7721/setup.c
similarity index 100%
rename from arch/sh/boards/se/7721/setup.c
rename to arch/sh/boards/mach-se/7721/setup.c

diff --git a/arch/sh/boards/se/7722/Makefile b/arch/sh/boards/mach-se/7722/Makefile
similarity index 100%
rename from arch/sh/boards/se/7722/Makefile
rename to arch/sh/boards/mach-se/7722/Makefile

diff --git a/arch/sh/boards/se/7722/irq.c b/arch/sh/boards/mach-se/7722/irq.c
similarity index 100%
rename from arch/sh/boards/se/7722/irq.c
rename to arch/sh/boards/mach-se/7722/irq.c

diff --git a/arch/sh/boards/se/7722/setup.c b/arch/sh/boards/mach-se/7722/setup.c
similarity index 100%
rename from arch/sh/boards/se/7722/setup.c
rename to arch/sh/boards/mach-se/7722/setup.c

diff --git a/arch/sh/boards/se/7751/Makefile b/arch/sh/boards/mach-se/7751/Makefile
similarity index 100%
rename from arch/sh/boards/se/7751/Makefile
rename to arch/sh/boards/mach-se/7751/Makefile

diff --git a/arch/sh/boards/se/7751/io.c b/arch/sh/boards/mach-se/7751/io.c
similarity index 100%
rename from arch/sh/boards/se/7751/io.c
rename to arch/sh/boards/mach-se/7751/io.c

diff --git a/arch/sh/boards/se/7751/irq.c b/arch/sh/boards/mach-se/7751/irq.c
similarity index 100%
rename from arch/sh/boards/se/7751/irq.c
rename to arch/sh/boards/mach-se/7751/irq.c

diff --git a/arch/sh/boards/se/7751/pci.c b/arch/sh/boards/mach-se/7751/pci.c
similarity index 100%
rename from arch/sh/boards/se/7751/pci.c
rename to arch/sh/boards/mach-se/7751/pci.c

diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/mach-se/7751/setup.c
similarity index 100%
rename from arch/sh/boards/se/7751/setup.c
rename to arch/sh/boards/mach-se/7751/setup.c

diff --git a/arch/sh/boards/se/7780/Makefile b/arch/sh/boards/mach-se/7780/Makefile
similarity index 100%
rename from arch/sh/boards/se/7780/Makefile
rename to arch/sh/boards/mach-se/7780/Makefile

diff --git a/arch/sh/boards/se/7780/irq.c b/arch/sh/boards/mach-se/7780/irq.c
similarity index 100%
rename from arch/sh/boards/se/7780/irq.c
rename to arch/sh/boards/mach-se/7780/irq.c

diff --git a/arch/sh/boards/se/7780/setup.c b/arch/sh/boards/mach-se/7780/setup.c
similarity index 100%
rename from arch/sh/boards/se/7780/setup.c
rename to arch/sh/boards/mach-se/7780/setup.c

diff --git a/arch/sh/boards/sh03/Makefile b/arch/sh/boards/mach-sh03/Makefile
similarity index 100%
rename from arch/sh/boards/sh03/Makefile
rename to arch/sh/boards/mach-sh03/Makefile

diff --git a/arch/sh/boards/sh03/rtc.c b/arch/sh/boards/mach-sh03/rtc.c
similarity index 100%
rename from arch/sh/boards/sh03/rtc.c
rename to arch/sh/boards/mach-sh03/rtc.c

diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/mach-sh03/setup.c
similarity index 100%
rename from arch/sh/boards/sh03/setup.c
rename to arch/sh/boards/mach-sh03/setup.c

diff --git a/arch/sh/boards/renesas/sh7763rdp/Makefile b/arch/sh/boards/mach-sh7763rdp/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/sh7763rdp/Makefile
rename to arch/sh/boards/mach-sh7763rdp/Makefile

diff --git a/arch/sh/boards/renesas/sh7763rdp/irq.c b/arch/sh/boards/mach-sh7763rdp/irq.c
similarity index 100%
rename from arch/sh/boards/renesas/sh7763rdp/irq.c
rename to arch/sh/boards/mach-sh7763rdp/irq.c

diff --git a/arch/sh/boards/renesas/sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/sh7763rdp/setup.c
rename to arch/sh/boards/mach-sh7763rdp/setup.c

diff --git a/arch/sh/boards/renesas/sh7785lcr/Makefile b/arch/sh/boards/mach-sh7785lcr/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/sh7785lcr/Makefile
rename to arch/sh/boards/mach-sh7785lcr/Makefile

diff --git a/arch/sh/boards/renesas/sh7785lcr/setup.c b/arch/sh/boards/mach-sh7785lcr/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/sh7785lcr/setup.c
rename to arch/sh/boards/mach-sh7785lcr/setup.c

diff --git a/arch/sh/boards/shmin/Makefile b/arch/sh/boards/mach-shmin/Makefile
similarity index 100%
rename from arch/sh/boards/shmin/Makefile
rename to arch/sh/boards/mach-shmin/Makefile

diff --git a/arch/sh/boards/shmin/setup.c b/arch/sh/boards/mach-shmin/setup.c
similarity index 100%
rename from arch/sh/boards/shmin/setup.c
rename to arch/sh/boards/mach-shmin/setup.c

diff --git a/arch/sh/boards/snapgear/Makefile b/arch/sh/boards/mach-snapgear/Makefile
similarity index 100%
rename from arch/sh/boards/snapgear/Makefile
rename to arch/sh/boards/mach-snapgear/Makefile

diff --git a/arch/sh/boards/snapgear/io.c b/arch/sh/boards/mach-snapgear/io.c
similarity index 100%
rename from arch/sh/boards/snapgear/io.c
rename to arch/sh/boards/mach-snapgear/io.c

diff --git a/arch/sh/boards/snapgear/setup.c b/arch/sh/boards/mach-snapgear/setup.c
similarity index 100%
rename from arch/sh/boards/snapgear/setup.c
rename to arch/sh/boards/mach-snapgear/setup.c

diff --git a/arch/sh/boards/renesas/systemh/Makefile b/arch/sh/boards/mach-systemh/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/systemh/Makefile
rename to arch/sh/boards/mach-systemh/Makefile

diff --git a/arch/sh/boards/renesas/systemh/io.c b/arch/sh/boards/mach-systemh/io.c
similarity index 100%
rename from arch/sh/boards/renesas/systemh/io.c
rename to arch/sh/boards/mach-systemh/io.c

diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c
similarity index 100%
rename from arch/sh/boards/renesas/systemh/irq.c
rename to arch/sh/boards/mach-systemh/irq.c

diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/mach-systemh/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/systemh/setup.c
rename to arch/sh/boards/mach-systemh/setup.c

diff --git a/arch/sh/boards/titan/Makefile b/arch/sh/boards/mach-titan/Makefile
similarity index 100%
rename from arch/sh/boards/titan/Makefile
rename to arch/sh/boards/mach-titan/Makefile

diff --git a/arch/sh/boards/titan/io.c b/arch/sh/boards/mach-titan/io.c
similarity index 100%
rename from arch/sh/boards/titan/io.c
rename to arch/sh/boards/mach-titan/io.c

diff --git a/arch/sh/boards/titan/setup.c b/arch/sh/boards/mach-titan/setup.c
similarity index 100%
rename from arch/sh/boards/titan/setup.c
rename to arch/sh/boards/mach-titan/setup.c

diff --git a/arch/sh/boards/renesas/x3proto/Makefile b/arch/sh/boards/mach-x3proto/Makefile
similarity index 100%
rename from arch/sh/boards/renesas/x3proto/Makefile
rename to arch/sh/boards/mach-x3proto/Makefile

diff --git a/arch/sh/boards/renesas/x3proto/ilsel.c b/arch/sh/boards/mach-x3proto/ilsel.c
similarity index 100%
rename from arch/sh/boards/renesas/x3proto/ilsel.c
rename to arch/sh/boards/mach-x3proto/ilsel.c

diff --git a/arch/sh/boards/renesas/x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c
similarity index 100%
rename from arch/sh/boards/renesas/x3proto/setup.c
rename to arch/sh/boards/mach-x3proto/setup.c