diff --git a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index 8b6b4bcca..6635700d0 100644 --- a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,4 +1,4 @@ -From a0d6a41c903bcb0b393800584e749be72600c691 Mon Sep 17 00:00:00 2001 +From cff98a5e22c06d5d6c20879248c136e7c6e7c719 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot @@ -47,5 +47,5 @@ index 25ceda63b284..83578c54975b 100644 }; -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index a61ced907..bf0620972 100644 --- a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,4 +1,4 @@ -From aa25cf15afca5ebefc78e16a68409643a16a6af3 Mon Sep 17 00:00:00 2001 +From 9e8c55d7b445c3a1d66fe95f6ecd2883cf28f571 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot @@ -34,5 +34,5 @@ index 64c49747f8a3..60cd5e5bac93 100644 } -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch index 5f828ea22..815249bd5 100644 --- a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch +++ b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch @@ -1,4 +1,4 @@ -From ad5cb059a2d3bedda113717012c52afd2d3b10a9 Mon Sep 17 00:00:00 2001 +From 875b0c2cd03da835b7b8cbab16a056ca0b50d11d Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:41:19 -0600 Subject: [PATCH 3/9] SMILE Plug device tree file @@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 08011dc8c7a6..9f10323ecfde 100644 +index e8dd99201397..6107ad410109 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1227,6 +1227,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ +@@ -1265,6 +1265,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ armada-370-db.dtb \ armada-370-dlink-dns327l.dtb \ armada-370-mirabox.dtb \ @@ -205,5 +205,5 @@ index 000000000000..d01308ab848b + }; +}; -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch index 316c3c8f3..f58675d35 100644 --- a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch +++ b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch @@ -1,4 +1,4 @@ -From 14c5a5d97fab02342816c128ebcd2e581a892a80 Mon Sep 17 00:00:00 2001 +From cf280071b198b744afaa9146a432ed59ac64b770 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 Subject: [PATCH 4/9] fix mvsdio eMMC timing @@ -12,7 +12,7 @@ Signed-off-by: Kevin Mihelich 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c -index 74a0a7fbbf7f..92eadb116762 100644 +index 203b61712601..c26211c76376 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -90,7 +90,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data) @@ -34,5 +34,5 @@ index 74a0a7fbbf7f..92eadb116762 100644 host->clock = ios->clock; host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index d3b947128..8f0910992 100644 --- a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,4 +1,4 @@ -From d8d3b7ef35dc992adb33ea8a077e0fff21a4a3e5 Mon Sep 17 00:00:00 2001 +From c285820634d24268a6ecc330fbcfe3fc325d481d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter @@ -91,5 +91,5 @@ index 355be77f4241..c94a7193e0b9 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch b/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch index f7469ea94..a95712902 100644 --- a/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch +++ b/core/linux-armv7-rc/0006-set-default-cubietruck-led-triggers.patch @@ -1,4 +1,4 @@ -From ac5c484e8981944a17176237105e61c48e61145c Mon Sep 17 00:00:00 2001 +From 9bb44b8e32834dbe51768a3f3ccf2c12181d0c26 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 14 Feb 2015 12:32:27 +0100 Subject: [PATCH 6/9] set default cubietruck led triggers @@ -12,7 +12,7 @@ diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7 index 8c8dee6ea461..4f52a11b913e 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -@@ -78,6 +78,7 @@ +@@ -78,6 +78,7 @@ leds { blue { label = "cubietruck:blue:usr"; gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; @@ -20,7 +20,7 @@ index 8c8dee6ea461..4f52a11b913e 100644 }; orange { -@@ -93,6 +94,7 @@ +@@ -93,6 +94,7 @@ white { green { label = "cubietruck:green:usr"; gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; @@ -29,5 +29,5 @@ index 8c8dee6ea461..4f52a11b913e 100644 }; -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch index 539be0823..2737e21d7 100644 --- a/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ b/core/linux-armv7-rc/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -1,4 +1,4 @@ -From 417bf98b9d312c47c64d3aac3a2514db635a2012 Mon Sep 17 00:00:00 2001 +From 2cb39fc2eea2e1747d39d56b0b2b49697058c090 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 11 Aug 2016 00:42:37 -0600 Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator @@ -13,10 +13,10 @@ Signed-off-by: Kevin Mihelich 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -index ea55f377d17c..a7bfc58bbc79 100644 +index 73d6a71da88d..aabf994ec07f 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -@@ -430,7 +430,7 @@ +@@ -439,7 +439,7 @@ buck1_reg: BUCK1 { buck2_reg: BUCK2 { regulator-name = "vdd_arm"; @@ -26,5 +26,5 @@ index ea55f377d17c..a7bfc58bbc79 100644 regulator-always-on; regulator-boot-on; -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch b/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch index 59ef534a3..d7111db58 100644 --- a/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch +++ b/core/linux-armv7-rc/0008-ARM-dove-enable-ethernet-on-D3Plug.patch @@ -1,4 +1,4 @@ -From 3f045915d6bd9038f4b1751fb06497d0a6fd4a88 Mon Sep 17 00:00:00 2001 +From 12d4e27d0e11a6fec43b89e7b6bb55debb094caa Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 7 May 2017 13:32:25 -0600 Subject: [PATCH 8/9] ARM: dove: enable ethernet on D3Plug @@ -12,7 +12,7 @@ diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.d index 826026c28f90..a4c9963e1261 100644 --- a/arch/arm/boot/dts/dove-d3plug.dts +++ b/arch/arm/boot/dts/dove-d3plug.dts -@@ -61,6 +61,13 @@ +@@ -61,6 +61,13 @@ usb_power: regulator@1 { &uart0 { status = "okay"; }; &sata0 { status = "okay"; }; &i2c0 { status = "okay"; }; @@ -27,5 +27,5 @@ index 826026c28f90..a4c9963e1261 100644 /* Samsung M8G2F eMMC */ &sdio0 { -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/0009-USB-Armory-MkII-support.patch b/core/linux-armv7-rc/0009-USB-Armory-MkII-support.patch index 0bd885344..cce232ad0 100644 --- a/core/linux-armv7-rc/0009-USB-Armory-MkII-support.patch +++ b/core/linux-armv7-rc/0009-USB-Armory-MkII-support.patch @@ -1,4 +1,4 @@ -From 849c3ad55d9fcf00cb909e8f19139b939a22132c Mon Sep 17 00:00:00 2001 +From b492240828db14302661adcdd3fd12396069ee4e Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 11 Aug 2019 12:34:17 -0600 Subject: [PATCH 9/9] USB Armory MkII support @@ -12,10 +12,10 @@ Subject: [PATCH 9/9] USB Armory MkII support 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 9f10323ecfde..ab24e8e9d0c2 100644 +index 6107ad410109..fd8e1835deb7 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -585,10 +585,12 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ +@@ -609,10 +609,12 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-tx6ul-0010.dtb \ imx6ul-tx6ul-0011.dtb \ imx6ul-tx6ul-mainboard.dtb \ @@ -30,13 +30,13 @@ index 9f10323ecfde..ab24e8e9d0c2 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..3936ef8a64f1 +index 000000000000..f26344965ae1 --- /dev/null +++ b/arch/arm/boot/dts/imx6ul-usbarmory.dts @@ -0,0 +1,255 @@ +/* + * USB armory Mk II device tree file -+ * https://inversepath.com/usbarmory ++ * https://github.com/inversepath/usbarmory + * + * Copyright (C) 2019, F-Secure Corporation + * Andrej Rosano @@ -227,7 +227,7 @@ index 000000000000..3936ef8a64f1 +}; + +&aips2 { -+ crypto: caam@2140000 { ++ crypto: crypto@2140000 { + compatible = "fsl,imx6ul-caam", "fsl,sec-v4.0"; + #address-cells = <1>; + #size-cells = <1>; @@ -238,18 +238,18 @@ index 000000000000..3936ef8a64f1 + <&clks IMX6UL_CLK_CAAM_MEM>; + clock-names = "ipg", "aclk", "mem"; + -+ sec_jr0: jr0@1000 { ++ sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = ; + }; + -+ sec_jr1: jr1@2000 { ++ sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = ; + }; -+ sec_jr2: jr2@3000 { ++ sec_jr2: jr@3000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x3000 0x1000>; + interrupts = ; @@ -277,7 +277,7 @@ index 000000000000..3936ef8a64f1 +}; + +&usbotg1 { -+ dr_mode = "otg"; ++ dr_mode = "peripheral"; + disable-over-current; + tpl-support; + status = "okay"; @@ -291,13 +291,13 @@ index 000000000000..3936ef8a64f1 +}; diff --git a/arch/arm/boot/dts/imx6ull-usbarmory.dts b/arch/arm/boot/dts/imx6ull-usbarmory.dts new file mode 100644 -index 000000000000..85cf30bff527 +index 000000000000..2d758a805264 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-usbarmory.dts @@ -0,0 +1,256 @@ +/* + * USB armory Mk II device tree file -+ * https://inversepath.com/usbarmory ++ * https://github.com/inversepath/usbarmory + * + * Copyright (C) 2019, F-Secure Corporation + * Andrej Rosano @@ -552,5 +552,5 @@ index 000000000000..85cf30bff527 + status = "okay"; +}; -- -2.23.0 +2.26.1 diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index b90ed15d2..5d7f0d3e1 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -37,15 +37,15 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz" '99-linux.hook') md5sums=('1eb840fb0a325703059a5f2f0aa621a0' '6bad6c3a0f24515810327a9175a76a99' - '3acbc3919c615b8aa26ad186c68993c3' - 'f2c68a5ec7a9f35da95cfd1917b45a23' - '5c978e49ac35a0929c7d9c334236a4b3' - 'e1f590844ba844e3dca9a59bc2b25839' - '09e36e3e8e28963f15f8d662f45fd53c' - '69747217644213bbbd8ba69bd1f287ea' - '68fb23b133bd40b23b9be88b812006be' - '69815186d139d7df11b7b849298a8fdb' - 'e3ff621c2bfa5147cb0211187c2e2f22' + 'c2c94f19d06e66948c8fa387824c57e9' + '9302b69053eef3e883af46b4849d1942' + '6ab1b96d995c3a765d9f8e0197ef0b7a' + 'faf800395a2933b8018d3314ca10c998' + '88eca9370d9ea2529f0926f71b25ca48' + 'b1b7a6c3a0d1d5ee87059a5e9dce84e4' + '9c573026a0648bf41a7fcc25b1319e71' + 'e147d9e4122ec5b86c6016c074188077' + 'ae296b53ab5cf799bc77a7c5ebc92af1' '17e9a4df4815cdbcbe365d98fd9ddd60' '4f2379ed84258050edb858ee8d281678' '61c5ff73c136ed07a7aadbf58db3d96a'