git.openpandora.org
/
pandora-u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppc: Unlock cache-as-ram in a consistent manner
[pandora-u-boot.git]
/
lib_ppc
/
board.c
diff --git
a/lib_ppc/board.c
b/lib_ppc/board.c
index
e0d9ba4
..
8def520
100644
(file)
--- a/
lib_ppc/board.c
+++ b/
lib_ppc/board.c
@@
-25,7
+25,7
@@
#include <watchdog.h>
#include <command.h>
#include <malloc.h>
#include <watchdog.h>
#include <command.h>
#include <malloc.h>
-#include <
devices
.h>
+#include <
stdio_dev
.h>
#ifdef CONFIG_8xx
#include <mpc8xx.h>
#endif
#ifdef CONFIG_8xx
#include <mpc8xx.h>
#endif
@@
-68,7
+68,7
@@
#if defined(CONFIG_LOGBUFFER)
#include <logbuff.h>
#endif
#if defined(CONFIG_LOGBUFFER)
#include <logbuff.h>
#endif
-#if defined(CONFIG_SYS_INIT_RAM_LOCK)
&& defined(CONFIG_E500)
+#if defined(CONFIG_SYS_INIT_RAM_LOCK)
#include <asm/cache.h>
#endif
#ifdef CONFIG_PS2KBD
#include <asm/cache.h>
#endif
#ifdef CONFIG_PS2KBD
@@
-321,7
+321,7
@@
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_MPC83
XX
)
+#if defined(CONFIG_MPC83
xx
)
prt_83xx_rsr,
#endif
checkcpu,
prt_83xx_rsr,
#endif
checkcpu,
@@
-408,7
+408,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) && !defined(CONFIG_MPC83
XX
) && \
+#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC83
xx
) && \
!defined(CONFIG_MPC85xx) && !defined(CONFIG_MPC86xx)
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
!defined(CONFIG_MPC85xx) && !defined(CONFIG_MPC86xx)
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
@@
-570,7
+570,7
@@
void board_init_f (ulong bootflag)
#if defined(CONFIG_MPC5xxx)
bd->bi_mbar_base = CONFIG_SYS_MBAR; /* base of internal registers */
#endif
#if defined(CONFIG_MPC5xxx)
bd->bi_mbar_base = CONFIG_SYS_MBAR; /* base of internal registers */
#endif
-#if defined(CONFIG_MPC83
XX
)
+#if defined(CONFIG_MPC83
xx
)
bd->bi_immrbar = CONFIG_SYS_IMMR;
#endif
#if defined(CONFIG_MPC8220)
bd->bi_immrbar = CONFIG_SYS_IMMR;
#endif
#if defined(CONFIG_MPC8220)
@@
-750,12
+750,12
@@
void board_init_r (gd_t *id, ulong dest_addr)
WATCHDOG_RESET();
WATCHDOG_RESET();
-#if defined(CONFIG_SYS_DELAYED_ICACHE) || defined(CONFIG_MPC83
XX
)
+#if defined(CONFIG_SYS_DELAYED_ICACHE) || defined(CONFIG_MPC83
xx
)
icache_enable (); /* it's time to enable the instruction cache */
#endif
icache_enable (); /* it's time to enable the instruction cache */
#endif
-#if defined(CONFIG_SYS_INIT_RAM_LOCK)
&& defined(CONFIG_E500)
- unlock_ram_in_cache(); /* it's time to unlock D-cache
in e500
*/
+#if defined(CONFIG_SYS_INIT_RAM_LOCK)
+ unlock_ram_in_cache(); /* it's time to unlock D-cache */
#endif
#if defined(CONFIG_BAB7xx) || defined(CONFIG_CPC45)
#endif
#if defined(CONFIG_BAB7xx) || defined(CONFIG_CPC45)
@@
-932,8
+932,8
@@
void board_init_r (gd_t *id, ulong dest_addr)
#endif
/** leave this here (after malloc(), environment and PCI are working) **/
#endif
/** leave this here (after malloc(), environment and PCI are working) **/
- /* Initialize devices */
-
devices
_init ();
+ /* Initialize
stdio
devices */
+
stdio
_init ();
/* Initialize the jump table for applications */
jumptable_init ();
/* Initialize the jump table for applications */
jumptable_init ();