aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/Makefile8
-rw-r--r--arch/sh/boards/Kconfig15
-rw-r--r--arch/sh/boards/Makefile8
-rw-r--r--arch/sh/boards/board-ap325rxa.c (renamed from arch/sh/boards/mach-ap325rxa/setup.c)0
-rw-r--r--arch/sh/boards/board-magicpanelr2.c (renamed from arch/sh/boards/mach-magicpanelr2/setup.c)0
-rw-r--r--arch/sh/boards/board-rsk7203.c (renamed from arch/sh/boards/mach-rsk7203/setup.c)0
-rw-r--r--arch/sh/boards/board-sh7785lcr.c (renamed from arch/sh/boards/mach-sh7785lcr/setup.c)0
-rw-r--r--arch/sh/boards/board-shmin.c (renamed from arch/sh/boards/mach-shmin/setup.c)0
-rw-r--r--arch/sh/boards/mach-ap325rxa/Makefile1
-rw-r--r--arch/sh/boards/mach-magicpanelr2/Kconfig13
-rw-r--r--arch/sh/boards/mach-magicpanelr2/Makefile5
-rw-r--r--arch/sh/boards/mach-rsk7203/Makefile1
-rw-r--r--arch/sh/boards/mach-se/7619/Makefile5
-rw-r--r--arch/sh/boards/mach-se/Makefile3
-rw-r--r--arch/sh/boards/mach-se/board-se7619.c (renamed from arch/sh/boards/mach-se/7619/setup.c)0
-rw-r--r--arch/sh/boards/mach-sh7785lcr/Makefile1
-rw-r--r--arch/sh/boards/mach-shmin/Makefile5
17 files changed, 26 insertions, 39 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index fafc01236f6a..6c93b9487133 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -97,10 +97,10 @@ head-$(CONFIG_SUPERH64) += arch/sh/kernel/head_64.o
97 97
98LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) 98LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
99 99
100core-y += arch/sh/kernel/ arch/sh/mm/ 100core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/
101core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/ 101core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/
102 102
103# Boards and Mach groups 103# Mach groups
104machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se 104machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se
105machdir-$(CONFIG_SH_HP6XX) += mach-hp6xx 105machdir-$(CONFIG_SH_HP6XX) += mach-hp6xx
106machdir-$(CONFIG_SH_DREAMCAST) += mach-dreamcast 106machdir-$(CONFIG_SH_DREAMCAST) += mach-dreamcast
@@ -114,15 +114,11 @@ machdir-$(CONFIG_SH_MIGOR) += mach-migor
114machdir-$(CONFIG_SH_SDK7780) += mach-sdk7780 114machdir-$(CONFIG_SH_SDK7780) += mach-sdk7780
115machdir-$(CONFIG_SH_X3PROTO) += mach-x3proto 115machdir-$(CONFIG_SH_X3PROTO) += mach-x3proto
116machdir-$(CONFIG_SH_RSK7203) += mach-rsk7203 116machdir-$(CONFIG_SH_RSK7203) += mach-rsk7203
117machdir-$(CONFIG_SH_AP325RXA) += mach-ap325rxa
118machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp 117machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp
119machdir-$(CONFIG_SH_SH7785LCR) += mach-sh7785lcr
120machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev 118machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev
121machdir-$(CONFIG_SH_LANDISK) += mach-landisk 119machdir-$(CONFIG_SH_LANDISK) += mach-landisk
122machdir-$(CONFIG_SH_TITAN) += mach-titan 120machdir-$(CONFIG_SH_TITAN) += mach-titan
123machdir-$(CONFIG_SH_SHMIN) += mach-shmin
124machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2 121machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2
125machdir-$(CONFIG_SH_MAGIC_PANEL_R2) += mach-magicpanelr2
126machdir-$(CONFIG_SH_CAYMAN) += mach-cayman 122machdir-$(CONFIG_SH_CAYMAN) += mach-cayman
127 123
128ifneq ($(machdir-y),) 124ifneq ($(machdir-y),)
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 324c25ac95ce..ae194869fd60 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -242,4 +242,17 @@ source "arch/sh/boards/mach-r2d/Kconfig"
242source "arch/sh/boards/mach-highlander/Kconfig" 242source "arch/sh/boards/mach-highlander/Kconfig"
243source "arch/sh/boards/mach-sdk7780/Kconfig" 243source "arch/sh/boards/mach-sdk7780/Kconfig"
244source "arch/sh/boards/mach-migor/Kconfig" 244source "arch/sh/boards/mach-migor/Kconfig"
245source "arch/sh/boards/mach-magicpanelr2/Kconfig" 245
246if SH_MAGIC_PANEL_R2
247
248menu "Magic Panel R2 options"
249
250config SH_MAGIC_PANEL_R2_VERSION
251 int SH_MAGIC_PANEL_R2_VERSION
252 default "3"
253 help
254 Set the version of the Magic Panel R2
255
256endmenu
257
258endif
diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile
new file mode 100644
index 000000000000..ff9b93c5a91b
--- /dev/null
+++ b/arch/sh/boards/Makefile
@@ -0,0 +1,8 @@
1#
2# Specific board support, not covered by a mach group.
3#
4obj-$(CONFIG_SH_AP325RXA) += board-ap325rxa.o
5obj-$(CONFIG_SH_MAGIC_PANEL_R2) += board-magicpanelr2.o
6obj-$(CONFIG_SH_RSK7203) += board-rsk7203.o
7obj-$(CONFIG_SH_SH7785LCR) += board-sh7785lcr.o
8obj-$(CONFIG_SH_SHMIN) += board-shmin..o
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/board-ap325rxa.c
index 9c71603d29a2..9c71603d29a2 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/board-ap325rxa.c
diff --git a/arch/sh/boards/mach-magicpanelr2/setup.c b/arch/sh/boards/board-magicpanelr2.c
index f3b8b07ea5d6..f3b8b07ea5d6 100644
--- a/arch/sh/boards/mach-magicpanelr2/setup.c
+++ b/arch/sh/boards/board-magicpanelr2.c
diff --git a/arch/sh/boards/mach-rsk7203/setup.c b/arch/sh/boards/board-rsk7203.c
index ffbedc59a973..ffbedc59a973 100644
--- a/arch/sh/boards/mach-rsk7203/setup.c
+++ b/arch/sh/boards/board-rsk7203.c
diff --git a/arch/sh/boards/mach-sh7785lcr/setup.c b/arch/sh/boards/board-sh7785lcr.c
index b95d674ee704..b95d674ee704 100644
--- a/arch/sh/boards/mach-sh7785lcr/setup.c
+++ b/arch/sh/boards/board-sh7785lcr.c
diff --git a/arch/sh/boards/mach-shmin/setup.c b/arch/sh/boards/board-shmin.c
index 16e5dae8ecfb..16e5dae8ecfb 100644
--- a/arch/sh/boards/mach-shmin/setup.c
+++ b/arch/sh/boards/board-shmin.c
diff --git a/arch/sh/boards/mach-ap325rxa/Makefile b/arch/sh/boards/mach-ap325rxa/Makefile
deleted file mode 100644
index f663768429f0..000000000000
--- a/arch/sh/boards/mach-ap325rxa/Makefile
+++ /dev/null
@@ -1 +0,0 @@
1obj-y := setup.o
diff --git a/arch/sh/boards/mach-magicpanelr2/Kconfig b/arch/sh/boards/mach-magicpanelr2/Kconfig
deleted file mode 100644
index b0abddc3e84f..000000000000
--- a/arch/sh/boards/mach-magicpanelr2/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
1if SH_MAGIC_PANEL_R2
2
3menu "Magic Panel R2 options"
4
5config SH_MAGIC_PANEL_R2_VERSION
6 int SH_MAGIC_PANEL_R2_VERSION
7 default "3"
8 help
9 Set the version of the Magic Panel R2
10
11endmenu
12
13endif
diff --git a/arch/sh/boards/mach-magicpanelr2/Makefile b/arch/sh/boards/mach-magicpanelr2/Makefile
deleted file mode 100644
index 7a6d586b9072..000000000000
--- a/arch/sh/boards/mach-magicpanelr2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
1#
2# Makefile for the Magic Panel specific parts
3#
4
5obj-y := setup.o \ No newline at end of file
diff --git a/arch/sh/boards/mach-rsk7203/Makefile b/arch/sh/boards/mach-rsk7203/Makefile
deleted file mode 100644
index f663768429f0..000000000000
--- a/arch/sh/boards/mach-rsk7203/Makefile
+++ /dev/null
@@ -1 +0,0 @@
1obj-y := setup.o
diff --git a/arch/sh/boards/mach-se/7619/Makefile b/arch/sh/boards/mach-se/7619/Makefile
deleted file mode 100644
index d21775c28cda..000000000000
--- a/arch/sh/boards/mach-se/7619/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
1#
2# Makefile for the 7619 SolutionEngine specific parts of the kernel
3#
4
5obj-y := setup.o
diff --git a/arch/sh/boards/mach-se/Makefile b/arch/sh/boards/mach-se/Makefile
index ad2b38ef65dc..2de42bae4b4f 100644
--- a/arch/sh/boards/mach-se/Makefile
+++ b/arch/sh/boards/mach-se/Makefile
@@ -1,6 +1,7 @@
1obj-$(CONFIG_SH_7619_SOLUTION_ENGINE) += board-se7619.o
2
1obj-$(CONFIG_SH_SOLUTION_ENGINE) += 770x/ 3obj-$(CONFIG_SH_SOLUTION_ENGINE) += 770x/
2obj-$(CONFIG_SH_7206_SOLUTION_ENGINE) += 7206/ 4obj-$(CONFIG_SH_7206_SOLUTION_ENGINE) += 7206/
3obj-$(CONFIG_SH_7619_SOLUTION_ENGINE) += 7619/
4obj-$(CONFIG_SH_7722_SOLUTION_ENGINE) += 7722/ 5obj-$(CONFIG_SH_7722_SOLUTION_ENGINE) += 7722/
5obj-$(CONFIG_SH_7751_SOLUTION_ENGINE) += 7751/ 6obj-$(CONFIG_SH_7751_SOLUTION_ENGINE) += 7751/
6obj-$(CONFIG_SH_7780_SOLUTION_ENGINE) += 7780/ 7obj-$(CONFIG_SH_7780_SOLUTION_ENGINE) += 7780/
diff --git a/arch/sh/boards/mach-se/7619/setup.c b/arch/sh/boards/mach-se/board-se7619.c
index 1d0ef7faa10d..1d0ef7faa10d 100644
--- a/arch/sh/boards/mach-se/7619/setup.c
+++ b/arch/sh/boards/mach-se/board-se7619.c
diff --git a/arch/sh/boards/mach-sh7785lcr/Makefile b/arch/sh/boards/mach-sh7785lcr/Makefile
deleted file mode 100644
index 77037567633b..000000000000
--- a/arch/sh/boards/mach-sh7785lcr/Makefile
+++ /dev/null
@@ -1 +0,0 @@
1obj-y := setup.o
diff --git a/arch/sh/boards/mach-shmin/Makefile b/arch/sh/boards/mach-shmin/Makefile
deleted file mode 100644
index 3190cc72430e..000000000000
--- a/arch/sh/boards/mach-shmin/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
1#
2# Makefile for the SHMIN board.
3#
4
5obj-y := setup.o