From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 26 Oct 2015 13:44:47 +0000 (+0100)
Subject: Merge branch 'tx28-devel' into karo-devel
X-Git-Tag: KARO-TX6UL-2015-11-30~14
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=6cb88168319aea95bb1e54692cd13edafa7665f1;hp=7d9d1700bd70188fa7a7aa27e271fce25eceda2d

Merge branch 'tx28-devel' into karo-devel
---

diff --git a/board/karo/tx28/Kconfig b/board/karo/tx28/Kconfig
index f9ba82a937..c09dea740e 100644
--- a/board/karo/tx28/Kconfig
+++ b/board/karo/tx28/Kconfig
@@ -33,6 +33,7 @@ config TX28
 	select NAND_MXS
 	select OF_BOARD_SETUP
 	select OF_LIBFDT
+	select PHYLIB
 	select SYS_NAND_USE_FLASH_BBT
 
 config TARGET_TX28_40X2
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));
diff --git a/include/configs/tx51.h b/include/configs/tx51.h
index ce827149b9..624343f8d2 100644
--- a/include/configs/tx51.h
+++ b/include/configs/tx51.h
@@ -119,7 +119,7 @@
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"
 #else
-#define CONFIG_SYS_CPU_CLK_STR		xstr(CONFIG_SYS_MPU_CLK)
+#define CONFIG_SYS_CPU_CLK_STR		xstr(CONFIG_SYS_CPU_CLK)
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"autostart=no\0"						\