projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
lib_ppc
/
board.c
diff --git
a/lib_ppc/board.c
b/lib_ppc/board.c
index
1b8a872
..
c02ac62
100644
(file)
--- a/
lib_ppc/board.c
+++ b/
lib_ppc/board.c
@@
-90,12
+90,8
@@
void doc_init (void);
defined(CONFIG_SOFT_I2C)
#include <i2c.h>
#endif
defined(CONFIG_SOFT_I2C)
#include <i2c.h>
#endif
-#if defined(CONFIG_HARD_SPI)
#include <spi.h>
#include <spi.h>
-#endif
-#if defined(CONFIG_CMD_NAND)
-void nand_init (void);
-#endif
+#include <nand.h>
static char *failed = "*** failed ***\n";
static char *failed = "*** failed ***\n";
@@
-110,12
+106,12
@@
extern int board_start_ide(void);
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#if defined(C
F
G_ENV_IS_EMBEDDED)
+#if defined(C
ONFI
G_ENV_IS_EMBEDDED)
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
-#elif ( ((C
FG_ENV_ADDR+CF
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
- (C
F
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
- defined(C
F
G_ENV_IS_IN_NVRAM)
-#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
F
G_ENV_SIZE)
+#elif ( ((C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
+ (C
ONFI
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
+ defined(C
ONFI
G_ENV_IS_IN_NVRAM)
+#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
ONFI
G_ENV_SIZE)
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
@@
-172,19
+168,6
@@
void *sbrk (ptrdiff_t increment)
return ((void *) old);
}
return ((void *) old);
}
-char *strmhz (char *buf, long hz)
-{
- long l, n;
- long m;
-
- n = hz / 1000000L;
- l = sprintf (buf, "%ld", n);
- m = (hz % 1000000L) / 1000L;
- if (m != 0)
- sprintf (buf + l, ".%03ld", m);
- return (buf);
-}
-
/*
* All attempts to come up with a "common" initialization sequence
* that works for all boards and architectures failed: some of the
/*
* All attempts to come up with a "common" initialization sequence
* that works for all boards and architectures failed: some of the
@@
-398,6
+381,13
@@
ulong get_effective_memsize(void)
************************************************************************
*/
************************************************************************
*/
+#ifdef CONFIG_LOGBUFFER
+unsigned long logbuffer_base(void)
+{
+ return CFG_SDRAM_BASE + get_effective_memsize() - LOGBUFF_LEN;
+}
+#endif
+
void board_init_f (ulong bootflag)
{
bd_t *bd;
void board_init_f (ulong bootflag)
{
bd_t *bd;
@@
-416,7
+406,8
@@
void board_init_f (ulong bootflag)
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
-#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC83XX)
+#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC83XX) && \
+ !defined(CONFIG_MPC85xx) && !defined(CONFIG_MPC86xx)
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
#endif
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
#endif
@@
-453,18
+444,7
@@
void board_init_f (ulong bootflag)
*/
gd->ram_size -= CFG_MEM_TOP_HIDE;
*/
gd->ram_size -= CFG_MEM_TOP_HIDE;
-#ifndef CONFIG_MAX_MEM_MAPPED
-#define CONFIG_MAX_MEM_MAPPED (256 << 20)
-#endif
-
-#ifndef CONFIG_VERY_BIG_RAM
addr = CFG_SDRAM_BASE + get_effective_memsize();
addr = CFG_SDRAM_BASE + get_effective_memsize();
-#else
- /* only allow stack below 256M */
- addr = CFG_SDRAM_BASE +
- (gd->ram_size > CONFIG_MAX_MEM_MAPPED) ?
- CONFIG_MAX_MEM_MAPPED : get_effective_memsize();
-#endif
#ifdef CONFIG_LOGBUFFER
#ifndef CONFIG_ALT_LB_ADDR
#ifdef CONFIG_LOGBUFFER
#ifndef CONFIG_ALT_LB_ADDR
@@
-531,11
+511,11
@@
void board_init_f (ulong bootflag)
addr_sp -= sizeof (bd_t);
bd = (bd_t *) addr_sp;
gd->bd = bd;
addr_sp -= sizeof (bd_t);
bd = (bd_t *) addr_sp;
gd->bd = bd;
- debug ("Reserving %
d
Bytes for Board Info at: %08lx\n",
+ debug ("Reserving %
zu
Bytes for Board Info at: %08lx\n",
sizeof (bd_t), addr_sp);
addr_sp -= sizeof (gd_t);
id = (gd_t *) addr_sp;
sizeof (bd_t), addr_sp);
addr_sp -= sizeof (gd_t);
id = (gd_t *) addr_sp;
- debug ("Reserving %
d
Bytes for Global Data at: %08lx\n",
+ debug ("Reserving %
zu
Bytes for Global Data at: %08lx\n",
sizeof (gd_t), addr_sp);
/*
sizeof (gd_t), addr_sp);
/*
@@
-632,7
+612,7
@@
void board_init_f (ulong bootflag)
defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
bd->bi_pci_busfreq = get_PCI_freq ();
bd->bi_opbfreq = get_OPB_freq ();
defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
bd->bi_pci_busfreq = get_PCI_freq ();
bd->bi_opbfreq = get_OPB_freq ();
-#elif defined(CONFIG_XILINX_
ML300
)
+#elif defined(CONFIG_XILINX_
405
)
bd->bi_pci_busfreq = get_PCI_freq ();
#endif
#endif
bd->bi_pci_busfreq = get_PCI_freq ();
#endif
#endif
@@
-671,7
+651,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
bd_t *bd;
int i;
extern void malloc_bin_reloc (void);
bd_t *bd;
int i;
extern void malloc_bin_reloc (void);
-#ifndef C
F
G_ENV_IS_NOWHERE
+#ifndef C
ONFI
G_ENV_IS_NOWHERE
extern char * env_name_spec;
#endif
extern char * env_name_spec;
#endif
@@
-733,7
+713,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
#endif
}
/* there are some other pointer constants we must deal with */
#endif
}
/* there are some other pointer constants we must deal with */
-#ifndef C
F
G_ENV_IS_NOWHERE
+#ifndef C
ONFI
G_ENV_IS_NOWHERE
env_name_spec += gd->reloc_off;
#endif
env_name_spec += gd->reloc_off;
#endif
@@
-793,7
+773,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
*/
s = getenv ("flashchecksum");
if (s && (*s == 'y')) {
*/
s = getenv ("flashchecksum");
if (s && (*s == 'y')) {
- printf (" CRC: %08
l
X",
+ printf (" CRC: %08X",
crc32 (0, (const unsigned char *) CFG_FLASH_BASE, flash_size)
);
}
crc32 (0, (const unsigned char *) CFG_FLASH_BASE, flash_size)
);
}
@@
-842,7
+822,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
malloc_bin_reloc ();
#ifdef CONFIG_SPI
malloc_bin_reloc ();
#ifdef CONFIG_SPI
-# if !defined(C
F
G_ENV_IS_IN_EEPROM)
+# if !defined(C
ONFI
G_ENV_IS_IN_EEPROM)
spi_init_f ();
# endif
spi_init_r ();
spi_init_f ();
# endif
spi_init_r ();
@@
-893,7
+873,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
sc3_read_eeprom();
#endif
sc3_read_eeprom();
#endif
-#if defined (C
F
G_ID_EEPROM) || defined (CFG_I2C_MAC_OFFSET)
+#if defined (C
ONFI
G_ID_EEPROM) || defined (CFG_I2C_MAC_OFFSET)
mac_read_from_eeprom();
#endif
mac_read_from_eeprom();
#endif