[PATCH] ARM: omap1: set ARCH_OMAP1_ANY for ARCH_OMAP1

[Arnd Bergmann]

On Sun, Nov 6, 2022, at 07:25, Randy Dunlap wrote:
> Fix a build error by setting ARCH_OMAP1_ANY Kconfig symbol.
> Fixes this build error:
>
> arm-linux-gnueabi-ld: drivers/video/backlight/omap1_bl.o: in function 
> `omapbl_probe':
> omap1_bl.c:(.text+0x1b4): undefined reference to `omap_cfg_reg'
>
> Fixes: 7036440eab3e ("ARM: omap1: enable multiplatform")
> Signed-off-by: Randy Dunlap <rdunlap at infradead.org>
> Reported-by: kernel test robot <lkp at intel.com>
> Cc: Aaro Koskinen <aaro.koskinen at iki.fi>
> Cc: Janusz Krzysztofik <jmkrzyszt at gmail.com>
> Cc: Tony Lindgren <tony at atomide.com>
> Cc: Russell King <linux at armlinux.org.uk>
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-omap at vger.kernel.org
> ---
>  arch/arm/mach-omap1/Kconfig |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff -- a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
> --- a/arch/arm/mach-omap1/Kconfig
> +++ b/arch/arm/mach-omap1/Kconfig
> @@ -47,7 +47,8 @@ config ARCH_OMAP16XX
> 
>  config ARCH_OMAP1_ANY
>  	select ARCH_OMAP
> -	def_bool ARCH_OMAP730 || ARCH_OMAP850 || ARCH_OMAP15XX || ARCH_OMAP16XX
> +	def_bool ARCH_OMAP730 || ARCH_OMAP850 || ARCH_OMAP15XX || \
> +		ARCH_OMAP16XX || ARCH_OMAP1

I think this would introduce other build failures, because it
makes ARCH_OMAP1_ANY the same as ARCH_OMAP1, bringing back the
problems I solved with 615dce5bf736 ("ARM: omap1: fix build with
no SoC selected").

What you probably see here is a preexisting bug that bisects
to 7036440eab3e because of the contents of your .config file
that no longer enable ARCH_OMAP1 without 7036440eab3e.

I have not tested it, but I suspect what we want instead is
the change below, limiting OMAP_MUX and related symbols to
configs that enable at least one of the OMAP1 variants.

     Arnd

--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -49,7 +49,7 @@ config ARCH_OMAP1_ANY
        select ARCH_OMAP
        def_bool ARCH_OMAP730 || ARCH_OMAP850 || ARCH_OMAP15XX || ARCH_OMAP16XX
 
-config ARCH_OMAP
+config ARCH_OMAP1_ANY
        bool
 
 comment "OMAP Feature Selections"