leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master

Browse Source
This commit is contained in:
Wolfgang Denk 2007-08-18 21:42:30 +02:00
commit 9edd580e91
12 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/lwmon5/sdram.c
View File

@ -57,7 +57,6 @@
void dcbz_area(u32 start_address, u32 num_bytes); void dcbz_area(u32 start_address, u32 num_bytes);
void dflush(void); void dflush(void);
#ifdef CONFIG_ADD_RAM_INFO
static u32 is_ecc_enabled(void) static u32 is_ecc_enabled(void)
{ {
u32 val; u32 val;
@ -87,7 +86,6 @@ void board_add_ram_info(int use_default)
val = DDR0_03_CASLAT_DECODE(val); val = DDR0_03_CASLAT_DECODE(val);
printf(", CL%d)", val); printf(", CL%d)", val);
} }
#endif
static int wait_for_dlllock(void) static int wait_for_dlllock(void)
{ {

2
board/netstal/hcu5/sdram.c
View File

@ -70,7 +70,6 @@ void dflush(void);
void program_tlb(u32 phys_addr, u32 virt_addr, u32 size, u32 tlb_word2_i_value); void program_tlb(u32 phys_addr, u32 virt_addr, u32 size, u32 tlb_word2_i_value);
#ifdef CONFIG_ADD_RAM_INFO
void board_add_ram_info(int use_default) void board_add_ram_info(int use_default)
{ {
PPC440_SYS_INFO board_cfg; PPC440_SYS_INFO board_cfg;
@ -99,7 +98,6 @@ void board_add_ram_info(int use_default)
val = DDR0_03_CASLAT_DECODE(val); val = DDR0_03_CASLAT_DECODE(val);
printf(", CL%d)", val); printf(", CL%d)", val);
} }
#endif
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
* wait_for_dlllock. * wait_for_dlllock.

2
cpu/ppc4xx/44x_spd_ddr2.c
View File

@ -621,7 +621,6 @@ static void get_spd_info(unsigned long *dimm_populated,
} }
} }
#ifdef CONFIG_ADD_RAM_INFO
void board_add_ram_info(int use_default) void board_add_ram_info(int use_default)
{ {
PPC440_SYS_INFO board_cfg; PPC440_SYS_INFO board_cfg;
@ -642,7 +641,6 @@ void board_add_ram_info(int use_default)
val = (val & SDRAM_MMODE_DCL_MASK) >> 4; val = (val & SDRAM_MMODE_DCL_MASK) >> 4;
printf(", CL%d)", val); printf(", CL%d)", val);
} }
#endif
/*------------------------------------------------------------------ /*------------------------------------------------------------------
* For the memory DIMMs installed, this routine verifies that they * For the memory DIMMs installed, this routine verifies that they

4
drivers/pci.c
View File

@ -82,8 +82,10 @@ int pci_hose_read_config_##size##_via_dword(struct pci_controller *hose,\
{ \ { \
u32 val32; \ u32 val32; \
\ \
if (pci_hose_read_config_dword(hose, dev, offset & 0xfc, &val32) < 0)\ if (pci_hose_read_config_dword(hose, dev, offset & 0xfc, &val32) < 0) { \
*val = -1; \
return -1; \ return -1; \
} \
\ \
*val = (val32 >> ((offset & (int)off_mask) * 8)); \ *val = (val32 >> ((offset & (int)off_mask) * 8)); \
\ \

1
include/configs/TQM85xx.h
View File

@ -94,7 +94,6 @@
*/ */
#define CFG_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory */ #define CFG_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory */
#define CFG_SDRAM_BASE CFG_DDR_SDRAM_BASE #define CFG_SDRAM_BASE CFG_DDR_SDRAM_BASE
#define CONFIG_ADD_RAM_INFO 1 /* print additional info*/
#if defined(CONFIG_TQM8540) || defined(CONFIG_TQM8560) #if defined(CONFIG_TQM8540) || defined(CONFIG_TQM8560)
/* TQM8540 & 8560 need DLL-override */ /* TQM8540 & 8560 need DLL-override */

1
include/configs/hcu5.h
View File

@ -43,7 +43,6 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
#define CONFIG_ADD_RAM_INFO 1 /* Print additional info */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Base addresses -- Note these are effective addresses where the * Base addresses -- Note these are effective addresses where the

1
include/configs/katmai.h
View File

@ -42,7 +42,6 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
#define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
#define CONFIG_ADD_RAM_INFO 1 /* Print additional info */
#undef CONFIG_SHOW_BOOT_PROGRESS #undef CONFIG_SHOW_BOOT_PROGRESS
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------

1
include/configs/luan.h
View File

@ -39,7 +39,6 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */ #define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
#define CONFIG_ADD_RAM_INFO 1 /* Print additional info */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Base addresses -- Note these are effective addresses where the * Base addresses -- Note these are effective addresses where the

1
include/configs/lwmon5.h
View File

@ -35,7 +35,6 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
#define CONFIG_ADD_RAM_INFO 1 /* Print additional info */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Base addresses -- Note these are effective addresses where the * Base addresses -- Note these are effective addresses where the

1
include/configs/p3mx.h
View File

@ -60,7 +60,6 @@
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_BOARD_EARLY_INIT_R 1 /* Call board_early_init_f */ #define CONFIG_BOARD_EARLY_INIT_R 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r() */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r() */
#define CONFIG_ADD_RAM_INFO 1 /* Print additional info */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Base addresses -- Note these are effective addresses where the * Base addresses -- Note these are effective addresses where the

1
include/configs/yucca.h
View File

@ -46,7 +46,6 @@
#define EXTCLK_83 83333333 #define EXTCLK_83 83333333
#define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */
#define CONFIG_ADD_RAM_INFO 1 /* Print additional info */
#undef CONFIG_SHOW_BOOT_PROGRESS #undef CONFIG_SHOW_BOOT_PROGRESS
#undef CONFIG_STRESS #undef CONFIG_STRESS

11
lib_ppc/board.c
View File

@ -209,9 +209,12 @@ static int init_baudrate (void)
/***********************************************************************/ /***********************************************************************/
#ifdef CONFIG_ADD_RAM_INFO void __board_add_ram_info(int use_default)
void board_add_ram_info(int); {
#endif /* please define platform specific board_add_ram_info() */
}
void board_add_ram_info(int) __attribute__((weak, alias("__board_add_ram_info")));
static int init_func_ram (void) static int init_func_ram (void)
{ {
@ -224,9 +227,7 @@ static int init_func_ram (void)
if ((gd->ram_size = initdram (board_type)) > 0) { if ((gd->ram_size = initdram (board_type)) > 0) {
print_size (gd->ram_size, ""); print_size (gd->ram_size, "");
#ifdef CONFIG_ADD_RAM_INFO
board_add_ram_info(0); board_add_ram_info(0);
#endif
putc('\n'); putc('\n');
return (0); return (0);
} }