From 38741ee1137403fbba3459e147c8d7d6d23e4ffa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Mon, 26 Oct 2015 12:15:08 +0100 Subject: [PATCH] karo: fdt: prevent duplicate call of fdt_fixup_ethernet() 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 | 1 - board/karo/tx48/tx48.c | 1 - board/karo/tx51/tx51.c | 1 - board/karo/tx53/tx53.c | 1 - board/karo/tx6/tx6qdl.c | 1 - board/karo/tx6/tx6ul.c | 1 - board/karo/txa5/txa5.c | 1 - 7 files changed, 7 deletions(-) diff --git a/board/karo/tx28/tx28.c b/board/karo/tx28/tx28.c index 9a60d2939d..f9cb02df21 100644 --- a/board/karo/tx28/tx28.c +++ b/board/karo/tx28/tx28.c @@ -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)); diff --git a/board/karo/tx48/tx48.c b/board/karo/tx48/tx48.c index 028cfa8a88..e89dda8cc2 100644 --- a/board/karo/tx48/tx48.c +++ b/board/karo/tx48/tx48.c @@ -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)); diff --git a/board/karo/tx51/tx51.c b/board/karo/tx51/tx51.c index dc8204d1c0..586663cb0e 100644 --- a/board/karo/tx51/tx51.c +++ b/board/karo/tx51/tx51.c @@ -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)); diff --git a/board/karo/tx53/tx53.c b/board/karo/tx53/tx53.c index 8d0c647785..082d2bdd76 100644 --- a/board/karo/tx53/tx53.c +++ b/board/karo/tx53/tx53.c @@ -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)); diff --git a/board/karo/tx6/tx6qdl.c b/board/karo/tx6/tx6qdl.c index 06f9fe3524..382c986e48 100644 --- a/board/karo/tx6/tx6qdl.c +++ b/board/karo/tx6/tx6qdl.c @@ -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)); diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c index a433c14343..54368f4a58 100644 --- a/board/karo/tx6/tx6ul.c +++ b/board/karo/tx6/tx6ul.c @@ -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)); diff --git a/board/karo/txa5/txa5.c b/board/karo/txa5/txa5.c index dd5ba89529..147f2e02fa 100644 --- a/board/karo/txa5/txa5.c +++ b/board/karo/txa5/txa5.c @@ -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)); -- 2.39.2