diff --git a/core/linux-wandboard/0001-Swap-usdhc1-and-usdhc3.patch b/core/linux-wandboard/0001-Swap-usdhc1-and-usdhc3.patch index 0389c4f00..76dc0fc81 100644 --- a/core/linux-wandboard/0001-Swap-usdhc1-and-usdhc3.patch +++ b/core/linux-wandboard/0001-Swap-usdhc1-and-usdhc3.patch @@ -1,4 +1,4 @@ -From d7ab60d286774ec9885490f0954f73ed31fe9c27 Mon Sep 17 00:00:00 2001 +From 9e1f894719f38a4222cd1713b4f5d1f36c9cd9c2 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Mon, 12 May 2014 13:56:09 -0600 Subject: [PATCH] Swap usdhc1 and usdhc3 @@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> 2 files changed, 59 insertions(+), 60 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi -index 1cc4840..0d03a0b 100644 +index 5244e95..518cefe 100644 --- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi +++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi -@@ -450,12 +450,11 @@ reference manual. +@@ -480,12 +480,11 @@ reference manual. status = "okay"; }; @@ -33,7 +33,7 @@ index 1cc4840..0d03a0b 100644 status = "okay"; }; -@@ -469,11 +468,11 @@ reference manual. +@@ -499,11 +498,11 @@ reference manual. status = "okay"; }; @@ -50,7 +50,7 @@ index 1cc4840..0d03a0b 100644 }; - diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi -index 2cb5ae0..05dbd88 100644 +index 95bd7b1..3e644ce 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -836,11 +836,11 @@ @@ -85,7 +85,7 @@ index 2cb5ae0..05dbd88 100644 clock-names = "ipg", "ahb", "per"; bus-width = <4>; status = "disabled"; -@@ -1576,47 +1576,6 @@ +@@ -1584,47 +1584,6 @@ usdhc1 { pinctrl_usdhc1_1: usdhc1grp-1 { fsl,pins = < @@ -133,7 +133,7 @@ index 2cb5ae0..05dbd88 100644 MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 -@@ -1630,7 +1589,7 @@ +@@ -1638,7 +1597,7 @@ >; }; @@ -142,7 +142,7 @@ index 2cb5ae0..05dbd88 100644 fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B9 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100B9 -@@ -1645,7 +1604,7 @@ +@@ -1653,7 +1612,7 @@ >; }; @@ -151,7 +151,7 @@ index 2cb5ae0..05dbd88 100644 fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170F9 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100F9 -@@ -1660,7 +1619,7 @@ +@@ -1668,7 +1627,7 @@ >; }; @@ -160,7 +160,7 @@ index 2cb5ae0..05dbd88 100644 fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 -@@ -1672,6 +1631,47 @@ +@@ -1680,6 +1639,47 @@ }; }; @@ -209,5 +209,5 @@ index 2cb5ae0..05dbd88 100644 pinctrl_usdhc4_1: usdhc4grp-1 { fsl,pins = < -- -1.9.0 +2.2.1 diff --git a/core/linux-wandboard/PKGBUILD b/core/linux-wandboard/PKGBUILD index e27c8a9b1..2fdc56c6f 100644 --- a/core/linux-wandboard/PKGBUILD +++ b/core/linux-wandboard/PKGBUILD @@ -4,22 +4,22 @@ buildarch=4 pkgbase=linux-wandboard -_commit=a6e7fc58e6912986d003598ed79bb6a391a2113c +_commit=be8d6872b5eb4c94c15dac36b028ce7f60472409 _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="i.MX6 Wandboard" pkgver=3.10.17 -pkgrel=4 +pkgrel=5 arch=('armv7h') -url="https://github.com/wandboard-org/linux/tree/wandboard_imx_3.10.17_1.0.1_ga" +url="https://github.com/wandboard-org/linux/tree/wandboard_imx_3.10.17_1.0.2_ga" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git') options=('!strip') source=("https://github.com/wandboard-org/linux/archive/${_commit}.tar.gz" '0001-Swap-usdhc1-and-usdhc3.patch' 'config') -md5sums=('da4d249927e8a803f0a7cb333b190639' - '1edf745b39c715206fbe327c60f6cf76' +md5sums=('9f7a696d009f81c1eabcc46c74288475' + '4b98962855628aeb8328c3636db37cdc' '87706fcb5d01bf5a1722c6c9de5be83f') prepare() { @@ -27,7 +27,7 @@ prepare() { cat "${srcdir}/config" > ./.config - patch -p1 -i ../0001-Swap-usdhc1-and-usdhc3.patch + git apply ../0001-Swap-usdhc1-and-usdhc3.patch # add pkgrel to extraversion sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile