summaryrefslogtreecommitdiff
path: root/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-02-06 21:03:29 -0300
committerDavid P <megver83@parabola.nu>2020-02-06 21:03:29 -0300
commit29d32123c6ac5c01ba2337aa003633e620d77b23 (patch)
treee98245a0178274795af2f1999c4bda001b56374a /libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
parent6c745de26d8c7ba2fb4451a6c6da77000e7f30a1 (diff)
downloadabslibre-29d32123c6ac5c01ba2337aa003633e620d77b23.tar.gz
abslibre-29d32123c6ac5c01ba2337aa003633e620d77b23.tar.bz2
abslibre-29d32123c6ac5c01ba2337aa003633e620d77b23.zip
updpkg: libre/linux-libre 5.5.1-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch')
-rw-r--r--libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch23
1 files changed, 7 insertions, 16 deletions
diff --git a/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index 546120041..7e8f17fb2 100644
--- a/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/libre/linux-libre/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,8 +1,8 @@
-From cb931641740269a78b002b438904292a1110a5a7 Mon Sep 17 00:00:00 2001
+From ba8c3d62a09ad9582879577a1a71f36213cdc179 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
+Subject: [PATCH 02/10] 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
@@ -13,22 +13,13 @@ 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(-)
+ arch/arm/boot/compressed/atags_to_fdt.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
-index 330cd3c2eae5..82f3802ff695 100644
+index 64c49747f8a3..60cd5e5bac93 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);
@@ -43,5 +34,5 @@ index 330cd3c2eae5..82f3802ff695 100644
}
--
-2.23.0
+2.25.0