Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

1 files changed, 0 insertions, 51 deletions

diff --git a/kernels-testing/linux-libre-xen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels-testing/linux-libre-xen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
deleted file mode 100644
index 7ab3b23d7..000000000
--- a/kernels-testing/linux-libre-xen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 001565916ddb8589ec7920b0d3c0d007225c79c4 Mon Sep 17 00:00:00 2001
-From: Willy Tarreau <w@xxxxxx>
-Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 1/8] 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.
-
-Signed-off-by: Willy Tarreau <w@xxxxxx>
----
- arch/arm/include/uapi/asm/setup.h | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
-index 979ff40..d1d0c19 100644
---- a/arch/arm/include/uapi/asm/setup.h
-+++ b/arch/arm/include/uapi/asm/setup.h
-@@ -143,6 +143,18 @@ struct tag_memclk {
- 	__u32 fmemclk;
- };
- 
-+/* Marvell uboot parameters */
-+#define ATAG_MV_UBOOT          0x41000403
-+struct tag_mv_uboot {
-+	__u32 uboot_version;
-+	__u32 tclk;
-+	__u32 sysclk;
-+	__u32 isUsbHost;
-+	__u8  macAddr[4][6];
-+	__u16 mtu[4];
-+	__u32 nand_ecc;
-+};
-+
- struct tag {
- 	struct tag_header hdr;
- 	union {
-@@ -165,6 +177,11 @@ struct tag {
- 		 * DC21285 specific
- 		 */
- 		struct tag_memclk	memclk;
-+
-+		/*
-+		 * Marvell specific
-+		 */
-+		struct tag_mv_uboot	mv_uboot;
- 	} u;
- };
- 
--- 
-2.10.0
-