[PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Rob Herring <robh@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF
Date	Wed, 03 Jun 2015 00:50:02 +0200
Message-ID	<px3aq-6Sy-7@gated-at.bofh.it> (permalink)
References	<px3ap-6Sy-1@gated-at.bofh.it>
X-Original-To	devicetree@vger.kernel.org, Grant Likely <grant.likely@linaro.org>, Ralf Baechle <ralf@linux-mips.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=KAJdLrffVXop1/OXjQ1+pCWZqgwowqjgGfNOvEO+Ly4=; b=KJDBM51mWvIVWtN+3WEYMBapz6qs4FoMvH+80CNxIirRx9sSdxlIpsoV1UkptVUre0 R2MuyGnz3ovhojfJkMOT46kEItnu0QX4mlsAhtzdwtlngrCkoReeUlLofrOJtRh/4jXK SnOSVW35ORM2DHYzp5pTZHyg4KzzF65e9yV9KvuRCShjVxVV+Xsz0DZkI1jkreZV+62q 57mojX2LaWHXIAva1ODPNvgKj3bW5q8GV4hEdOIgGSppbWnl8CvNwHNCZFjZOIIFXcOe 8Qgby/wPeFcKbf3NOHg2x+qlpYQ2wzmBVqY5NEBBz+94Kw2gjM1D3vsWgxtjhl3Aq50A vMyw==
X-Received	by 10.55.18.144 with SMTP id 16mr51649842qks.17.1433285215667; Tue, 02 Jun 2015 15:46:55 -0700 (PDT)
X-Mailer	git-send-email 2.1.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	46
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Pantelis Antoniou <pantelis.antoniou@konsulko.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Rob Herring <robh@kernel.org>, linux-mips@linux-mips.org
X-Original-Date	Tue, 2 Jun 2015 17:46:42 -0500
X-Original-Message-ID	<1433285204-4307-2-git-send-email-robh@kernel.org>
X-Original-References	<1433285204-4307-1-git-send-email-robh@kernel.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1156975

Show key headers only | View raw

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

[PATCH 0/3] Make CONFIG_OF user selectable Rob Herring <robh@kernel.org> - 2015-06-03 00:50 +0200
  [PATCH 1/3] MIPS: prepare for user enabling of CONFIG_OF Rob Herring <robh@kernel.org> - 2015-06-03 00:50 +0200
  [PATCH 3/3] of: make unittest select OF_EARLY_FLATTREE instead of depend on it Rob Herring <robh@kernel.org> - 2015-06-03 00:50 +0200
  [PATCH 2/3] of: make CONFIG_OF user selectable Rob Herring <robh@kernel.org> - 2015-06-03 00:50 +0200
    Re: [PATCH 2/3] of: make CONFIG_OF user selectable Geert Uytterhoeven <geert@linux-m68k.org> - 2015-06-03 08:50 +0200

csiph-web