projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib_ppc: make board_add_ram_info weak
[oweals/u-boot.git]
/
board
/
integratorap
/
integratorap.c
diff --git
a/board/integratorap/integratorap.c
b/board/integratorap/integratorap.c
index ff074ca3bcc8407723b337951c09f61bbf04f6f3..e659907567ba748bab17e0b18ccb601dd0e6e295 100644
(file)
--- a/
board/integratorap/integratorap.c
+++ b/
board/integratorap/integratorap.c
@@
-36,9
+36,11
@@
#include <common.h>
#ifdef CONFIG_PCI
#include <common.h>
#ifdef CONFIG_PCI
-#
include <pci.h>
+#include <pci.h>
#endif
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
void flash__init (void);
void ether__init (void);
void peripheral_power_enable (void);
void flash__init (void);
void ether__init (void);
void peripheral_power_enable (void);
@@
-46,7
+48,7
@@
void peripheral_power_enable (void);
#if defined(CONFIG_SHOW_BOOT_PROGRESS)
void show_boot_progress(int progress)
{
#if defined(CONFIG_SHOW_BOOT_PROGRESS)
void show_boot_progress(int progress)
{
- printf("Boot reached stage %d\n", progress);
+
printf("Boot reached stage %d\n", progress);
}
#endif
}
#endif
@@
-65,8
+67,6
@@
static inline void delay (unsigned long loops)
int board_init (void)
{
int board_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
/* arch number of Integrator Board */
gd->bd->bi_arch_number = MACH_TYPE_INTEGRATOR;
/* arch number of Integrator Board */
gd->bd->bi_arch_number = MACH_TYPE_INTEGRATOR;
@@
-79,7
+79,7
@@
int board_init (void)
extern void cm_remap(void);
cm_remap(); /* remaps writeable memory to 0x00000000 */
#endif
extern void cm_remap(void);
cm_remap(); /* remaps writeable memory to 0x00000000 */
#endif
-
+
icache_enable ();
flash__init ();
icache_enable ();
flash__init ();
@@
-480,10
+480,8
@@
void ether__init (void)
******************************/
int dram_init (void)
{
******************************/
int dram_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
#ifdef CONFIG_CM_SPD_DETECT
{
#ifdef CONFIG_CM_SPD_DETECT
{
@@
-492,22
+490,22
@@
extern void dram_query(void);
unsigned long sdram_shift;
dram_query(); /* Assembler accesses to CM registers */
unsigned long sdram_shift;
dram_query(); /* Assembler accesses to CM registers */
- /* Queries the SPD values */
+ /* Queries the SPD values */
/* Obtain the SDRAM size from the CM SDRAM register */
cm_reg_sdram = *(volatile ulong *)(CM_BASE + OS_SDRAM);
/* Obtain the SDRAM size from the CM SDRAM register */
cm_reg_sdram = *(volatile ulong *)(CM_BASE + OS_SDRAM);
- /* Register SDRAM size
+ /* Register SDRAM size
+ *
+ * 0xXXXXXXbbb000bb 16 MB
+ * 0xXXXXXXbbb001bb 32 MB
+ * 0xXXXXXXbbb010bb 64 MB
+ * 0xXXXXXXbbb011bb 128 MB
+ * 0xXXXXXXbbb100bb 256 MB
*
*
- * 0xXXXXXXbbb000bb 16 MB
- * 0xXXXXXXbbb001bb 32 MB
- * 0xXXXXXXbbb010bb 64 MB
- * 0xXXXXXXbbb011bb 128 MB
- * 0xXXXXXXbbb100bb 256 MB
- *
*/
*/
- sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4;
- gd->bd->bi_dram[0].size = 0x01000000 << sdram_shift;
+ sdram_shift = ((cm_reg_sdram & 0x0000001C)/4)%4;
+ gd->bd->bi_dram[0].size = 0x01000000 << sdram_shift;
}
#endif /* CM_SPD_DETECT */
}
#endif /* CM_SPD_DETECT */