September 2008 - U-Boot

[U-Boot] [ppc4xx] Please pull git://www.denx.de/git/u-boot-ppc4xx.git
by Stefan Roese 09 Sep '08

09 Sep '08

The following changes since commit f158c3d51838474c4c36af365af145fbaf92b694: Wolfgang Denk (1): Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Adam Graham (2): ppc4xx: IBM Memory Controller DDR autocalibration routines ppc4xx: Update Kilauea to use PPC4xx DDR autocalibration routines Matthias Fuchs (3): ppc4xx: Update CPCI405 variants handling ppc4xx: Cleanup CPCI405 linker script ppc4xx: Update CPCI405(AB) configuration Ricardo Ribalda Delgado (1): ppc44x: Unification of virtex5 pp440 boards Stefan Roese (4): ppc4xx: Fix compilation warning for canyonlands & glacier ppc4xx: Fix compilation warning for PIP405 ppc4xx: Remove CONFIG_CS8952_PHY define ppc4xx: Move ppc4xx specific prototypes to ppc4xx header Victor Gallardo (1): ppc4xx: Add support for GPCS, SGMII and M88E1112 PHY CREDITS | 3 +- MAINTAINERS | 2 + MAKEALL | 4 + Makefile | 47 +- board/avnet/v5fx30teval/.gitignore | 1 + .../ml507/config.mk => avnet/v5fx30teval/Makefile} | 12 +- board/avnet/v5fx30teval/v5fx30teval.c | 28 + board/avnet/v5fx30teval/xparameters.h | 33 + board/esd/cpci405/config.mk | 16 +- board/esd/cpci405/u-boot.lds | 15 - board/xilinx/ml507/.gitignore | 1 + board/xilinx/ml507/Makefile | 41 +- board/xilinx/ml507/init.S | 53 - board/xilinx/ml507/ml507.c | 21 +- board/xilinx/ml507/xparameters.h | 17 +- board/xilinx/ppc440-generic/.gitignore | 1 + board/xilinx/ppc440-generic/Makefile | 62 + board/xilinx/ppc440-generic/init.S | 45 + .../{ml507 => ppc440-generic}/u-boot-ram.lds | 0 .../{ml507 => ppc440-generic}/u-boot-rom.lds | 0 .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 52 + board/xilinx/ppc440-generic/xparameters.h | 34 + cpu/ppc4xx/44x_spd_ddr2.c | 158 ++- cpu/ppc4xx/4xx_enet.c | 168 +++- cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c | 1212 ++++++++++++++++++++ cpu/ppc4xx/Makefile | 3 + cpu/ppc4xx/miiphy.c | 37 +- include/asm-ppc/ppc4xx-sdram.h | 3 +- include/configs/CPCI4052.h | 6 + include/configs/CPCI405AB.h | 6 + include/configs/PIP405.h | 1 - include/configs/kilauea.h | 19 + include/configs/ml507.h | 91 +-- include/configs/v5fx30teval.h | 49 + include/configs/xilinx-ppc440-generic.h | 49 + include/configs/xilinx-ppc440.h | 106 ++ include/ppc440.h | 13 - include/ppc4xx.h | 13 + include/ppc4xx_enet.h | 3 + 41 files changed, 2112 insertions(+), 336 deletions(-) create mode 100644 board/avnet/v5fx30teval/.gitignore rename board/{xilinx/ml507/config.mk => avnet/v5fx30teval/Makefile} (76%) create mode 100644 board/avnet/v5fx30teval/v5fx30teval.c create mode 100644 board/avnet/v5fx30teval/xparameters.h create mode 100644 board/xilinx/ml507/.gitignore delete mode 100644 board/xilinx/ml507/init.S create mode 100644 board/xilinx/ppc440-generic/.gitignore create mode 100644 board/xilinx/ppc440-generic/Makefile create mode 100644 board/xilinx/ppc440-generic/init.S rename board/xilinx/{ml507 => ppc440-generic}/u-boot-ram.lds (100%) rename board/xilinx/{ml507 => ppc440-generic}/u-boot-rom.lds (100%) create mode 100644 board/xilinx/ppc440-generic/xilinx_ppc440_generic.c create mode 100644 board/xilinx/ppc440-generic/xparameters.h create mode 100644 cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c create mode 100644 include/configs/v5fx30teval.h create mode 100644 include/configs/xilinx-ppc440-generic.h create mode 100644 include/configs/xilinx-ppc440.h

3 5

[U-Boot] [PATCH 1/3] NETTA2: remove empty CONFIG_SHOW_ACTIVITY functions
by Wolfgang Denk 09 Sep '08

09 Sep '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/netta2/netta2.c | 14 -------------- include/configs/NETTA2.h | 1 - 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/board/netta2/netta2.c b/board/netta2/netta2.c index a97c14c..1dbdde1 100644 --- a/board/netta2/netta2.c +++ b/board/netta2/netta2.c @@ -620,20 +620,6 @@ void hw_watchdog_reset(void) #endif -#ifdef CONFIG_SHOW_ACTIVITY - -/* called from timer interrupt every 1/CFG_HZ sec */ -void board_show_activity(ulong timestamp) -{ -} - -/* called when looping */ -void show_activity(int arg) -{ -} - -#endif - #if defined(CFG_CONSOLE_IS_IN_ENV) && defined(CFG_CONSOLE_OVERWRITE_ROUTINE) int overwrite_console(void) { diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index 9a1f1d6..ea5d160 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -745,7 +745,6 @@ typedef unsigned int led_id_t; /* use board specific hardware */ #undef CONFIG_WATCHDOG /* watchdog disabled */ #define CONFIG_HW_WATCHDOG -#define CONFIG_SHOW_ACTIVITY /*************************************************************************************************/ -- 1.5.6.1

1 2

[U-Boot] [PATCH] Remove CONFIG_SHOW_ACTIVITY from stx boards which don't support it
by Andy Fleming 09 Sep '08

09 Sep '08

commit 9cff4448a9cb882defe6c8bde73b77fc0c636799 removed the mpc85xx version of timer_interrupt, which was overriding the lib_ppc version. The lib_ppc version tries to invoke board_show_activity() if CONFIG_SHOW_ACTIVITY is defined. stxgp3 and stxssa defined it, despite not defining board_show_activity(). I'll leave it to the stx* maintainer to implement that function if desired. :) Signed-off-by: Andy Fleming <afleming(a)freescale.com> --- include/configs/stxgp3.h | 4 ---- include/configs/stxssa.h | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index ea79de7..7cb5dc9 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -55,10 +55,6 @@ #define CONFIG_SYS_CLK_FREQ 33333333 /* most pci cards are 33Mhz */ -/* Blinkin' LEDs for Robert :-) -*/ -#define CONFIG_SHOW_ACTIVITY 1 - /* * These can be toggled for performance analysis, otherwise use default. */ diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index ac349df..8e2d56f 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -55,10 +55,6 @@ #define CONFIG_SYS_CLK_FREQ 33000000 /* most pci cards are 33Mhz */ -/* Blinkin' LEDs for Robert :-) -*/ -#define CONFIG_SHOW_ACTIVITY 1 - /* * These can be toggled for performance analysis, otherwise use default. */ -- 1.5.4.GIT

2 1

[U-Boot] CFG_64BIT_xxx and friends
by Matthias Fuchs 09 Sep '08

09 Sep '08

Hi all, after testing the recent U-Boot code on a couple of 405EP boards I noticed, that the memsize in the output of the "bdinfo" command is always 0x00000000. This is caused by using 64 types and format directives in printf that only work when CFG_64BIT_VSPRINTF is defined. So what's the best way to fix this? Here are four solutions. My favorite is no. 2. 1) Define CFG_64BIT_STRTOUL for all effected board. Currently all 405 boards have memsize output as 0 in bdinfo. 2) Define CFG_64BIT_VSPRINTF and CFG_64BIT_STRTOUL for all 4xx boards in include/ppc4xx.h: diff --git a/include/ppc4xx.h b/include/ppc4xx.h index 59a3b06..f0dfa38 100644 --- a/include/ppc4xx.h +++ b/include/ppc4xx.h @@ -102,13 +102,14 @@ #endif /* 440EP/EPX 440GR/GRX 440SP/SPE 460EX/GT/SX 405EX*/ -#if defined(CONFIG_440) /* * Enable long long (%ll ...) printf format on 440 PPC's since most of * them support 36bit physical addressing */ #define CFG_64BIT_VSPRINTF #define CFG_64BIT_STRTOUL + +#if defined(CONFIG_440) #include <ppc440.h> #else #include <ppc405.h> 3) Generally define CFG_64BIT_VSPRINTF and CFG_64BIT_STRTOUL for all boards. 4) Use an (ugly) workaround in common/cmd_bdinfo.c: static void print_lnum(const char *name, u64 value) { #ifdef CFG_64BIT_VSPRINTF printf ("%-12s= 0x%.8llX\n", name, value); #else u32 *value32 = (u32*)&value; if (value32[0]) printf ("%-12s= 0x%lX%.8lX\n", name, value32[0], value32[1]); else printf ("%-12s= 0x%.8lX\n", name, value32[1]); #endif } So what do you think? Matthias

6 10

[U-Boot] [PATCH] Support multiple SGMII/TBI interfaces for TSEC ethernet
by Peter Tyser 09 Sep '08

09 Sep '08

The original code only supported using 1 TSEC port in SGMII mode using an internal TBI PHY. Additionally, the TBI internal PHY was being accessed at the same register offset as the external PHY for the given TSEC port. This hardwiring of the TBI PHY register address based on external PHY address will break in many hardware configurations. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- The above limitations were noticed on an mpc8572-based board with 2 sgmii interfaces with external PHYs. Both external PHYs are connected to the MDIO interface of TSEC1 which caused TSEC2 to be non functional since writes to TSEC2's TBI PHY were actually going to TSEC1's TBI PHY. Due to a hardware limitations I've only been able to test TSEC2's functionality for what its worth. drivers/net/tsec.c | 15 +++++++++------ include/tsec.h | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index f81211a..38d4214 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -283,11 +283,13 @@ uint tsec_local_mdio_read(volatile tsec_t *phyregs, uint phyid, uint regnum) /* Configure the TBI for SGMII operation */ static void tsec_configure_serdes(struct tsec_private *priv) { - tsec_local_mdio_write(priv->phyregs, CFG_TBIPA_VALUE, TBI_ANA, + /* Access TBI PHY registers at given TSEC register offset as opposed to the + * offset used for external PHY/MII accesses */ + tsec_local_mdio_write(priv->regs, priv->regs->tbipa, TBI_ANA, TBIANA_SETTINGS); - tsec_local_mdio_write(priv->phyregs, CFG_TBIPA_VALUE, TBI_TBICON, + tsec_local_mdio_write(priv->regs, priv->regs->tbipa, TBI_TBICON, TBICON_CLK_SELECT); - tsec_local_mdio_write(priv->phyregs, CFG_TBIPA_VALUE, TBI_CR, + tsec_local_mdio_write(priv->regs, priv->regs->tbipa, TBI_CR, TBICR_SETTINGS); } @@ -301,11 +303,12 @@ static int init_phy(struct eth_device *dev) struct phy_info *curphy; volatile tsec_t *phyregs = priv->phyregs; volatile tsec_t *regs = priv->regs; + static int tbi_offset = 0; - /* Assign a Physical address to the TBI */ - regs->tbipa = CFG_TBIPA_VALUE; - phyregs->tbipa = CFG_TBIPA_VALUE; + /* Assign a unique physical address to the internal TBI PHY */ + regs->tbipa = CFG_TBIPA_VALUE + tbi_offset; asm("sync"); + tbi_offset++; /* Reset MII (due to new addresses) */ priv->phyregs->miimcfg = MIIMCFG_RESET; diff --git a/include/tsec.h b/include/tsec.h index 2db4deb..69f068e 100644 --- a/include/tsec.h +++ b/include/tsec.h @@ -110,7 +110,7 @@ #define miim_read -1 #ifndef CFG_TBIPA_VALUE - #define CFG_TBIPA_VALUE 0x1f + #define CFG_TBIPA_VALUE 0x10 #endif #define MIIMCFG_INIT_VALUE 0x00000003 #define MIIMCFG_RESET 0x80000000 -- 1.5.4.3

2 2

[U-Boot] u-boot 1.2.0 -> 1.3.4 migration
by Alexander Danilov 09 Sep '08

09 Sep '08

My bsp for u-boot 1.2.0 for AMCC PPC440EPx custom board works. I've moved all bsp code to current u-boot version (1.3.4). All works fine but I am getting program check exception when sending or receiving packet over ethernet (EMAC0). I've tryed to debug it but ethernet works when bdm connected. What was changed in ethernet code for ppc4xx after 1.2.0? Thanks, Alex

2 1

Re: [U-Boot] mpc85xx/27
by u-boot＠bugs.denx.de 09 Sep '08

09 Sep '08

Synopsis: [PATCH] 85xx: Socrates: Major code update. State-Changed-From-To: open->closed State-Changed-By: AndyFleming State-Changed-When: Tue, 09 Sep 2008 03:55:20 +0200 State-Changed-Why: applied, thanks

1 0

Re: [U-Boot] mpc85xx/26
by u-boot＠bugs.denx.de 09 Sep '08

09 Sep '08

Synopsis: [PATCH] 85xx: socrates: Enable Lime support. State-Changed-From-To: open->closed State-Changed-By: AndyFleming State-Changed-When: Tue, 09 Sep 2008 03:54:51 +0200 State-Changed-Why: Applied, thanks

1 0

Re: [U-Boot] mpc85xx/22
by u-boot＠bugs.denx.de 09 Sep '08

09 Sep '08

Synopsis: [PATCH] Removed hardcoded MxMR loop value from upmconfig() for MPC85xx. State-Changed-From-To: open->closed State-Changed-By: AndyFleming State-Changed-When: Tue, 09 Sep 2008 03:54:12 +0200 State-Changed-Why: Applied, with fuzz

1 0

Re: [U-Boot] mpc85xx/14
by u-boot＠bugs.denx.de 09 Sep '08

09 Sep '08

Synopsis: [U-Boot-Users] [PATCH] Update Freescale 85xx boards to sys_eeprom.c State-Changed-From-To: open->closed State-Changed-By: AndyFleming State-Changed-When: Tue, 09 Sep 2008 03:53:16 +0200 State-Changed-Why: Applied

1 0