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 4baf39a67780ee69d15b90005f557ea4b33f6932..e659907567ba748bab17e0b18ccb601dd0e6e295 100644
(file)
--- a/
board/integratorap/integratorap.c
+++ b/
board/integratorap/integratorap.c
@@
-39,6
+39,8
@@
#include <pci.h>
#endif
#include <pci.h>
#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);
@@
-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;
@@
-480,8
+480,6
@@
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].size = PHYS_SDRAM_1_SIZE;
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
@@
-649,8
+647,3
@@
ulong get_tbclk (void)
{
return CFG_HZ_CLOCK/div_clock;
}
{
return CFG_HZ_CLOCK/div_clock;
}
-
-/* The Integrator/AP timer1 is clocked at 24MHz
- * can be divided by 16 or 256
- * and is a 16-bit counter
- */