karo: fdt: prevent duplicate call of fdt_fixup_ethernet()
authorLothar Waßmann <LW@KARO-electronics.de>
Mon, 26 Oct 2015 11:15:08 +0000 (12:15 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Mon, 26 Oct 2015 11:15:08 +0000 (12:15 +0100)
fdt_fixup_ethernet() is already called internally
by boot_prep_linux(). Remove the calls to it in ft_board_setup().

board/karo/tx28/tx28.c
board/karo/tx48/tx48.c
board/karo/tx51/tx51.c
board/karo/tx53/tx53.c
board/karo/tx6/tx6qdl.c
board/karo/tx6/tx6ul.c
board/karo/txa5/txa5.c

index 9a60d29..f9cb02d 100644 (file)
@@ -1013,7 +1013,6 @@ int ft_board_setup(void *blob, bd_t *bd)
                karo_fdt_enable_node(blob, "stk5led", 0);
 
        fdt_fixup_mtdparts(blob, tx28_nand_nodes, ARRAY_SIZE(tx28_nand_nodes));
-       fdt_fixup_ethernet(blob);
 
        karo_fdt_fixup_touchpanel(blob, tx28_touchpanels,
                                ARRAY_SIZE(tx28_touchpanels));
index 028cfa8..e89dda8 100644 (file)
@@ -912,7 +912,6 @@ int ft_board_setup(void *blob, bd_t *bd)
                return ret;
        }
        fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
-       fdt_fixup_ethernet(blob);
 
        karo_fdt_fixup_touchpanel(blob, tx48_touchpanels,
                                ARRAY_SIZE(tx48_touchpanels));
index dc8204d..586663c 100644 (file)
@@ -1129,7 +1129,6 @@ int ft_board_setup(void *blob, bd_t *bd)
                return ret;
        }
        fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
-       fdt_fixup_ethernet(blob);
 
        karo_fdt_fixup_touchpanel(blob, tx51_touchpanels,
                                ARRAY_SIZE(tx51_touchpanels));
index 8d0c647..082d2bd 100644 (file)
@@ -1447,7 +1447,6 @@ int ft_board_setup(void *blob, bd_t *bd)
                karo_fdt_enable_node(blob, "stk5led", 0);
 
        fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
-       fdt_fixup_ethernet(blob);
 
        karo_fdt_fixup_touchpanel(blob, tx53_touchpanels,
                                ARRAY_SIZE(tx53_touchpanels));
index 06f9fe3..382c986 100644 (file)
@@ -1487,7 +1487,6 @@ int ft_board_setup(void *blob, bd_t *bd)
                karo_fdt_enable_node(blob, "stk5led", 0);
 
        fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
-       fdt_fixup_ethernet(blob);
 
        karo_fdt_fixup_touchpanel(blob, tx6_touchpanels,
                                ARRAY_SIZE(tx6_touchpanels));
index a433c14..54368f4 100644 (file)
@@ -1402,7 +1402,6 @@ int ft_board_setup(void *blob, bd_t *bd)
                karo_fdt_enable_node(blob, "stk5led", 0);
 
        fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
-       fdt_fixup_ethernet(blob);
 
        karo_fdt_fixup_touchpanel(blob, tx6_touchpanels,
                                ARRAY_SIZE(tx6_touchpanels));
index dd5ba89..147f2e0 100644 (file)
@@ -871,7 +871,6 @@ int ft_board_setup(void *blob, bd_t *bd)
                karo_fdt_enable_node(blob, "stk5led", 0);
 
        fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
-       fdt_fixup_ethernet(blob);
 
        karo_fdt_fixup_touchpanel(blob, txa5_touchpanels,
                                ARRAY_SIZE(txa5_touchpanels));