projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: fm: add TFABOOT support
[oweals/u-boot.git]
/
common
/
board_r.c
diff --git
a/common/board_r.c
b/common/board_r.c
index c55e33eec275fdc80911332716619ae8c4948019..21d3b3c64c648806e13ff7c4937fbfb7714f48b2 100644
(file)
--- a/
common/board_r.c
+++ b/
common/board_r.c
@@
-453,7
+453,8
@@
static int initr_env(void)
else
set_default_env(NULL, 0);
#ifdef CONFIG_OF_CONTROL
else
set_default_env(NULL, 0);
#ifdef CONFIG_OF_CONTROL
- env_set_addr("fdtcontroladdr", gd->fdt_blob);
+ env_set_hex("fdtcontroladdr",
+ (unsigned long)map_to_sysmem(gd->fdt_blob));
#endif
/* Initialize from environment */
#endif
/* Initialize from environment */
@@
-743,7
+744,7
@@
static init_fnc_t init_sequence_r[] = {
/* initialize higher level parts of CPU like time base and timers */
cpu_init_r,
#endif
/* initialize higher level parts of CPU like time base and timers */
cpu_init_r,
#endif
-#if
def CONFIG_PPC
+#if
defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI)
initr_spi,
#endif
#ifdef CONFIG_CMD_NAND
initr_spi,
#endif
#ifdef CONFIG_CMD_NAND