Merge branch 'master' of git://git.denx.de/u-boot into resolve

[oweals/u-boot.git] / board / freescale / p1_p2_rdb / p1_p2_rdb.c

diff --git a/board/freescale/p1_p2_rdb/p1_p2_rdb.c b/board/freescale/p1_p2_rdb/p1_p2_rdb.c
index 864b3ce8fb1ed425824a92b6c018c68ee88e777b..437eaf0fdd6e0852aa791855abdebf8c138137df 100644 (file)
--- a/board/freescale/p1_p2_rdb/p1_p2_rdb.c
+++ b/board/freescale/p1_p2_rdb/p1_p2_rdb.c
@@ -110,9 +110,7 @@ int checkboard (void)
 
        cpu = gd->cpu;
        printf ("Board: %sRDB Rev%c\n", cpu->name, board_rev);
-#ifdef CONFIG_PHYS_64BIT
-       puts ("(36-bit addrmap) \n");
-#endif
+
        setbits_be32(&pgpio->gpdir, GPIO_DIR);
 
 /*
@@ -264,7 +262,9 @@ void ft_board_setup(void *blob, bd_t *bd)
 
        fdt_fixup_memory(blob, (u64)base, (u64)size);
 
+#if defined(CONFIG_HAS_FSL_DR_USB)
        fdt_fixup_dr_usb(blob, bd);
+#endif
 
 #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH)
        /* Delete eLBC node as it is muxed with USB2 controller */