projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the confilcts when merging 'master' into hpc2.
[oweals/u-boot.git]
/
cpu
/
74xx_7xx
/
start.S
diff --git
a/cpu/74xx_7xx/start.S
b/cpu/74xx_7xx/start.S
index 1fc0fe6bc1f4c27b074259c86ea5e53cb7af3e0a..11430388f50213a35581a3a039d01e35a81c6a79 100644
(file)
--- a/
cpu/74xx_7xx/start.S
+++ b/
cpu/74xx_7xx/start.S
@@
-44,7
+44,8
@@
#if !defined(CONFIG_DB64360) && \
!defined(CONFIG_DB64460) && \
#if !defined(CONFIG_DB64360) && \
!defined(CONFIG_DB64460) && \
- !defined(CONFIG_CPCI750)
+ !defined(CONFIG_CPCI750) && \
+ !defined(CONFIG_P3Mx)
#include <galileo/gt64260R.h>
#endif
#include <galileo/gt64260R.h>
#endif
@@
-270,7
+271,7
@@
in_flash:
* gt-regs BAT can be reused after board_init_f calls
* board_early_init_f (EVB only).
*/
* gt-regs BAT can be reused after board_init_f calls
* board_early_init_f (EVB only).
*/
-#if !defined(CONFIG_BAB7xx) && !defined(CONFIG_ELPPC)
+#if !defined(CONFIG_BAB7xx) && !defined(CONFIG_ELPPC)
&& !defined(CONFIG_P3Mx)
/* enable address translation */
bl enable_addr_trans
sync
/* enable address translation */
bl enable_addr_trans
sync
@@
-757,7
+758,8
@@
in_ram:
defined(CONFIG_DB64360) || \
defined(CONFIG_DB64460) || \
defined(CONFIG_CPCI750) || \
defined(CONFIG_DB64360) || \
defined(CONFIG_DB64460) || \
defined(CONFIG_CPCI750) || \
- defined(CONFIG_PPMC7XX)
+ defined(CONFIG_PPMC7XX) || \
+ defined(CONFIG_P3Mx)
mr r4, r9 /* Use RAM copy of the global data */
#endif
bl after_reloc
mr r4, r9 /* Use RAM copy of the global data */
#endif
bl after_reloc