[ELDK] [PATCH 10/10] META-ELDK: linux-eldk: Backport bugfix for reading FEC MAC from DT

Marek Vasut marex at denx.de
Tue Apr 1 22:41:48 CEST 2014


Backport a patch from mainline Linux which allows the U-Boot bootloader
(or any other bootloader) pass the MAC address for the FEC ethernet via
DT aliases. This fixes a problem where the FEC had a random MAC address
in Linux instead of proper one passed from U-Boot.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Wolfgang Denk <wd at denx.de>
---
 ...dts-imx-Add-alias-for-ethernet-controller.patch | 69 ++++++++++++++++++++++
 meta-eldk/recipes-kernel/linux/linux-eldk_3.10.bb  |  1 +
 2 files changed, 70 insertions(+)
 create mode 100644 meta-eldk/recipes-kernel/linux/linux-eldk/eldk/0025-ARM-dts-imx-Add-alias-for-ethernet-controller.patch

diff --git a/meta-eldk/recipes-kernel/linux/linux-eldk/eldk/0025-ARM-dts-imx-Add-alias-for-ethernet-controller.patch b/meta-eldk/recipes-kernel/linux/linux-eldk/eldk/0025-ARM-dts-imx-Add-alias-for-ethernet-controller.patch
new file mode 100644
index 0000000..7373251
--- /dev/null
+++ b/meta-eldk/recipes-kernel/linux/linux-eldk/eldk/0025-ARM-dts-imx-Add-alias-for-ethernet-controller.patch
@@ -0,0 +1,69 @@
+From 143bd3ab6c74985e2e0e768dfd77809874b38a6e Mon Sep 17 00:00:00 2001
+From: Marek Vasut <marex at denx.de>
+Date: Fri, 28 Feb 2014 12:09:50 +0100
+Subject: [PATCH] ARM: dts: imx: Add alias for ethernet controller
+
+Add alias for FEC ethernet on i.MX25, i.MX27, i.MX51 and i.MX53 to allow
+bootloaders (like U-Boot) patch-in the MAC address for FEC using this
+alias.
+
+Signed-off-by: Marek Vasut <marex at denx.de>
+Cc: Shawn Guo <shawn.guo at linaro.org>
+---
+ arch/arm/boot/dts/imx25.dtsi | 1 +
+ arch/arm/boot/dts/imx27.dtsi | 1 +
+ arch/arm/boot/dts/imx51.dtsi | 1 +
+ arch/arm/boot/dts/imx53.dtsi | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
+index 7011539..f46b599 100644
+--- a/arch/arm/boot/dts/imx25.dtsi
++++ b/arch/arm/boot/dts/imx25.dtsi
+@@ -24,6 +24,7 @@
+ 		gpio3 = &gpio4;
+ 		usb0 = &usbotg;
+ 		usb1 = &usbhost1;
++		ethernet0 = &fec;
+ 	};
+ 
+ 	asic: asic-interrupt-controller at 68000000 {
+diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
+index 75bd113..b05b824 100644
+--- a/arch/arm/boot/dts/imx27.dtsi
++++ b/arch/arm/boot/dts/imx27.dtsi
+@@ -25,6 +25,7 @@
+ 		gpio3 = &gpio4;
+ 		gpio4 = &gpio5;
+ 		gpio5 = &gpio6;
++		ethernet0 = &fec;
+ 	};
+ 
+ 	avic: avic-interrupt-controller at e0000000 {
+diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
+index 53fdde6..5ef1b31 100644
+--- a/arch/arm/boot/dts/imx51.dtsi
++++ b/arch/arm/boot/dts/imx51.dtsi
+@@ -22,6 +22,7 @@
+ 		gpio1 = &gpio2;
+ 		gpio2 = &gpio3;
+ 		gpio3 = &gpio4;
++		ethernet0 = &fec;
+ 	};
+ 
+ 	tzic: tz-interrupt-controller at e0000000 {
+diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
+index eb83aa0..441cc51 100644
+--- a/arch/arm/boot/dts/imx53.dtsi
++++ b/arch/arm/boot/dts/imx53.dtsi
+@@ -27,6 +27,7 @@
+ 		gpio4 = &gpio5;
+ 		gpio5 = &gpio6;
+ 		gpio6 = &gpio7;
++		ethernet0 = &fec;
+ 	};
+ 
+ 	tzic: tz-interrupt-controller at 0fffc000 {
+-- 
+1.8.5.2
+
diff --git a/meta-eldk/recipes-kernel/linux/linux-eldk_3.10.bb b/meta-eldk/recipes-kernel/linux/linux-eldk_3.10.bb
index d9db5a3..b69b025 100644
--- a/meta-eldk/recipes-kernel/linux/linux-eldk_3.10.bb
+++ b/meta-eldk/recipes-kernel/linux/linux-eldk_3.10.bb
@@ -44,6 +44,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
 	   file://0022-imx-drm-ipuv3-crtc-Make-DISP_CLK-polarity-configurab.patch \
 	   file://0023-ARM-dts-imx53-Switch-DISP_CLK-polarity-on-M53EVK.patch \
 	   file://0024-ARM-dts-mxs-Fix-the-RTC-compatible-prop-on-M28EVK.patch \
+	   file://0025-ARM-dts-imx-Add-alias-for-ethernet-controller.patch \
 	   file://defconfig"
 
 LINUX_VERSION ?= "3.10.28"
-- 
1.9.0



More information about the eldk mailing list