From patchwork Tue Jan 18 03:33:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar Kushwaha X-Patchwork-Id: 79246 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 6E508B713A for ; Tue, 18 Jan 2011 14:34:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 467D728110; Tue, 18 Jan 2011 04:34:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l6VSf9BWpTE9; Tue, 18 Jan 2011 04:34:16 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AA5CB28113; Tue, 18 Jan 2011 04:34:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7C85828113 for ; Tue, 18 Jan 2011 04:34:12 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DaRvnVH9iJs5 for ; Tue, 18 Jan 2011 04:34:10 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from TX2EHSOBE001.bigfish.com (tx2ehsobe001.messaging.microsoft.com [65.55.88.11]) by theia.denx.de (Postfix) with ESMTPS id 0672128110 for ; Tue, 18 Jan 2011 04:34:08 +0100 (CET) Received: from mail125-tx2-R.bigfish.com (10.9.14.248) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 14.1.225.8; Tue, 18 Jan 2011 03:34:06 +0000 Received: from mail125-tx2 (localhost.localdomain [127.0.0.1]) by mail125-tx2-R.bigfish.com (Postfix) with ESMTP id 65E3C940952 for ; Tue, 18 Jan 2011 03:34:06 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:az33egw02.freescale.net; RD:az33egw02.freescale.net; EFVD:NLI Received: from mail125-tx2 (localhost.localdomain [127.0.0.1]) by mail125-tx2 (MessageSwitch) id 1295321646148630_18181; Tue, 18 Jan 2011 03:34:06 +0000 (UTC) Received: from TX2EHSMHS024.bigfish.com (unknown [10.9.14.249]) by mail125-tx2.bigfish.com (Postfix) with ESMTP id 222BB5E8056 for ; Tue, 18 Jan 2011 03:34:06 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by TX2EHSMHS024.bigfish.com (10.9.99.124) with Microsoft SMTP Server (TLS) id 14.1.225.8; Tue, 18 Jan 2011 03:34:05 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id p0I3Y4GE019760 for ; Mon, 17 Jan 2011 20:34:05 -0700 (MST) Received: from localhost.localdomain ([10.232.14.58]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p0I3Y1R5001517 for ; Mon, 17 Jan 2011 21:34:03 -0600 (CST) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.13.8/8.13.8) with ESMTP id p0I3Y0g4022523; Tue, 18 Jan 2011 09:04:00 +0530 Received: (from prabhakar@localhost) by localhost.localdomain (8.13.8/8.13.8/Submit) id p0I3Y0Tp022522; Tue, 18 Jan 2011 09:04:00 +0530 From: Prabhakar Kushwaha To: Date: Tue, 18 Jan 2011 09:03:59 +0530 Message-ID: <1295321639-22491-1-git-send-email-prabhakar@freescale.com> X-Mailer: git-send-email 1.6.3.1 MIME-Version: 1.0 X-OriginatorOrg: freescale.net Cc: Prabhakar Subject: [U-Boot] [PATCH][v2] Fix wrong CONFIG_SYS_MPC85xx_SERDES1_ADDR X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Prabhakar CONFIG_SYS_MPC85xx_SERDES1_ADDR was defined wrong as CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_SERDES2_OFFSET. It should be as CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_SERDES1_OFFSET. Signed-off-by: Prabhakar Kushwaha --- Based of http://git.denx.de/u-boot.git (branch master) Top commit: commit c6b734f5aea2ba75caaa1929f7e649ecda8d2f31 Merge: 072f412 a972089 Author: Wolfgang Denk Date: Wed Jan 12 23:59:53 2011 +0100 Merge branch 'master' of git://git.denx.de/u-boot-sh Changes for v1: Incorporated Wolfgang Denk's comments - Fixed header length to 74 - Rebased to http://git.denx.de/u-boot.git (branch master) Changes for v2: Incorporated Timur Tabi's comments - Added full name in Signed-off-by arch/powerpc/include/asm/immap_85xx.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 30c64eb..6a2daf2 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2307,7 +2307,7 @@ typedef struct ccsr_pme { #define CONFIG_SYS_MPC85xx_CPM_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_CPM_OFFSET) #define CONFIG_SYS_MPC85xx_SERDES1_ADDR \ - (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_SERDES2_OFFSET) + (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_SERDES1_OFFSET) #define CONFIG_SYS_MPC85xx_SERDES2_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_SERDES2_OFFSET) #define CONFIG_SYS_FSL_CORENET_SERDES_ADDR \