From 6d19779d07cbcbabe5aba8cf3e3d6bc663c59477 Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 24 Sep 2017 19:32:54 -0300 Subject: Updated ARM patches in kernels Just from [libre], for now --- ...RM-atags-add-support-for-Marvell-s-u-boot.patch | 6 +-- ...dt-retrieve-MAC-addresses-from-Marvell-bo.patch | 8 ++-- .../0003-SMILE-Plug-device-tree-file.patch | 10 ++--- .../0004-fix-mvsdio-eMMC-timing.patch | 10 ++--- ...x-Allow-mac-address-to-be-set-as-a-parame.patch | 9 ++-- ...IC23-SoC-Audio-Codec-Fix-errors-reported-.patch | 49 ---------------------- .../0006-set-default-cubietruck-led-triggers.patch | 33 +++++++++++++++ ...odroid-set-higher-minimum-buck2-regulator.patch | 30 +++++++++++++ .../0007-set-default-cubietruck-led-triggers.patch | 33 --------------- .../0008-disable-USB3-port-on-ODROID-XU.patch | 27 ++++++++++++ ...odroid-set-higher-minimum-buck2-regulator.patch | 30 ------------- .../0009-ARM-dove-enable-ethernet-on-D3Plug.patch | 31 ++++++++++++++ .../0009-disable-USB3-port-on-ODROID-XU.patch | 27 ------------ .../0010-ARM-dove-enable-ethernet-on-D3Plug.patch | 31 -------------- libre/linux-libre-hardened/PKGBUILD | 44 +++++++++---------- 15 files changed, 164 insertions(+), 214 deletions(-) delete mode 100644 libre/linux-libre-hardened/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch create mode 100644 libre/linux-libre-hardened/0006-set-default-cubietruck-led-triggers.patch create mode 100644 libre/linux-libre-hardened/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch delete mode 100644 libre/linux-libre-hardened/0007-set-default-cubietruck-led-triggers.patch create mode 100644 libre/linux-libre-hardened/0008-disable-USB3-port-on-ODROID-XU.patch delete mode 100644 libre/linux-libre-hardened/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch create mode 100644 libre/linux-libre-hardened/0009-ARM-dove-enable-ethernet-on-D3Plug.patch delete mode 100644 libre/linux-libre-hardened/0009-disable-USB3-port-on-ODROID-XU.patch delete mode 100644 libre/linux-libre-hardened/0010-ARM-dove-enable-ethernet-on-D3Plug.patch (limited to 'libre/linux-libre-hardened') diff --git a/libre/linux-libre-hardened/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/libre/linux-libre-hardened/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index 9e1a037b6..47f149aa5 100644 --- a/libre/linux-libre-hardened/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/libre/linux-libre-hardened/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 81e89a314fb1e70274c2ec72013ba0a076de55dd Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 -Subject: [PATCH 01/10] ARM: atags: add support for Marvell's u-boot +Subject: [PATCH 1/9] 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. @@ -47,5 +47,5 @@ index 979ff4016404..d1d0c1950fa4 100644 }; -- -2.12.2 +2.13.0 diff --git a/libre/linux-libre-hardened/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre/linux-libre-hardened/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index dcf365444..ccc42d67e 100644 --- a/libre/linux-libre-hardened/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/libre/linux-libre-hardened/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,8 +1,8 @@ -From 6271ea4f21b8b175cfa3a64b18501bb7e8d140d6 Mon Sep 17 00:00:00 2001 +From e62b74b84f4b146e0b82d6acf1c043dc599ea884 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 -Subject: [PATCH 02/10] ARM: atags/fdt: retrieve MAC addresses from Marvell - boot loader +Subject: [PATCH 2/9] 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 addresses are extracted there and assigned to node aliases eth0..3 @@ -43,5 +43,5 @@ index 9448aa0c6686..ac7b6ae6c00f 100644 } -- -2.12.2 +2.13.0 diff --git a/libre/linux-libre-hardened/0003-SMILE-Plug-device-tree-file.patch b/libre/linux-libre-hardened/0003-SMILE-Plug-device-tree-file.patch index f918ed912..5976f1a80 100644 --- a/libre/linux-libre-hardened/0003-SMILE-Plug-device-tree-file.patch +++ b/libre/linux-libre-hardened/0003-SMILE-Plug-device-tree-file.patch @@ -1,7 +1,7 @@ -From 58251af3f3bcc92521fc65ca9448dda679f371f0 Mon Sep 17 00:00:00 2001 +From 8a920b8030a9a677dd6d38cf0305e7bf63617a61 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:41:19 -0600 -Subject: [PATCH 03/10] SMILE Plug device tree file +Subject: [PATCH 3/9] SMILE Plug device tree file This adds a dts file for the SMILE Plug, which only differs from the Mirabox dts with the LED definitions. @@ -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 011808490fed..7e6330f6a4a2 100644 +index 9c5e1d944d1c..342ed08ab225 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -956,6 +956,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ +@@ -985,6 +985,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.12.2 +2.13.0 diff --git a/libre/linux-libre-hardened/0004-fix-mvsdio-eMMC-timing.patch b/libre/linux-libre-hardened/0004-fix-mvsdio-eMMC-timing.patch index 4d7e4c4ca..b9e969f7a 100644 --- a/libre/linux-libre-hardened/0004-fix-mvsdio-eMMC-timing.patch +++ b/libre/linux-libre-hardened/0004-fix-mvsdio-eMMC-timing.patch @@ -1,7 +1,7 @@ -From 26bad4f64f00a5b4a197a1cf6d0cde1a02f9cb0b Mon Sep 17 00:00:00 2001 +From 9ef8feb3e1a701eacd6979653511e1b13b095697 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 -Subject: [PATCH 04/10] fix mvsdio eMMC timing +Subject: [PATCH 4/9] fix mvsdio eMMC timing These changes from Globalscale change the MMC timing to allow the eMMC versions of the Mirabox and SMILE Plug to work. @@ -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 42296e55b9de..e5ce6d27ec82 100644 +index 58d74b8d6c79..c9715530d676 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -93,7 +93,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data) @@ -24,7 +24,7 @@ index 42296e55b9de..e5ce6d27ec82 100644 tmout_index = MVSD_HOST_CTRL_TMOUT_MAX; dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n", -@@ -615,6 +615,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) +@@ -614,6 +614,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1; if (m > MVSD_BASE_DIV_MAX) m = MVSD_BASE_DIV_MAX; @@ -34,5 +34,5 @@ index 42296e55b9de..e5ce6d27ec82 100644 host->clock = ios->clock; host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); -- -2.12.2 +2.13.0 diff --git a/libre/linux-libre-hardened/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre/linux-libre-hardened/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 046c75315..0cbd821c5 100644 --- a/libre/linux-libre-hardened/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/libre/linux-libre-hardened/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,15 +1,14 @@ -From fad9500067807862b0984973e3ec3182f585c4a7 Mon Sep 17 00:00:00 2001 +From d52a089f2564db419f6a9b4109ccda69e847793d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 05/10] net/smsc95xx: Allow mac address to be set as a - parameter +Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter --- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index 5f19fb0f025d..89579abc1959 100644 +index 765400b62168..ee3212f887e3 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -60,6 +60,7 @@ @@ -92,5 +91,5 @@ index 5f19fb0f025d..89579abc1959 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.12.2 +2.13.0 diff --git a/libre/linux-libre-hardened/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/libre/linux-libre-hardened/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch deleted file mode 100644 index 885307149..000000000 --- a/libre/linux-libre-hardened/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 863b1ec078f908fdfab6f9b9900e54973754fbad Mon Sep 17 00:00:00 2001 -From: dobatog -Date: Thu, 26 Feb 2015 12:32:27 +0100 -Subject: [PATCH 06/10] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported - related to input routing signals. - -The following patch, based on stable v3.19, corrects the errors that are reported in the boot trace in reference to the Input Signals of the audio codec TLV320AIC23: - -tlv320aic23-codec 1-001a: Control not supported for path LLINEIN -> [NULL] -> Line Input -tlv320aic23-codec 1-001a: ASoC: no dapm match for LLINEIN --> NULL --> Line Input -tlv320aic23-codec 1-001a: ASoC: Failed to add route LLINEIN -> NULL -> Line Input -tlv320aic23-codec 1-001a: Control not supported for path RLINEIN -> [NULL] -> Line Input -tlv320aic23-codec 1-001a: ASoC: no dapm match for RLINEIN --> NULL --> Line Input -tlv320aic23-codec 1-001a: ASoC: Failed to add route RLINEIN -> NULL -> Line Input -tlv320aic23-codec 1-001a: Control not supported for path MICIN -> [NULL] -> Mic Input -tlv320aic23-codec 1-001a: ASoC: no dapm match for MICIN --> NULL --> Mic Input -tlv320aic23-codec 1-001a: ASoC: Failed to add route MICIN -> NULL -> Mic Input - -I am trying to set the sound system in a CM-510 (Compulab - SoM) based board with DT, using Simple-Card-Audio and the TLV320AIC23 audio codec included in the SoM . I faced this problem and thanks to the help of Sebastian Hesselbarth who noticed the possible error located in the structure snd_soc_dapm_route tlv320aic23_intercon[] , now errors are not reported. - -Tested on CM-510 (Compulab SoM Board). - -Signed-off-by: dobatog -Tested-by: Max Filippov ---- - sound/soc/codecs/tlv320aic23.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c -index 410cae0f2060..0bb8e2602d8e 100644 ---- a/sound/soc/codecs/tlv320aic23.c -+++ b/sound/soc/codecs/tlv320aic23.c -@@ -174,10 +174,10 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = { - {"ROUT", NULL, "Output Mixer"}, - - /* Inputs */ -- {"Line Input", "NULL", "LLINEIN"}, -- {"Line Input", "NULL", "RLINEIN"}, -+ {"Line Input", NULL, "LLINEIN"}, -+ {"Line Input", NULL, "RLINEIN"}, - -- {"Mic Input", "NULL", "MICIN"}, -+ {"Mic Input", NULL, "MICIN"}, - - /* input mux */ - {"Capture Source", "Line", "Line Input"}, --- -2.12.2 - diff --git a/libre/linux-libre-hardened/0006-set-default-cubietruck-led-triggers.patch b/libre/linux-libre-hardened/0006-set-default-cubietruck-led-triggers.patch new file mode 100644 index 000000000..4a8965cae --- /dev/null +++ b/libre/linux-libre-hardened/0006-set-default-cubietruck-led-triggers.patch @@ -0,0 +1,33 @@ +From 6a5a573951f166fdda2d2daa235207f32d9bec92 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 + +Signed-off-by: Kevin Mihelich +--- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +index 102903e83bd2..40ce78704e8f 100644 +--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts ++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +@@ -69,6 +69,7 @@ + blue { + label = "cubietruck:blue:usr"; + gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; + }; + + orange { +@@ -84,6 +85,7 @@ + green { + label = "cubietruck:green:usr"; + gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "mmc0"; + }; + }; + +-- +2.13.0 + diff --git a/libre/linux-libre-hardened/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/libre/linux-libre-hardened/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch new file mode 100644 index 000000000..9c3f76760 --- /dev/null +++ b/libre/linux-libre-hardened/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -0,0 +1,30 @@ +From 65265b8379903a8dd95489616fde0126d10bd4ef 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 + voltage + +Set a higher minimum voltage to help reboot issue. +http://www.spinics.net/lists/linux-samsung-soc/msg54434.html + +Signed-off-by: Kevin Mihelich +--- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + 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 0f1ff792fe44..a6fc2a53522f 100644 +--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi ++++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +@@ -423,7 +423,7 @@ + + buck2_reg: BUCK2 { + regulator-name = "vdd_arm"; +- regulator-min-microvolt = <900000>; ++ regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-boot-on; +-- +2.13.0 + diff --git a/libre/linux-libre-hardened/0007-set-default-cubietruck-led-triggers.patch b/libre/linux-libre-hardened/0007-set-default-cubietruck-led-triggers.patch deleted file mode 100644 index fc8a71623..000000000 --- a/libre/linux-libre-hardened/0007-set-default-cubietruck-led-triggers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 14f39f3c5fef7502486827ff68d649e0f47cbbd3 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sat, 14 Feb 2015 12:32:27 +0100 -Subject: [PATCH 07/10] set default cubietruck led triggers - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index f019aa3fe96d..76053e03cc7a 100644 ---- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -@@ -70,6 +70,7 @@ - blue { - label = "cubietruck:blue:usr"; - gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; - }; - - orange { -@@ -85,6 +86,7 @@ - green { - label = "cubietruck:green:usr"; - gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc0"; - }; - }; - --- -2.12.2 - diff --git a/libre/linux-libre-hardened/0008-disable-USB3-port-on-ODROID-XU.patch b/libre/linux-libre-hardened/0008-disable-USB3-port-on-ODROID-XU.patch new file mode 100644 index 000000000..01a9c3f01 --- /dev/null +++ b/libre/linux-libre-hardened/0008-disable-USB3-port-on-ODROID-XU.patch @@ -0,0 +1,27 @@ +From 800ac49ce45ca2500e2455194d155d5d20f633e0 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Sat, 25 Feb 2017 19:39:51 -0700 +Subject: [PATCH 8/9] disable USB3 port on ODROID-XU + +Ports report over-current condition and are non-operable. + +Signed-off-by: Kevin Mihelich +--- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts +index c4de1353e5df..f80fa58995c5 100644 +--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts ++++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts +@@ -630,6 +630,7 @@ + + &usbdrd_dwc3_0 { + dr_mode = "host"; ++ status = "disabled"; + }; + + &usbdrd_dwc3_1 { +-- +2.13.0 + diff --git a/libre/linux-libre-hardened/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/libre/linux-libre-hardened/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch deleted file mode 100644 index fceb7e04e..000000000 --- a/libre/linux-libre-hardened/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f51a9920e9836ae341787d4524bb9790547ef921 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Thu, 11 Aug 2016 00:42:37 -0600 -Subject: [PATCH 08/10] exynos4412-odroid: set higher minimum buck2 regulator - voltage - -Set a higher minimum voltage to help reboot issue. -http://www.spinics.net/lists/linux-samsung-soc/msg54434.html - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- - 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 78f118cb73d4..169bd8fdaf41 100644 ---- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -@@ -423,7 +423,7 @@ - - buck2_reg: BUCK2 { - regulator-name = "vdd_arm"; -- regulator-min-microvolt = <900000>; -+ regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; --- -2.12.2 - diff --git a/libre/linux-libre-hardened/0009-ARM-dove-enable-ethernet-on-D3Plug.patch b/libre/linux-libre-hardened/0009-ARM-dove-enable-ethernet-on-D3Plug.patch new file mode 100644 index 000000000..eca0ffcb8 --- /dev/null +++ b/libre/linux-libre-hardened/0009-ARM-dove-enable-ethernet-on-D3Plug.patch @@ -0,0 +1,31 @@ +From 04cbef0366837832994a3dd25661d28afe0d65a4 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Sun, 7 May 2017 13:32:25 -0600 +Subject: [PATCH 9/9] ARM: dove: enable ethernet on D3Plug + +Signed-off-by: Kevin Mihelich +--- + arch/arm/boot/dts/dove-d3plug.dts | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts +index f5f59bb5a534..b0ad0bbf6818 100644 +--- a/arch/arm/boot/dts/dove-d3plug.dts ++++ b/arch/arm/boot/dts/dove-d3plug.dts +@@ -60,6 +60,13 @@ + &uart0 { status = "okay"; }; + &sata0 { status = "okay"; }; + &i2c0 { status = "okay"; }; ++&mdio { status = "okay"; }; ++ð { status = "okay"; }; ++ ++ðphy { ++ compatible = "marvell,88e1310"; ++ reg = <1>; ++}; + + /* Samsung M8G2F eMMC */ + &sdio0 { +-- +2.13.0 + diff --git a/libre/linux-libre-hardened/0009-disable-USB3-port-on-ODROID-XU.patch b/libre/linux-libre-hardened/0009-disable-USB3-port-on-ODROID-XU.patch deleted file mode 100644 index 530c5d3e4..000000000 --- a/libre/linux-libre-hardened/0009-disable-USB3-port-on-ODROID-XU.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f667bdbe066d7c8ec99e0f52cc9fd1eae0f5b6bb Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sat, 25 Feb 2017 19:39:51 -0700 -Subject: [PATCH 09/10] disable USB3 port on ODROID-XU - -Ports report over-current condition and are non-operable. - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts -index c4de1353e5df..f80fa58995c5 100644 ---- a/arch/arm/boot/dts/exynos5410-odroidxu.dts -+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts -@@ -630,6 +630,7 @@ - - &usbdrd_dwc3_0 { - dr_mode = "host"; -+ status = "disabled"; - }; - - &usbdrd_dwc3_1 { --- -2.12.2 - diff --git a/libre/linux-libre-hardened/0010-ARM-dove-enable-ethernet-on-D3Plug.patch b/libre/linux-libre-hardened/0010-ARM-dove-enable-ethernet-on-D3Plug.patch deleted file mode 100644 index ef40ac3bc..000000000 --- a/libre/linux-libre-hardened/0010-ARM-dove-enable-ethernet-on-D3Plug.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a986bc8d10b57b3261f712327fd477c6f09ff414 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sun, 7 May 2017 13:32:25 -0600 -Subject: [PATCH 10/10] ARM: dove: enable ethernet on D3Plug - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/dove-d3plug.dts | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts -index f5f59bb5a534..b0ad0bbf6818 100644 ---- a/arch/arm/boot/dts/dove-d3plug.dts -+++ b/arch/arm/boot/dts/dove-d3plug.dts -@@ -60,6 +60,13 @@ - &uart0 { status = "okay"; }; - &sata0 { status = "okay"; }; - &i2c0 { status = "okay"; }; -+&mdio { status = "okay"; }; -+ð { status = "okay"; }; -+ -+ðphy { -+ compatible = "marvell,88e1310"; -+ reg = <1>; -+}; - - /* Samsung M8G2F eMMC */ - &sdio0 { --- -2.12.2 - diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD index 0daf8e50f..e71445a28 100644 --- a/libre/linux-libre-hardened/PKGBUILD +++ b/libre/linux-libre-hardened/PKGBUILD @@ -11,8 +11,8 @@ # Based on linux-hardened package pkgbase=linux-libre-hardened -_pkgbasever=4.11-gnu -_pkgver=4.11.9-gnu +_pkgbasever=4.12-gnu +_pkgver=4.12.5-gnu _hardenedver=a _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname @@ -23,7 +23,7 @@ _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_}.${_hardenedver} pkgrel=1 -rcnrel=armv7-x0 +rcnrel=armv7-x3 arch=('i686' 'x86_64' 'armv7h') url="https://linux-libre.fsfla.org/" license=('GPL2') @@ -45,22 +45,21 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' # armv7h patches -# "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig} + "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig} '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' '0003-SMILE-Plug-device-tree-file.patch' '0004-fix-mvsdio-eMMC-timing.patch' '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch' - '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch' - '0007-set-default-cubietruck-led-triggers.patch' - '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' - '0009-disable-USB3-port-on-ODROID-XU.patch' - '0010-ARM-dove-enable-ethernet-on-D3Plug.patch') -sha512sums=('f1d9138024b127385248de5c8eb72123b717bbbaba3e80bded20f073acac816a7ea979c4677ddc72252a8ec77c6a6c1d1738b1c20106f7d53ef39c9cf64c1853' + '0006-set-default-cubietruck-led-triggers.patch' + '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' + '0008-disable-USB3-port-on-ODROID-XU.patch' + '0009-ARM-dove-enable-ethernet-on-D3Plug.patch') +sha512sums=('d5586dba2e4deeb42ffe98c9305111da56e0741bb4508642d103367a0ef712c837e160366c3656d18f0d636fcd5b60c27593cb9216e10025d6abc74e6cdb05e4' 'SKIP' - '6408d84e17577ed466252369613168fcfb7615f79bc117018a6a677d1b8cb029a52fe3cf4fe270f9c8e3219b83751e8638a1281a7321b1a7359ad51b4ab2a111' + '858d0ba1cb8e72cadd510a927dba201d033fbc4dd24604f029b4aa02110db3efcab7f6ba15a06ae265ef5b1a1608950005ed78f737bed97378c1b48393e24089' 'SKIP' - '6a11b5a97d782bb5b8b8379d1453c1fac6e648ab93786f452f51a88089dafb1dae43ce1ebf71e01f1bc92127288bbec01c3e49ec28f1049817f43a02d14caf79' + '79379c4c389cba9c141f480478255b274d993826fb51add81557f9f7ad7bcfddddc1370faa0a8905032d34066491853b449a131968d8631b3ba21978e7840a97' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -75,16 +74,17 @@ sha512sums=('f1d9138024b127385248de5c8eb72123b717bbbaba3e80bded20f073acac816a7ea '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - 'b3c214cc9adf22858f21ea8b0b919bd167257c2f624e98718d486b7fb82f1cfd17f578f799c13c26948bc2cb23e9eb6de0ef9299cbe49afb63929778eda24026' - 'db14593a4a0c0371e2cc2bcdcb0a4ac2abec96945dbb455393c5ef5140eca8ffb857dfee818087e4dfe261e9725a9e40a5d7e4c9774bca96560e3628743d7955' - '5ed2d772ff47517b21ba5f848ee2792a85e5e2a3d80a2aa4f0eef2acc445c20c630e6033bb180754d5cfcf11b19dbfa939b14e00bbe2acaacde02f90e3ddbb48' - '41ee45da195f7350d1c4febe21d127bccddac796adac840296a9f7ea405ad8484751658cf5174bed0ec20497d907a4429d77b0a506798136ad52c2e6e2474d0d' - '4e4dcb143ce096971ee0d77eaf513f2013d0c23a4f24462fdb9363560860bc392893100b1fe4509101427151e5d3e643dd3f3c5769fb7da1f8182879d8c5eed3' - '6c6d8250a44c0771035c3f0fe5fdfd2789f984b084df0b55fa2c17ff7b9aa3cd6cc0572fc84b230678c0fe40688f90c973b8af5e98c0e743aa73e2cd19102a6b' - '178f75b381a3c67069d8ab99ad4805fac28e40a5213ea9aa7b73913540dadee905055552dd9a5541287503b49f175dd3b85445a4b6ceae7413119297cf3a2656' - '2528481b6b1fbf7f1a39832e20ed66398cd2bc13a6bec296c351a4f571b5158c86b30993ebf450ae7a983dc82b05cd4917b19b9648665f64f328cc59cbb167fc' - '981a24d1309910c6700aaa1d8bba866c0c3fd7cf6a15a1a4b10ec69b05072775f32ef707cbfc209355aa72237880431e74213d3b5b8c6e16247cb5d943380ad2' - '3b17a9b3aac558f739320b50c84ecb44affbb26709b0f970b6f6e8f96b56aee644d92f61a0cf27c774a6c347dfc3676b4b657c4cac9ff678fb12c59fc7bcdc80') + 'e83251bb37f9f905cb68052fb81db73a8e89754f3297f59022c86a64989b5d0649c99cecf0e36d238a44ae5b0e836dc4c49eb09648618beaabfaccc2072969ab' + 'SKIP' + '8da49af5cce12f0bf21f5985cf85d13624404bab76cc0fd7a04b3ee6c046b5dceb4ae0bb821e060405366310473042892e716f530f04d1dab9a21ca1f778dd6c' + '06f40e0f197b15dffc7c724aba9a41f2343c8528576700202f069d5cd00013e7e5e8d62153cf358d02c21e28d7cf2a66e3f5190677cb590ac07f36be58b43cab' + '9ebb57495958cfcd64f82c6dbfc823ea724d888ac6991bc983981b9a4791c0691a7aba3f7358ec8c853a4e06f098d674a7bd410beb653e0f3bb6c2cd9baad254' + '42e4c7235301c476c47e8fad82117773fe362fc7a037ab18f78cef808e6d7868aea4671e89ea95f7fe8ba84a42f7d5425c8f5cca1049327775a6a83db9ff7afb' + 'b02a0886168ff3b17ff3963b518e95c94a8ecb17409381a6e4f6ee06e6f352667f0b6f8d78e39509c54bacf4c29224f67eaf514b261625a951d35fcdd809d1f6' + '47643f83377377e7b878a78b42cb5c4261390d70912fff3e41fed8f4ec750077e62291451bde098032e199d152efb89cbe9058ffa341838f411df03e5b2cb9cb' + 'af61d42d03ae4624feee5b31e699f7f16596a2b5556a43a42e773d00ab35b72ed60777b17c75acfd690f590376fba4000efda310cb628e3788f30c970bcc7e10' + 'ef47eb4cbe69d1eab683c6b4f9ea17cc2e193e14e58e4d93da3f082401aedd8a3218a30a680a077724fda698f37389fa1a216781779b59e6bd17f44dfa569d3d' + '880f625458fe7d3f5cb7d5701f2c3e094a62a1965af2c9a1520724d0142d3535211f52bdbe1318c230e6fdb3fdfbf511a83bd81ba7e117ecbc7dcb87193286c1') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay -- cgit v1.2.3