linux-mips
[Top] [All Lists]

[PATCH v8 1/4] MIPS: Don't define early_init_devtree() and device_tree_i

To: linux-mips@linux-mips.org, ralf@linux-mips.org, devicetree-discuss@lists.ozlabs.org, Grant Likely <grant.likely@secretlab.ca>, Rob Herring <rob.herring@calxeda.com>
Subject: [PATCH v8 1/4] MIPS: Don't define early_init_devtree() and device_tree_init() in prom.c for CPU_CAVIUM_OCTEON
From: David Daney <ddaney.cavm@gmail.com>
Date: Wed, 6 Jun 2012 15:57:40 -0700
Cc: linux-kernel@vger.kernel.org, David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=OwcD34EqlI+208AmXHacsBRSi6Vy5vNGWUdbevOo95k=; b=qRtlnR3q1E6qMIb4cJ4ZlMlQFyIMZu3V5EsLj185IkB6u7K2t9wAgkS2lCveJyu4qq Ij4oNRU3VcHafFjhYBkmSnHdJlKg8B3nASqC1IdX0mHKTUfdUYauujE1JhDYL64Gcu3+ ewbojopmpm4VNNKj90SXiXmmZrgB2VMEyPYrUFu96Qf9oyPVxFhdXecCLcLkeLg3RhlG s4EZwgtWuoE3BoXaTL4piJBnITsG9xnbzZ5KGbwBVEiZUJVwU6imv6MYjGwk7+HTxdbI 5DKb2z802snEjFzFIsIFEqA3m8t4wox5S2oPNJc0oMGWoa4Pj9fUC+HBDKPFj+OcX6tX 6nGA==
In-reply-to: <1339023463-20267-1-git-send-email-ddaney.cavm@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <1339023463-20267-1-git-send-email-ddaney.cavm@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: David Daney <david.daney@cavium.com>

This code is not common enough to be in a shared file, so OCTEON defines
it's own versions.

When the last of this target specific code is moved out, we can remove
all of this.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 arch/mips/kernel/prom.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index f11b2bb..fcb325e 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -60,6 +60,7 @@ void __init early_init_dt_setup_initrd_arch(unsigned long 
start,
 }
 #endif
 
+#ifndef CONFIG_CPU_CAVIUM_OCTEON
 void __init early_init_devtree(void *params)
 {
        /* Setup flat device-tree pointer */
@@ -108,3 +109,4 @@ void __init __dt_setup_arch(struct boot_param_header *bph)
 
        early_init_devtree(initial_boot_params);
 }
+#endif /* !CONFIG_CPU_CAVIUM_OCTEON */
-- 
1.7.2.3


<Prev in Thread] Current Thread [Next in Thread>