ppc4xx: HCU4/5. Cleanups
PATCH 1/1 ppc4xx: HCU4/5. Cleanups
- Fix some coding style violations.
- Use in/out_u16/32 where appropriate.
- Use register names from ppc405.h.
- Fix trace useage for Lauterbach.
- Remove obsolete generation HCU2.
- Renamed fixed_hcu4_sdram to init_ppc405_sdram.
--- board/netstal/common/fixed_sdram.c | 2 +- board/netstal/common/hcu_flash.c | 14 ------ board/netstal/common/nm.h | 11 ++++- board/netstal/common/nm_bsp.c | 4 +- board/netstal/hcu4/hcu4.c | 80 ++++++++++++++++-------------------- board/netstal/hcu5/hcu5.c | 8 +-- board/netstal/hcu5/sdram.c | 32 ++++++++------ 7 files changed, 70 insertions(+), 81 deletions(-)
board/netstal/common/fixed_sdram.c +1 -1
@@ -44,7 +44,7 @@ void show_sdram_registers(void) }#endif -long int fixed_hcu4_sdram (unsigned int dram_size) +long int init_ppc405_sdram (unsigned int dram_size) {#ifdef DEBUG printf (__FUNCTION__);
board/netstal/common/hcu_flash.c +0 -14
@@ -21,18 +21,6 @@* MA 02111-1307 USA */ -/* -* Modified 4/5/2001 -* Wait for completion of each sector erase command issued -* 4/5/2001 -* Chris Hallinan - DS4.COM, Inc. - clh at net1plus.com -* -* Modified 6/6/2007 -* Added isync -* Niklaus Giger, Netstal Maschinen, niklaus.giger at netstal.com -* -*/ -#include <common.h> #include <ppc4xx.h> #include <asm/processor.h>
@@ -387,7 +375,6 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)/* wait at least 80us - let's wait 1 ms */ udelay (1000 ); -#if 0 /* * We wait for the last triggered sector */
@@ -396,7 +383,6 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)wait_for_DQ7 (info, l_sect); DONE: -#endif /* reset to read mode */ addr = (FLASH_WORD_SIZE *) info->start[0 ]; addr[0 ] = (FLASH_WORD_SIZE )0x00F000F0 ;/* reset bank */
board/netstal/common/nm.h +9 -2
@@ -27,8 +27,7 @@ extern void set_params_for_sw_install(int install_requested, char *board_name );extern void common_misc_init_r (void );enum { -/* HW_GENERATION_HCU1 is no longer supported */ -HW_GENERATION_HCU2 =0x10 , +/* HW_GENERATION_HCU1/2 is no longer supported */ HW_GENERATION_HCU3 =0x10 ,HW_GENERATION_HCU4 =0x20 ,HW_GENERATION_HCU5 =0x30 ,
@@ -36,3 +35,11 @@ enum {HW_GENERATION_MCU20 =0x0a , HW_GENERATION_MCU25 = 0x09, }; + +#ifdef CONFIG_405GP +#if defined(DEBUG ) +void show_sdram_registers (void ); +#endif +long int init_ppc405_sdram (unsigned int dram_size); +#endif +
board/netstal/common/nm_bsp.c +2 -2
@@ -29,8 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;typedef struct {u8 id;char *name;}generation_info ; -generation_info generations[7 ] = { - {HW_GENERATION_HCU2 ,"HCU2" }, +generation_info generations[6 ] = { {HW_GENERATION_HCU3 ,"HCU3" }, {HW_GENERATION_HCU4 ,"HCU4" }, {HW_GENERATION_HCU5 ,"HCU5" },
@@ -134,3 +133,4 @@ void common_misc_init_r(void)saveenv (); } } +
board/netstal/hcu4/hcu4.c +36 -44
141 lines not on this page · raw message
board/netstal/hcu5/hcu5.c +3 -5
@@ -309,15 +309,13 @@ int misc_init_r(void)*/ if (mfspr (dbcr0) &0x80000000 ) {/* External debugger alive -* enable trace facilty for Lauterback -* CCR0[DAPUIB]=0 Enable broadcast of instruction data -* to auxiliary processor interface +* enable trace facilty for Lauterbach * CCR0[DTB]=0 Enable broadcast of trace information * SDR0_PFC0[TRE] Trace signals are enabled instead of * GPIO49-63 */ -mtspr (ccr0,mfspr (ccr0) &~0x00108000 ); -mtsdr (SDR0_PFC0 , sdr0_pfc1 |0x00000100 ); +mtspr (ccr0,mfspr (ccr0) &~ (CCR0_DTB )); +mtsdr (SDR0_PFC0 , sdr0_pfc1 |SDR0_PFC0_TRE_ENABLE ); }return 0 ; }
board/netstal/hcu5/sdram.c +19 -13
@@ -165,19 +165,25 @@ static void program_ecc(unsigned long start_address, unsigned long num_bytes)u32 val;char str[] ="ECC generation -" ;#if defined(CONFIG_PRAM ) -u32 *magic; - -/* Check whether vxWorks is using EDR logging, if yes zero */ -/* also PostMortem and user reserved memory */ - magic = (u32 *)in_be32 ((u32 *)(start_address + num_bytes - - (CONFIG_PRAM *1024 ) +sizeof (u32))); - -debug ("\n%s: CONFIG_PRAM %d kB magic 0x%x 0x%p -> 0x%x\n" , __FUNCTION__, -CONFIG_PRAM , - start_address + num_bytes - (CONFIG_PRAM *1024 ) +sizeof (u32), - magic,in_be32 (magic)); -if (in_be32 (magic) ==0xbeefbabe ) - num_bytes -= (CONFIG_PRAM *1024 ) -PM_RESERVED_MEM ; +u32 *magicPtr; +u32 magic; + +if ((mfspr (dbcr0) &0x80000000 ) ==0 ) { +/* only if no external debugger is alive! +* Check whether vxWorks is using EDR logging, if yes zero +* also PostMortem and user reserved memory +*/ + magicPtr = (u32 *)(start_address + num_bytes - + (CONFIG_PRAM *1024 ) +sizeof (u32)); + magic =in_be32 (magicPtr); +debug ("%s: CONFIG_PRAM %d kB magic 0x%x 0x%p\n" , + __FUNCTION__,CONFIG_PRAM , + magicPtr, magic); +if (magic ==0xbeefbabe ) { +printf ("%s: preserving at %p\n" , __FUNCTION__, magicPtr); + num_bytes -= (CONFIG_PRAM *1024 ) -PM_RESERVED_MEM ; + } + }#endif sync ();
--
1.5.2.5
Stefan Roese
AppliedPATCH 1/1 ppc4xx: HCU4/5. Cleanups
Quoted 8 lines · Niklaus Giger
- Fix some coding style violations.
- Use in/out_u16/32 where appropriate.
- Use register names fromppc405.h.
- Fix trace useage for Lauterbach.
- Remove obsolete generation HCU2.
- Renamedfixed_hcu4_sdramtoinit_ppc405_sdram.Signed-off-by Niklaus Giger <[email protected]>
Applied. Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================