Re: [PATCH] ARM: shmobile: compile drivers/sh forCONFIG_ARCH_SHMOBILE_MULTI

From: Simon Horman
Date: Sun Jan 12 2014 - 19:30:29 EST


On Fri, Jan 10, 2014 at 03:18:15PM +0000, Ben Dooks wrote:
> If the kernel is built to support multi-arm configurmation with shmobile
> support built in, then the drivers/sh is not built. This contains drivers
> that are essential to devices support by that configuration, including the
> PM runtime code in drivers/sh/pm_runtime.c (which implicitly enables the
> bus clocks for all devices).
>
> If CONFIG_ARCH_SHMOBILE_MULTI then build the drivers/sh directory,
> but ensure that bits that may conflict (drivers/sh/clk if the common
> clock framework is not enabled) are built.
>
> The ARCH_SHMOBILE_MULTI was added by efacfce5f8a ("ARM: shmobile: Introduce
> ARCH_SHMOBILE_MULTI") but this has only just recently been found due to
> building device-tree only kernels.
>
> Cc: Linux Kernel list <linux-kernel@xxxxxxxxxxxxxxx>
> Cc: Linus SH list <linux-sh@xxxxxxxxxxxxxxx>
> Cc: Simon Horman <horms@xxxxxxxxxxxx>
> Cc: Magnus Damm <magnus.damm@xxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Ben Dooks <ben.dooks@xxxxxxxxxxxxxxx>
> ---
> drivers/Makefile | 1 +
> drivers/sh/Makefile | 3 +++
> 2 files changed, 4 insertions(+)
>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 8e3b8b0..abc4744 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -118,6 +118,7 @@ obj-$(CONFIG_SGI_SN) += sn/
> obj-y += firmware/
> obj-$(CONFIG_CRYPTO) += crypto/
> obj-$(CONFIG_SUPERH) += sh/
> +obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += sh/
> obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += sh/

Can't we just do the following?

obj-$(CONFIG_ARCH_SHMOBILE) += sh/

> ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
> obj-y += clocksource/
> diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
> index fc67f56..86604a5 100644
> --- a/drivers/sh/Makefile
> +++ b/drivers/sh/Makefile
> @@ -3,7 +3,10 @@
> #
> obj-y := intc/
>
> +ifeq ($(CONFIG_COMMON_CLK),n)
> obj-$(CONFIG_HAVE_CLK) += clk/
> +endif
> +
> obj-$(CONFIG_MAPLE) += maple/
> obj-$(CONFIG_SUPERHYWAY) += superhyway/
>
> --
> 1.8.5.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/