X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fboard_r.c;h=21d3b3c64c648806e13ff7c4937fbfb7714f48b2;hb=382c53f94631027782ead8147847906b1dcc5d11;hp=c55e33eec275fdc80911332716619ae8c4948019;hpb=6c6add602970ee6b542b38ad6daf4f8e1e9f39d4;p=oweals%2Fu-boot.git

diff --git a/common/board_r.c b/common/board_r.c
index c55e33eec2..21d3b3c64c 100644
--- 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
-	env_set_addr("fdtcontroladdr", gd->fdt_blob);
+	env_set_hex("fdtcontroladdr",
+		    (unsigned long)map_to_sysmem(gd->fdt_blob));
 #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
-#ifdef CONFIG_PPC
+#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI)
 	initr_spi,
 #endif
 #ifdef CONFIG_CMD_NAND