From: Prabhakar prabhakar@freescale.com

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 prabhakar@freescale.com --- Based of http://git.denx.de/u-boot.git (branch master)

Top commit: commit c6b734f5aea2ba75caaa1929f7e649ecda8d2f31 Merge: 072f412 a972089 Author: Wolfgang Denk wd@denx.de 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 \