| From 5bc7df8fede63d6a3b97d710ae26d1bf02bc1881 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Sat, 9 Nov 2013 13:33:48 +0100 |
| Subject: ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY |
| |
| SH-Mobile platforms are transitioning from non-multiplatform to |
| multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has |
| been created to group all multiplatform-enabled SH-Mobile SoCs. The |
| existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't |
| been converted yet. |
| |
| This arrangement works fine for the arch/ code, but lots of drivers |
| needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on |
| ARCH_SHMOBILE only. In order to avoid changing them, rename |
| ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean |
| ARCH_SHMOBILE configuration symbol that is selected by both |
| ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit bf98c1eac1d4a6bcf00532e4fa41d8126cd6c187) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/Kconfig |
| arch/arm/Makefile |
| arch/arm/boot/dts/Makefile |
| drivers/Makefile |
| --- |
| arch/arm/Kconfig | 14 ++++++++------ |
| arch/arm/Makefile | 1 - |
| arch/arm/boot/compressed/Makefile | 2 +- |
| arch/arm/boot/dts/Makefile | 2 +- |
| arch/arm/configs/ape6evm_defconfig | 2 +- |
| arch/arm/configs/armadillo800eva_defconfig | 2 +- |
| arch/arm/configs/bockw_defconfig | 2 +- |
| arch/arm/configs/koelsch_defconfig | 2 +- |
| arch/arm/configs/kzm9d_defconfig | 2 +- |
| arch/arm/configs/kzm9g_defconfig | 2 +- |
| arch/arm/configs/lager_defconfig | 2 +- |
| arch/arm/configs/mackerel_defconfig | 2 +- |
| arch/arm/configs/marzen_defconfig | 2 +- |
| arch/arm/mach-shmobile/Kconfig | 8 ++++++-- |
| drivers/Makefile | 2 +- |
| 15 files changed, 26 insertions(+), 21 deletions(-) |
| |
| diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig |
| index 9e4b5fd241cd..e965fda96875 100644 |
| --- a/arch/arm/Kconfig |
| +++ b/arch/arm/Kconfig |
| @@ -632,8 +632,9 @@ config ARCH_MSM |
| stack and controls some vital subsystems |
| (clock and power control, etc). |
| |
| -config ARCH_SHMOBILE |
| - bool "Renesas SH-Mobile / R-Mobile" |
| +config ARCH_SHMOBILE_LEGACY |
| + bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)" |
| + select ARCH_SHMOBILE |
| select ARM_PATCH_PHYS_VIRT |
| select CLKDEV_LOOKUP |
| select GENERIC_CLOCKEVENTS |
| @@ -649,7 +650,8 @@ config ARCH_SHMOBILE |
| select PM_GENERIC_DOMAINS if PM |
| select SPARSE_IRQ |
| help |
| - Support for Renesas's SH-Mobile and R-Mobile ARM platforms. |
| + Support for Renesas's SH-Mobile and R-Mobile ARM platforms using |
| + a non-multiplatform kernel. |
| |
| config ARCH_RPC |
| bool "RiscPC" |
| @@ -1601,7 +1603,7 @@ config HZ |
| default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \ |
| ARCH_S5PV210 || ARCH_EXYNOS4 |
| default AT91_TIMER_HZ if ARCH_AT91 |
| - default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE |
| + default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY |
| default 100 |
| |
| config SCHED_HRTICK |
| @@ -1734,8 +1736,8 @@ config HW_PERF_EVENTS |
| source "mm/Kconfig" |
| |
| config FORCE_MAX_ZONEORDER |
| - int "Maximum zone order" if ARCH_SHMOBILE |
| - range 11 64 if ARCH_SHMOBILE |
| + int "Maximum zone order" if ARCH_SHMOBILE_LEGACY |
| + range 11 64 if ARCH_SHMOBILE_LEGACY |
| default "12" if SOC_AM33XX |
| default "9" if SA1111 |
| default "11" |
| diff --git a/arch/arm/Makefile b/arch/arm/Makefile |
| index f56df13da7b2..1ba358ba16b8 100644 |
| --- a/arch/arm/Makefile |
| +++ b/arch/arm/Makefile |
| @@ -181,7 +181,6 @@ machine-$(CONFIG_ARCH_EXYNOS) += exynos |
| machine-$(CONFIG_ARCH_SA1100) += sa1100 |
| machine-$(CONFIG_ARCH_SHARK) += shark |
| machine-$(CONFIG_ARCH_SHMOBILE) += shmobile |
| -machine-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile |
| machine-$(CONFIG_ARCH_TEGRA) += tegra |
| machine-$(CONFIG_ARCH_U300) += u300 |
| machine-$(CONFIG_ARCH_U8500) += ux500 |
| diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile |
| index 120b83bfde20..e60f192571ce 100644 |
| --- a/arch/arm/boot/compressed/Makefile |
| +++ b/arch/arm/boot/compressed/Makefile |
| @@ -68,7 +68,7 @@ else |
| endif |
| endif |
| |
| -ifeq ($(CONFIG_ARCH_SHMOBILE),y) |
| +ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y) |
| OBJS += head-shmobile.o |
| endif |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index 5df751b250a1..3ced87adb39d 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -159,7 +159,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ |
| hrefprev60.dtb \ |
| hrefv60plus.dtb \ |
| ccu9540.dtb |
| -dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ |
| +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ |
| r7s72100-genmai.dtb \ |
| r8a7740-armadillo800eva.dtb \ |
| r8a7778-bockw.dtb \ |
| diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig |
| index 1ce39940795d..cb26c62dc722 100644 |
| --- a/arch/arm/configs/ape6evm_defconfig |
| +++ b/arch/arm/configs/ape6evm_defconfig |
| @@ -13,7 +13,7 @@ CONFIG_EMBEDDED=y |
| CONFIG_PERF_EVENTS=y |
| CONFIG_SLAB=y |
| # CONFIG_BLOCK is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_R8A73A4=y |
| CONFIG_MACH_APE6EVM=y |
| # CONFIG_ARM_THUMB is not set |
| diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig |
| index fae939d3d7f0..5abf1a2e3160 100644 |
| --- a/arch/arm/configs/armadillo800eva_defconfig |
| +++ b/arch/arm/configs/armadillo800eva_defconfig |
| @@ -15,7 +15,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y |
| # CONFIG_BLK_DEV_BSG is not set |
| # CONFIG_IOSCHED_DEADLINE is not set |
| # CONFIG_IOSCHED_CFQ is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_R8A7740=y |
| CONFIG_MACH_ARMADILLO800EVA=y |
| # CONFIG_SH_TIMER_TMU is not set |
| diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig |
| index 8110d8a653f7..80cff50beb34 100644 |
| --- a/arch/arm/configs/bockw_defconfig |
| +++ b/arch/arm/configs/bockw_defconfig |
| @@ -8,7 +8,7 @@ CONFIG_SYSCTL_SYSCALL=y |
| CONFIG_EMBEDDED=y |
| CONFIG_SLAB=y |
| # CONFIG_IOSCHED_CFQ is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_R8A7778=y |
| CONFIG_MACH_BOCKW=y |
| CONFIG_MEMORY_START=0x60000000 |
| diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig |
| index 825c16dee8a0..7fd65a01ec7e 100644 |
| --- a/arch/arm/configs/koelsch_defconfig |
| +++ b/arch/arm/configs/koelsch_defconfig |
| @@ -9,7 +9,7 @@ CONFIG_EMBEDDED=y |
| CONFIG_PERF_EVENTS=y |
| CONFIG_SLAB=y |
| # CONFIG_BLOCK is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_R8A7791=y |
| CONFIG_MACH_KOELSCH=y |
| # CONFIG_SWP_EMULATE is not set |
| diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig |
| index e6aed23ac083..e42ce3756af3 100644 |
| --- a/arch/arm/configs/kzm9d_defconfig |
| +++ b/arch/arm/configs/kzm9d_defconfig |
| @@ -13,7 +13,7 @@ CONFIG_SLAB=y |
| # CONFIG_BLK_DEV_BSG is not set |
| # CONFIG_IOSCHED_DEADLINE is not set |
| # CONFIG_IOSCHED_CFQ is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_EMEV2=y |
| CONFIG_MACH_KZM9D=y |
| CONFIG_MEMORY_START=0x40000000 |
| diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig |
| index 1ad028023a64..9934dbc23d64 100644 |
| --- a/arch/arm/configs/kzm9g_defconfig |
| +++ b/arch/arm/configs/kzm9g_defconfig |
| @@ -22,7 +22,7 @@ CONFIG_MODULE_UNLOAD=y |
| # CONFIG_BLK_DEV_BSG is not set |
| # CONFIG_IOSCHED_DEADLINE is not set |
| # CONFIG_IOSCHED_CFQ is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_SH73A0=y |
| CONFIG_MACH_KZM9G=y |
| CONFIG_MEMORY_START=0x41000000 |
| diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig |
| index 35bff5e0d57a..35dc8b2be47f 100644 |
| --- a/arch/arm/configs/lager_defconfig |
| +++ b/arch/arm/configs/lager_defconfig |
| @@ -12,7 +12,7 @@ CONFIG_SLAB=y |
| # CONFIG_BLK_DEV_BSG is not set |
| # CONFIG_IOSCHED_DEADLINE is not set |
| # CONFIG_IOSCHED_CFQ is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_R8A7790=y |
| CONFIG_MACH_LAGER=y |
| # CONFIG_SH_TIMER_TMU is not set |
| diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig |
| index 9fb11895b2e2..a61e1653fc5e 100644 |
| --- a/arch/arm/configs/mackerel_defconfig |
| +++ b/arch/arm/configs/mackerel_defconfig |
| @@ -14,7 +14,7 @@ CONFIG_MODULE_UNLOAD=y |
| # CONFIG_BLK_DEV_BSG is not set |
| # CONFIG_IOSCHED_DEADLINE is not set |
| # CONFIG_IOSCHED_CFQ is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_SH7372=y |
| CONFIG_MACH_MACKEREL=y |
| CONFIG_MEMORY_SIZE=0x10000000 |
| diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig |
| index dd4aced59d3c..f21bd405cc2a 100644 |
| --- a/arch/arm/configs/marzen_defconfig |
| +++ b/arch/arm/configs/marzen_defconfig |
| @@ -9,7 +9,7 @@ CONFIG_SYSCTL_SYSCALL=y |
| CONFIG_EMBEDDED=y |
| CONFIG_SLAB=y |
| # CONFIG_IOSCHED_CFQ is not set |
| -CONFIG_ARCH_SHMOBILE=y |
| +CONFIG_ARCH_SHMOBILE_LEGACY=y |
| CONFIG_ARCH_R8A7779=y |
| CONFIG_MACH_MARZEN=y |
| CONFIG_MEMORY_START=0x60000000 |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 180b71fd86f8..1b7df173db0e 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -1,6 +1,10 @@ |
| +config ARCH_SHMOBILE |
| + bool |
| + |
| config ARCH_SHMOBILE_MULTI |
| bool "SH-Mobile Series" if ARCH_MULTI_V7 |
| depends on MMU |
| + select ARCH_SHMOBILE |
| select CPU_V7 |
| select GENERIC_CLOCKEVENTS |
| select HAVE_ARM_SCU if SMP |
| @@ -30,7 +34,7 @@ config MACH_KZM9D |
| comment "SH-Mobile System Configuration" |
| endif |
| |
| -if ARCH_SHMOBILE |
| +if ARCH_SHMOBILE_LEGACY |
| |
| comment "SH-Mobile System Type" |
| |
| @@ -272,7 +276,7 @@ source "drivers/sh/Kconfig" |
| |
| endif |
| |
| -if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI |
| +if ARCH_SHMOBILE |
| |
| menu "Timer and clock configuration" |
| |
| diff --git a/drivers/Makefile b/drivers/Makefile |
| index 130abc1dfd65..4548367a2cb2 100644 |
| --- a/drivers/Makefile |
| +++ b/drivers/Makefile |
| @@ -116,7 +116,7 @@ obj-$(CONFIG_SGI_SN) += sn/ |
| obj-y += firmware/ |
| obj-$(CONFIG_CRYPTO) += crypto/ |
| obj-$(CONFIG_SUPERH) += sh/ |
| -obj-$(CONFIG_ARCH_SHMOBILE) += sh/ |
| +obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += sh/ |
| obj-$(CONFIG_SSBI) += ssbi/ |
| ifndef CONFIG_ARCH_USES_GETTIMEOFFSET |
| obj-y += clocksource/ |
| -- |
| 1.8.5.rc3 |
| |