summarylogtreecommitdiffstats
path: root/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
diff options
context:
space:
mode:
authorDaniel Bermond2018-09-21 19:45:53 +0000
committerDaniel Bermond2018-09-21 19:47:33 +0000
commitb6815c67e6d38f82684b0854703d58dc3d11da5b (patch)
tree79ae2c25d971f33005869805178f78816fc97b45 /0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
parent98e3c6cc41febd43b2cdfaa8ae37948bcda8fac8 (diff)
downloadaur-b6815c67e6d38f82684b0854703d58dc3d11da5b.tar.gz
Updated to version 4.18.9
Diffstat (limited to '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch')
-rw-r--r--0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index 9e1a037b6272..f67e039da6d9 100644
--- a/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,7 +1,7 @@
-From 9113c0187d68d3d6bb1f6069ba86a37a4e4f97de Mon Sep 17 00:00:00 2001
+From 6cd78f818001a5e2caac7cadc3ffff95d752a021 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 01/10] ARM: atags: add support for Marvell's u-boot
+Subject: [PATCH 01/14] ARM: atags: add support for Marvell's u-boot
Marvell uses a specific atag in its u-boot which includes among other
information the MAC addresses for up to 4 network interfaces.
@@ -12,10 +12,10 @@ Signed-off-by: Willy Tarreau <w@xxxxxx>
1 file changed, 17 insertions(+)
diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
-index 979ff4016404..d1d0c1950fa4 100644
+index 6b335a9ff8c8..614150b53643 100644
--- a/arch/arm/include/uapi/asm/setup.h
+++ b/arch/arm/include/uapi/asm/setup.h
-@@ -143,6 +143,18 @@ struct tag_memclk {
+@@ -144,6 +144,18 @@ struct tag_memclk {
__u32 fmemclk;
};
@@ -34,7 +34,7 @@ index 979ff4016404..d1d0c1950fa4 100644
struct tag {
struct tag_header hdr;
union {
-@@ -165,6 +177,11 @@ struct tag {
+@@ -166,6 +178,11 @@ struct tag {
* DC21285 specific
*/
struct tag_memclk memclk;
@@ -47,5 +47,5 @@ index 979ff4016404..d1d0c1950fa4 100644
};
--
-2.12.2
+2.18.0