diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-01-07 20:39:00 +0100 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-01-08 14:31:46 +0100 |
commit | 2940d5d17d28dae2a5a02795bd4e714435dc0bb2 (patch) | |
tree | 3a96c71d3f32a43b4fc388a16200d314ab144968 /kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch | |
parent | 8a243c92fc8ab94a155c5695288fc58ca9414b95 (diff) | |
download | abslibre-2940d5d17d28dae2a5a02795bd4e714435dc0bb2.tar.gz abslibre-2940d5d17d28dae2a5a02795bd4e714435dc0bb2.tar.bz2 abslibre-2940d5d17d28dae2a5a02795bd4e714435dc0bb2.zip |
kernels: linux-libre-x86_64: update to 5.4.8 by syncing with linux-libre
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch')
-rw-r--r-- | kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch new file mode 100644 index 000000000..546120041 --- /dev/null +++ b/kernels/linux-libre-x86_64/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -0,0 +1,47 @@ +From cb931641740269a78b002b438904292a1110a5a7 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 330cd3c2eae5..82f3802ff695 100644 +--- a/arch/arm/boot/compressed/atags_to_fdt.c ++++ b/arch/arm/boot/compressed/atags_to_fdt.c +@@ -19,7 +19,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) +@@ -203,6 +203,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) + hex_str(serno, atag->u.serialnr.high); + hex_str(serno+8, atag->u.serialnr.low); + setprop_string(fdt, "/", "serial-number", serno); ++ } 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.23.0 + |