| From d57c54652095a0505113d06b0eca9aa951ec4381 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Fri, 16 May 2014 14:10:12 +0200 |
| Subject: ARM: shmobile: Remove non-multiplatform Genmai reference support |
| |
| Now that r7s72100 has CCF support, remove the legacy Genmai reference |
| Kconfig bits for the non-multiplatform case. |
| |
| Starting from this commit Genmai board support is always enabled via |
| CONFIG_MACH_GENMAI, and CONFIG_ARCH_MULTIPLATFORM is used to select |
| between board-genmai.c and board-genmai-reference.c |
| |
| The file board-genmai-reference.c can no longer be used together with |
| the legacy sh-clk clock framework, instead CCF is used. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 551f80a5c915c4615cd4065ad4db5cf68f765b97) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/boot/dts/Makefile |
| --- |
| arch/arm/boot/dts/Makefile | 1 - |
| arch/arm/mach-shmobile/Kconfig | 11 ----------- |
| arch/arm/mach-shmobile/Makefile | 1 - |
| arch/arm/mach-shmobile/Makefile.boot | 1 - |
| 4 files changed, 14 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index 234247b51db7..f4d6c845a4cd 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -245,7 +245,6 @@ dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb |
| dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \ |
| s3c6410-smdk6410.dtb |
| dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \ |
| - r7s72100-genmai-reference.dtb \ |
| r8a7740-armadillo800eva.dtb \ |
| r8a7778-bockw.dtb \ |
| r8a7778-bockw-reference.dtb \ |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index d19a06899e10..b50c753482c7 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -229,17 +229,6 @@ config MACH_GENMAI |
| depends on ARCH_R7S72100 |
| select USE_OF |
| |
| -config MACH_GENMAI_REFERENCE |
| - bool "Genmai board - Reference Device Tree Implementation" |
| - depends on ARCH_R7S72100 |
| - select USE_OF |
| - ---help--- |
| - Use reference implementation of Genmai board support |
| - which makes use of device tree at the expense |
| - of not supporting a number of devices. |
| - |
| - This is intended to aid developers |
| - |
| config MACH_MARZEN |
| bool "MARZEN board" |
| depends on ARCH_R8A7779 |
| diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile |
| index 9c5cd8c53a85..38d5fe825e93 100644 |
| --- a/arch/arm/mach-shmobile/Makefile |
| +++ b/arch/arm/mach-shmobile/Makefile |
| @@ -66,7 +66,6 @@ obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o |
| obj-$(CONFIG_MACH_BOCKW) += board-bockw.o |
| obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o |
| obj-$(CONFIG_MACH_GENMAI) += board-genmai.o |
| -obj-$(CONFIG_MACH_GENMAI_REFERENCE) += board-genmai-reference.o |
| obj-$(CONFIG_MACH_MARZEN) += board-marzen.o |
| obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o |
| obj-$(CONFIG_MACH_LAGER) += board-lager.o |
| diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot |
| index 99455ecafa05..918fccffa1b6 100644 |
| --- a/arch/arm/mach-shmobile/Makefile.boot |
| +++ b/arch/arm/mach-shmobile/Makefile.boot |
| @@ -7,7 +7,6 @@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 |
| loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 |
| loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 |
| loadaddr-$(CONFIG_MACH_GENMAI) += 0x08008000 |
| -loadaddr-$(CONFIG_MACH_GENMAI_REFERENCE) += 0x08008000 |
| loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 |
| loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 |
| loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000 |
| -- |
| 2.1.2 |
| |
