summaryrefslogtreecommitdiff
path: root/libre/linux-libre-64/0009-USB-Armory-MkII-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/linux-libre-64/0009-USB-Armory-MkII-support.patch')
-rw-r--r--libre/linux-libre-64/0009-USB-Armory-MkII-support.patch25
1 files changed, 14 insertions, 11 deletions
diff --git a/libre/linux-libre-64/0009-USB-Armory-MkII-support.patch b/libre/linux-libre-64/0009-USB-Armory-MkII-support.patch
index cce232ad0..8913bfac1 100644
--- a/libre/linux-libre-64/0009-USB-Armory-MkII-support.patch
+++ b/libre/linux-libre-64/0009-USB-Armory-MkII-support.patch
@@ -1,21 +1,21 @@
-From b492240828db14302661adcdd3fd12396069ee4e Mon Sep 17 00:00:00 2001
+From d174311bd7469ddf9c292ab41f2bca0a21b12ab2 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 11 Aug 2019 12:34:17 -0600
Subject: [PATCH 9/9] USB Armory MkII support
---
arch/arm/boot/dts/Makefile | 2 +
- arch/arm/boot/dts/imx6ul-usbarmory.dts | 255 +++++++++++++++++++++++
- arch/arm/boot/dts/imx6ull-usbarmory.dts | 256 ++++++++++++++++++++++++
- 3 files changed, 513 insertions(+)
+ arch/arm/boot/dts/imx6ul-usbarmory.dts | 256 +++++++++++++++++++++++
+ arch/arm/boot/dts/imx6ull-usbarmory.dts | 257 ++++++++++++++++++++++++
+ 3 files changed, 515 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6ul-usbarmory.dts
create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 6107ad410109..fd8e1835deb7 100644
+index 8f4062d549e2..9af811420ae6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -609,10 +609,12 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
+@@ -626,11 +626,13 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-tx6ul-0010.dtb \
imx6ul-tx6ul-0011.dtb \
imx6ul-tx6ul-mainboard.dtb \
@@ -23,6 +23,7 @@ index 6107ad410109..fd8e1835deb7 100644
imx6ull-14x14-evk.dtb \
imx6ull-colibri-eval-v3.dtb \
imx6ull-colibri-wifi-eval-v3.dtb \
+ imx6ull-myir-mys-6ulx-eval.dtb \
imx6ull-opos6uldev.dtb \
+ imx6ull-usbarmory.dtb \
imx6ull-phytec-segin-ff-rdk-nand.dtb \
@@ -30,10 +31,10 @@ index 6107ad410109..fd8e1835deb7 100644
imx6ull-phytec-segin-lc-rdk-nand.dtb \
diff --git a/arch/arm/boot/dts/imx6ul-usbarmory.dts b/arch/arm/boot/dts/imx6ul-usbarmory.dts
new file mode 100644
-index 000000000000..f26344965ae1
+index 000000000000..1fdcd6f611d5
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-usbarmory.dts
-@@ -0,0 +1,255 @@
+@@ -0,0 +1,256 @@
+/*
+ * USB armory Mk II device tree file
+ * https://github.com/inversepath/usbarmory
@@ -93,6 +94,7 @@ index 000000000000..f26344965ae1
+ };
+
+ memory {
++ device_type = "memory";
+ reg = <0x80000000 0x20000000>;
+ };
+
@@ -291,10 +293,10 @@ index 000000000000..f26344965ae1
+};
diff --git a/arch/arm/boot/dts/imx6ull-usbarmory.dts b/arch/arm/boot/dts/imx6ull-usbarmory.dts
new file mode 100644
-index 000000000000..2d758a805264
+index 000000000000..f74d0296d5f6
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-usbarmory.dts
-@@ -0,0 +1,256 @@
+@@ -0,0 +1,257 @@
+/*
+ * USB armory Mk II device tree file
+ * https://github.com/inversepath/usbarmory
@@ -354,6 +356,7 @@ index 000000000000..2d758a805264
+ };
+
+ memory {
++ device_type = "memory";
+ reg = <0x80000000 0x20000000>;
+ };
+
@@ -552,5 +555,5 @@ index 000000000000..2d758a805264
+ status = "okay";
+};
--
-2.26.1
+2.30.0