diff options
| author | Daniel Bermond | 2018-09-21 19:45:53 +0000 |
|---|---|---|
| committer | Daniel Bermond | 2018-09-21 19:47:33 +0000 |
| commit | b6815c67e6d38f82684b0854703d58dc3d11da5b (patch) | |
| tree | 79ae2c25d971f33005869805178f78816fc97b45 /0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch | |
| parent | 98e3c6cc41febd43b2cdfaa8ae37948bcda8fac8 (diff) | |
| download | aur-b6815c67e6d38f82684b0854703d58dc3d11da5b.tar.gz | |
Updated to version 4.18.9
Diffstat (limited to '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch')
| -rw-r--r-- | 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index dcf365444569..e834eae8e824 100644 --- a/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,7 +1,7 @@ -From 6271ea4f21b8b175cfa3a64b18501bb7e8d140d6 Mon Sep 17 00:00:00 2001 +From a383c6aaa67e862797d380a5163e633637358568 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <w@xxxxxx> Date: Sun, 2 Dec 2012 19:56:58 +0100 -Subject: [PATCH 02/10] ARM: atags/fdt: retrieve MAC addresses from Marvell +Subject: [PATCH 02/14] 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 @@ -17,10 +17,10 @@ Signed-off-by: Willy Tarreau <w@xxxxxx> 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 +index 41fa7316c52b..807ed160a4b9 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) +@@ -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, @@ -29,7 +29,7 @@ index 9448aa0c6686..ac7b6ae6c00f 100644 { 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) +@@ -180,6 +180,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); @@ -43,5 +43,5 @@ index 9448aa0c6686..ac7b6ae6c00f 100644 } -- -2.12.2 +2.18.0 |