Merge git://git.denx.de/u-boot-mpc85xx

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

diff --git a/board/freescale/b4860qds/eth_b4860qds.c b/board/freescale/b4860qds/eth_b4860qds.c
index 501d4b3aff5d62a412b4180443e995e2b1f6021e..89a188378277302fc9736803ec05334601c54013 100644 (file)
--- a/board/freescale/b4860qds/eth_b4860qds.c
+++ b/board/freescale/b4860qds/eth_b4860qds.c
@@ -26,7 +26,7 @@
 #include <fsl_mdio.h>
 #include <malloc.h>
 #include <fdt_support.h>
-#include <asm/fsl_dtsec.h>
+#include <fsl_dtsec.h>
 
 #include "../common/ngpixis.h"
 #include "../common/fman.h"
@@ -213,7 +213,7 @@ int board_eth_init(bd_t *bis)
                fm_info_set_phy_address(FM1_DTSEC6,
                                CONFIG_SYS_FM1_ONBOARD_PHY2_ADDR);
                break;
-#ifdef CONFIG_PPC_B4420
+#ifdef CONFIG_ARCH_B4420
        case 0x17:
        case 0x18:
                /* Serdes 1: A-D SGMII, Configuring on board dual SGMII Phy */
@@ -269,7 +269,7 @@ int board_eth_init(bd_t *bis)
                fm_info_set_phy_address(FM1_DTSEC4,
                                CONFIG_SYS_FM1_DTSEC2_RISER_PHY_ADDR);
                /*
-                * XFI does not need a PHY to work, but to make U-boot
+                * XFI does not need a PHY to work, but to make U-Boot
                 * happy, assign a fake PHY address for a XFI port.
                 */
                fm_info_set_phy_address(FM1_10GEC1, 0);
@@ -408,22 +408,22 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
                                    sizeof(f_link));
                        break;
                case 0x98: /* XAUI interface */
-                       sprintf(alias, "phy_xaui_slot1");
+                       strcpy(alias, "phy_xaui_slot1");
                        fdt_status_okay_by_alias(fdt, alias);
 
-                       sprintf(alias, "phy_xaui_slot2");
+                       strcpy(alias, "phy_xaui_slot2");
                        fdt_status_okay_by_alias(fdt, alias);
                        break;
                case 0x9e: /* XAUI interface */
                case 0x9a:
                case 0x93:
                case 0x91:
-                       sprintf(alias, "phy_xaui_slot1");
+                       strcpy(alias, "phy_xaui_slot1");
                        fdt_status_okay_by_alias(fdt, alias);
                        break;
                case 0x97: /* XAUI interface */
                case 0xc3:
-                       sprintf(alias, "phy_xaui_slot2");
+                       strcpy(alias, "phy_xaui_slot2");
                        fdt_status_okay_by_alias(fdt, alias);
                        break;
                default: