projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked FSL Book-E TLB macros to be more readable
[oweals/u-boot.git]
/
lib_ppc
/
board.c
diff --git
a/lib_ppc/board.c
b/lib_ppc/board.c
index 12ea47351b1bd2d16f136866a80c5ab366bbde8f..9aa67f93c0f66a6e5764cc1ee31a856da701f924 100644
(file)
--- a/
lib_ppc/board.c
+++ b/
lib_ppc/board.c
@@
-139,10
+139,10
@@
static ulong mem_malloc_brk = 0;
*/
static void mem_malloc_init (void)
{
*/
static void mem_malloc_init (void)
{
- ulong dest_addr = CFG_MONITOR_BASE + gd->reloc_off;
-
- mem_malloc_end = dest_addr;
- mem_malloc_start =
dest_addr
- TOTAL_MALLOC_LEN;
+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
+ mem_malloc_end = CFG_MONITOR_BASE + gd->reloc_off;
+#endif
+ mem_malloc_start =
mem_malloc_end
- TOTAL_MALLOC_LEN;
mem_malloc_brk = mem_malloc_start;
memset ((void *) mem_malloc_start,
mem_malloc_brk = mem_malloc_start;
memset ((void *) mem_malloc_start,
@@
-209,9
+209,12
@@
static int init_baudrate (void)
/***********************************************************************/
/***********************************************************************/
-#ifdef CONFIG_ADD_RAM_INFO
-void board_add_ram_info(int);
-#endif
+void __board_add_ram_info(int use_default)
+{
+ /* 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) {
print_size (gd->ram_size, "");
if ((gd->ram_size = initdram (board_type)) > 0) {
print_size (gd->ram_size, "");
-#ifdef CONFIG_ADD_RAM_INFO
board_add_ram_info(0);
board_add_ram_info(0);
-#endif
putc('\n');
return (0);
}
putc('\n');
return (0);
}
@@
-309,7
+310,9
@@
init_fnc_t *init_sequence[] = {
prt_8260_rsr,
prt_8260_clks,
#endif /* CONFIG_8260 */
prt_8260_rsr,
prt_8260_clks,
#endif /* CONFIG_8260 */
-
+#if defined(CONFIG_MPC83XX)
+ prt_83xx_rsr,
+#endif
checkcpu,
#if defined(CONFIG_MPC5xxx)
prt_mpc5xxx_clks,
checkcpu,
#if defined(CONFIG_MPC5xxx)
prt_mpc5xxx_clks,
@@
-376,7
+379,7
@@
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)
+#if !defined(CONFIG_CPM2)
&& !defined(CONFIG_MPC83XX)
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
#endif
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
#endif
@@
-623,6
+626,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
#if defined(CONFIG_RELOC_FIXUP_WORKS)
gd->reloc_off = 0;
#if defined(CONFIG_RELOC_FIXUP_WORKS)
gd->reloc_off = 0;
+ mem_malloc_end = dest_addr;
#else
gd->reloc_off = dest_addr - CFG_MONITOR_BASE;
#endif
#else
gd->reloc_off = dest_addr - CFG_MONITOR_BASE;
#endif
@@
-901,7
+905,8
@@
void board_init_r (gd_t *id, ulong dest_addr)
#if defined(CONFIG_TQM8xxL) || defined(CONFIG_TQM8260) || \
defined(CONFIG_TQM8272) || \
#if defined(CONFIG_TQM8xxL) || defined(CONFIG_TQM8260) || \
defined(CONFIG_TQM8272) || \
- defined(CONFIG_CCM) || defined(CONFIG_KUP4K) || defined(CONFIG_KUP4X)
+ defined(CONFIG_CCM) || defined(CONFIG_KUP4K) || \
+ defined(CONFIG_KUP4X) || defined(CONFIG_PCS440EP)
load_sernum_ethaddr ();
#endif
/* IP Address */
load_sernum_ethaddr ();
#endif
/* IP Address */
@@
-966,7
+971,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
serial_buffered_init();
#endif
serial_buffered_init();
#endif
-#if
def CONFIG_STATUS_LED
+#if
defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT)
status_led_set (STATUS_LED_BOOT, STATUS_LED_BLINKING);
#endif
status_led_set (STATUS_LED_BOOT, STATUS_LED_BLINKING);
#endif
@@
-982,7
+987,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
}
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
}
-#endif
/* CFG_CMD_NET */
+#endif
WATCHDOG_RESET ();
WATCHDOG_RESET ();
@@
-1051,7
+1056,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
#else
ide_init ();
#endif
#else
ide_init ();
#endif
-#endif
/* CFG_CMD_IDE */
+#endif
#ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET ();
#ifdef CONFIG_LAST_STAGE_INIT
WATCHDOG_RESET ();
@@
-1122,9
+1127,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
void hang (void)
{
puts ("### ERROR ### Please RESET the board ###\n");
void hang (void)
{
puts ("### ERROR ### Please RESET the board ###\n");
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
show_boot_progress(-30);
show_boot_progress(-30);
-#endif
for (;;);
}
for (;;);
}