summaryrefslogtreecommitdiff
path: root/libre-testing/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre-testing/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch')
-rw-r--r--libre-testing/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/libre-testing/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre-testing/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
new file mode 100644
index 000000000..0034af55f
--- /dev/null
+++ b/libre-testing/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -0,0 +1,47 @@
+From 278772450de941a06782c07a43e7511b6bdbf430 Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@xxxxxx>
+Date: Sun, 2 Dec 2012 19:56:58 +0100
+Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
+ loader
+
+The atags are parsed and if a Marvell atag is found, up to 4 MAC
+addresses are extracted there and assigned to node aliases eth0..3
+with the name "mac-address".
+
+This was tested on my Mirabox and the two NICs had their correct
+address set.
+
+Signed-off-by: Willy Tarreau <w@xxxxxx>
+---
+ arch/arm/boot/compressed/atags_to_fdt.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
+index 9448aa0c6686..ac7b6ae6c00f 100644
+--- a/arch/arm/boot/compressed/atags_to_fdt.c
++++ b/arch/arm/boot/compressed/atags_to_fdt.c
+@@ -18,7 +18,7 @@ static int node_offset(void *fdt, const char *node_path)
+ }
+
+ static int setprop(void *fdt, const char *node_path, const char *property,
+- uint32_t *val_array, int size)
++ void *val_array, int size)
+ {
+ int offset = node_offset(fdt, node_path);
+ if (offset < 0)
+@@ -179,6 +179,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space)
+ initrd_start);
+ setprop_cell(fdt, "/chosen", "linux,initrd-end",
+ initrd_start + initrd_size);
++ } else if (atag->hdr.tag == ATAG_MV_UBOOT) {
++ /* This ATAG provides up to 4 MAC addresses */
++ setprop(fdt, "eth0", "mac-address", atag->u.mv_uboot.macAddr[0], 6);
++ setprop(fdt, "eth1", "mac-address", atag->u.mv_uboot.macAddr[1], 6);
++ setprop(fdt, "eth2", "mac-address", atag->u.mv_uboot.macAddr[2], 6);
++ setprop(fdt, "eth3", "mac-address", atag->u.mv_uboot.macAddr[3], 6);
+ }
+ }
+
+--
+2.14.2
+