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 git://www.denx.de/git/u-boot-ppc4xx
[platform/kernel/u-boot.git]
/
lib_ppc
/
board.c
diff --git
a/lib_ppc/board.c
b/lib_ppc/board.c
index
b2bc4eb
..
c42e088
100644
(file)
--- a/
lib_ppc/board.c
+++ b/
lib_ppc/board.c
@@
-93,9
+93,7
@@
void doc_init (void);
#if defined(CONFIG_HARD_SPI)
#include <spi.h>
#endif
#if defined(CONFIG_HARD_SPI)
#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";
@@
-124,7
+122,6
@@
DECLARE_GLOBAL_DATA_PTR;
#define CFG_MEM_TOP_HIDE 0
#endif
#define CFG_MEM_TOP_HIDE 0
#endif
-extern ulong _start;
extern ulong __init_end;
extern ulong _end;
ulong monitor_flash_len;
extern ulong __init_end;
extern ulong _end;
ulong monitor_flash_len;
@@
-399,6
+396,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;
@@
-417,7
+421,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
@@
-454,18
+459,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