[PATCH] MIPS: fix build with CONFIG_OF=y for non OF-enabled targets

[PATCH] MIPS: fix build with CONFIG_OF=y for non OF-enabled targets

[Jonas Gorski]

Commit 01306aeadd75 ("MIPS: prepare for user enabling of CONFIG_OF")
changed the guards in asm/prom.h from CONFIG_OF to CONFIG_USE_OF, but
missed the actual function declarations in kernel/prom.c, which have
additional dependencies.

Fixes the following build error:

  CC      arch/mips/kernel/prom.o
arch/mips/kernel/prom.c: In function '__dt_setup_arch':
arch/mips/kernel/prom.c:54:2: error: implicit declaration of function 'early_init_dt_scan' [-Werror=implicit-function-declaration]
  if (!early_init_dt_scan(bph))
  ^

Fixes: 01306aeadd75 ("MIPS: prepare for user enabling of CONFIG_OF")
Signed-off-by: Jonas Gorski <jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
---
 arch/mips/kernel/prom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index b130033..5fcec30 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -38,7 +38,7 @@ char *mips_get_machine_name(void)
 	return mips_machine_name;
 }
 
-#ifdef CONFIG_OF
+#ifdef CONFIG_USE_OF
 void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
 	return add_memory_region(base, size, BOOT_MEM_RAM);
-- 
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] MIPS: fix build with CONFIG_OF=y for non OF-enabled targets

[Rob Herring]

On Sun, Jul 19, 2015 at 7:42 AM, Jonas Gorski <jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> wrote:
> Commit 01306aeadd75 ("MIPS: prepare for user enabling of CONFIG_OF")
> changed the guards in asm/prom.h from CONFIG_OF to CONFIG_USE_OF, but
> missed the actual function declarations in kernel/prom.c, which have
> additional dependencies.

Just curious, what machine do you hit this on?

> Fixes the following build error:
>
>   CC      arch/mips/kernel/prom.o
> arch/mips/kernel/prom.c: In function '__dt_setup_arch':
> arch/mips/kernel/prom.c:54:2: error: implicit declaration of function 'early_init_dt_scan' [-Werror=implicit-function-declaration]
>   if (!early_init_dt_scan(bph))
>   ^
>
> Fixes: 01306aeadd75 ("MIPS: prepare for user enabling of CONFIG_OF")
> Signed-off-by: Jonas Gorski <jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

Rob

> ---
>  arch/mips/kernel/prom.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
> index b130033..5fcec30 100644
> --- a/arch/mips/kernel/prom.c
> +++ b/arch/mips/kernel/prom.c
> @@ -38,7 +38,7 @@ char *mips_get_machine_name(void)
>         return mips_machine_name;
>  }
>
> -#ifdef CONFIG_OF
> +#ifdef CONFIG_USE_OF
>  void __init early_init_dt_add_memory_arch(u64 base, u64 size)
>  {
>         return add_memory_region(base, size, BOOT_MEM_RAM);
> --
> 2.1.4
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] MIPS: fix build with CONFIG_OF=y for non OF-enabled targets

[Jonas Gorski]

On Sun, Jul 19, 2015 at 11:06 PM, Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
> On Sun, Jul 19, 2015 at 7:42 AM, Jonas Gorski <jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> wrote:
>> Commit 01306aeadd75 ("MIPS: prepare for user enabling of CONFIG_OF")
>> changed the guards in asm/prom.h from CONFIG_OF to CONFIG_USE_OF, but
>> missed the actual function declarations in kernel/prom.c, which have
>> additional dependencies.
>
> Just curious, what machine do you hit this on?

bcm63xx without my local WIP OF-patches applied, but still CONFIG_OF=y
in the .config. So more accidentally found than intentionally OF
enabled.


Jonas
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html