* [PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF
[not found] <1433285204-4307-1-git-send-email-robh@kernel.org>
@ 2015-06-02 22:46 ` Rob Herring
2015-06-03 8:24 ` Ralf Baechle
0 siblings, 1 reply; 3+ messages in thread
From: Rob Herring @ 2015-06-02 22:46 UTC (permalink / raw)
To: devicetree, Grant Likely, Ralf Baechle
Cc: linux-kernel, Pantelis Antoniou, Geert Uytterhoeven, Rob Herring,
linux-mips
In preparation to allow users to enable DeviceTree without arch or
machine selecting it, we need to fix build errors on MIPS. When
CONFIG_OF is enabled, device_tree_init cannot be resolved. This is
trivially fixed by using CONFIG_USE_OF instead of CONFIG_OF for prom.h.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/include/asm/prom.h | 2 +-
arch/mips/kernel/prom.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
index 8ebc2aa..0b4b668 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
@@ -11,7 +11,7 @@
#ifndef __ASM_PROM_H
#define __ASM_PROM_H
-#ifdef CONFIG_OF
+#ifdef CONFIG_USE_OF
#include <linux/bug.h>
#include <linux/io.h>
#include <linux/types.h>
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index e303cb1..b130033 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -18,6 +18,7 @@
#include <linux/of_fdt.h>
#include <linux/of_platform.h>
+#include <asm/bootinfo.h>
#include <asm/page.h>
#include <asm/prom.h>
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF
2015-06-02 22:46 ` [PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF Rob Herring
@ 2015-06-03 8:24 ` Ralf Baechle
2015-06-04 8:01 ` Grant Likely
0 siblings, 1 reply; 3+ messages in thread
From: Ralf Baechle @ 2015-06-03 8:24 UTC (permalink / raw)
To: Rob Herring
Cc: devicetree, Grant Likely, linux-kernel, Pantelis Antoniou,
Geert Uytterhoeven, linux-mips
On Tue, Jun 02, 2015 at 05:46:42PM -0500, Rob Herring wrote:
> In preparation to allow users to enable DeviceTree without arch or
> machine selecting it, we need to fix build errors on MIPS. When
> CONFIG_OF is enabled, device_tree_init cannot be resolved. This is
> trivially fixed by using CONFIG_USE_OF instead of CONFIG_OF for prom.h.
Want to take this through your tree? If so,
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Ralf
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF
2015-06-03 8:24 ` Ralf Baechle
@ 2015-06-04 8:01 ` Grant Likely
0 siblings, 0 replies; 3+ messages in thread
From: Grant Likely @ 2015-06-04 8:01 UTC (permalink / raw)
To: Ralf Baechle, Rob Herring
Cc: devicetree, linux-kernel, Pantelis Antoniou, Geert Uytterhoeven,
linux-mips
On Wed, 3 Jun 2015 10:24:10 +0200
, Ralf Baechle <ralf@linux-mips.org>
wrote:
> On Tue, Jun 02, 2015 at 05:46:42PM -0500, Rob Herring wrote:
>
> > In preparation to allow users to enable DeviceTree without arch or
> > machine selecting it, we need to fix build errors on MIPS. When
> > CONFIG_OF is enabled, device_tree_init cannot be resolved. This is
> > trivially fixed by using CONFIG_USE_OF instead of CONFIG_OF for prom.h.
>
> Want to take this through your tree? If so,
>
> Acked-by: Ralf Baechle <ralf@linux-mips.org>
>
> Ralf
For the whole series:
Acked-by: Grant Likely <grant.likely@linaro.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-04 8:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1433285204-4307-1-git-send-email-robh@kernel.org>
2015-06-02 22:46 ` [PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF Rob Herring
2015-06-03 8:24 ` Ralf Baechle
2015-06-04 8:01 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox