diff options
17 files changed, 26 insertions, 39 deletions
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index fafc012..6c93b94 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile @@ -97,10 +97,10 @@ head-$(CONFIG_SUPERH64) += arch/sh/kernel/head_64.o LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) -core-y += arch/sh/kernel/ arch/sh/mm/ +core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/ core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/ -# Boards and Mach groups +# Mach groups machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se machdir-$(CONFIG_SH_HP6XX) += mach-hp6xx machdir-$(CONFIG_SH_DREAMCAST) += mach-dreamcast @@ -114,15 +114,11 @@ 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 ifneq ($(machdir-y),) diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index 324c25a..ae19486 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -242,4 +242,17 @@ 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" + +if SH_MAGIC_PANEL_R2 + +menu "Magic Panel R2 options" + +config SH_MAGIC_PANEL_R2_VERSION + int SH_MAGIC_PANEL_R2_VERSION + default "3" + help + Set the version of the Magic Panel R2 + +endmenu + +endif diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile new file mode 100644 index 0000000..ff9b93c --- /dev/null +++ b/arch/sh/boards/Makefile @@ -0,0 +1,8 @@ +# +# Specific board support, not covered by a mach group. +# +obj-$(CONFIG_SH_AP325RXA) += board-ap325rxa.o +obj-$(CONFIG_SH_MAGIC_PANEL_R2) += board-magicpanelr2.o +obj-$(CONFIG_SH_RSK7203) += board-rsk7203.o +obj-$(CONFIG_SH_SH7785LCR) += board-sh7785lcr.o +obj-$(CONFIG_SH_SHMIN) += board-shmin..o diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/board-ap325rxa.c index 9c71603..9c71603 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 f3b8b07..f3b8b07 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 ffbedc5..ffbedc5 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 b95d674..b95d674 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 16e5dae..16e5dae 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 f663768..0000000 --- a/arch/sh/boards/mach-ap325rxa/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y := setup.o diff --git a/arch/sh/boards/mach-magicpanelr2/Kconfig b/arch/sh/boards/mach-magicpanelr2/Kconfig deleted file mode 100644 index b0abddc3..0000000 --- a/arch/sh/boards/mach-magicpanelr2/Kconfig +++ /dev/null @@ -1,13 +0,0 @@ -if SH_MAGIC_PANEL_R2 - -menu "Magic Panel R2 options" - -config SH_MAGIC_PANEL_R2_VERSION - int SH_MAGIC_PANEL_R2_VERSION - default "3" - help - Set the version of the Magic Panel R2 - -endmenu - -endif diff --git a/arch/sh/boards/mach-magicpanelr2/Makefile b/arch/sh/boards/mach-magicpanelr2/Makefile deleted file mode 100644 index 7a6d586..0000000 --- a/arch/sh/boards/mach-magicpanelr2/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for the Magic Panel specific parts -# - -obj-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 f663768..0000000 --- a/arch/sh/boards/mach-rsk7203/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-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 d21775c..0000000 --- a/arch/sh/boards/mach-se/7619/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for the 7619 SolutionEngine specific parts of the kernel -# - -obj-y := setup.o diff --git a/arch/sh/boards/mach-se/Makefile b/arch/sh/boards/mach-se/Makefile index ad2b38e..2de42ba 100644 --- a/arch/sh/boards/mach-se/Makefile +++ b/arch/sh/boards/mach-se/Makefile @@ -1,6 +1,7 @@ +obj-$(CONFIG_SH_7619_SOLUTION_ENGINE) += board-se7619.o + obj-$(CONFIG_SH_SOLUTION_ENGINE) += 770x/ obj-$(CONFIG_SH_7206_SOLUTION_ENGINE) += 7206/ -obj-$(CONFIG_SH_7619_SOLUTION_ENGINE) += 7619/ obj-$(CONFIG_SH_7722_SOLUTION_ENGINE) += 7722/ obj-$(CONFIG_SH_7751_SOLUTION_ENGINE) += 7751/ obj-$(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 1d0ef7f..1d0ef7f 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 7703756..0000000 --- a/arch/sh/boards/mach-sh7785lcr/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y := setup.o diff --git a/arch/sh/boards/mach-shmin/Makefile b/arch/sh/boards/mach-shmin/Makefile deleted file mode 100644 index 3190cc7..0000000 --- a/arch/sh/boards/mach-shmin/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for the SHMIN board. -# - -obj-y := setup.o |
