From patchwork Tue Dec 1 14:52:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristoffer Glembo X-Patchwork-Id: 39915 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 8C17EB6F19 for ; Wed, 2 Dec 2009 01:53:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752784AbZLAOwz (ORCPT ); Tue, 1 Dec 2009 09:52:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752753AbZLAOwz (ORCPT ); Tue, 1 Dec 2009 09:52:55 -0500 Received: from mail168c2.megamailservers.com ([69.49.111.68]:35912 "EHLO mail168c2.megamailservers.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752784AbZLAOwy (ORCPT ); Tue, 1 Dec 2009 09:52:54 -0500 X-POP-User: kristoffer.gaisler.com Received: from localhost.localdomain (c-10a5e155.260-1-64736c10.cust.bredbandsbolaget.se [85.225.165.16]) by mail168c2.megamailservers.com (8.13.6/8.13.1) with ESMTP id nB1EqrIA016238 for ; Tue, 1 Dec 2009 09:52:59 -0500 From: Kristoffer Glembo To: sparclinux@vger.kernel.org Subject: [PATCH 3/4] Don't call idprom_init() on LEON Date: Tue, 1 Dec 2009 15:52:55 +0100 Message-Id: <1259679176-29835-3-git-send-email-kristoffer@gaisler.com> X-Mailer: git-send-email 1.5.4 In-Reply-To: <1259679176-29835-1-git-send-email-kristoffer@gaisler.com> References: <1259679176-29835-1-git-send-email-kristoffer@gaisler.com> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org LEON does not have an idprom and idprom_init prints some bogus info (e.g. incorrect Ethernet address). Signed-off-by: Kristoffer Glembo --- arch/sparc/kernel/setup_32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 9be2af5..1d3cf56 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -271,7 +271,10 @@ void __init setup_arch(char **cmdline_p) #endif boot_flags_init(*cmdline_p); +#ifndef CONFIG_SPARC_LEON idprom_init(); +#endif + if (ARCH_SUN4C) sun4c_probe_vac(); load_mmu();