diff --git a/patch.sh b/patch.sh
index 1b1d3be361310671298a26da19428d2ea307f195..19f589b925d0045bda8430d92600b87bbcc99103 100644
--- a/patch.sh
+++ b/patch.sh
@@ -344,10 +344,19 @@ omap_sprz319_erratum () {
#${git} "${DIR}/patches/omap_sprz319_erratum_v2.1/0001-hack-omap-clockk-dpll5-apply-sprz319e-2.1-erratum-co.patch"
}
+omap3_beagle_xm_rework () {
+ echo "dir: omap3_beagle_xm_rework"
+ ${git} "${DIR}/patches/omap3_beagle_xm_rework/0001-ARM-dts-beagle-xm-make-sure-dvi-is-enabled.patch"
+
+ #cp arch/arm/boot/dts/omap3-beagle-xm.dts arch/arm/boot/dts/omap3-beagle-xm-ab.dts
+ ${git} "${DIR}/patches/omap3_beagle_xm_rework/0002-ARM-dts-omap3-beagle-xm-ab.dtb-copy-from-omap3-beagl.patch"
+ ${git} "${DIR}/patches/omap3_beagle_xm_rework/0003-ARM-dts-omap3-beagle-xm-ab.dtb-build.patch"
+ ${git} "${DIR}/patches/omap3_beagle_xm_rework/0004-ARM-dts-omap3-beagle-xm-ab.dtb-invert-usb-host.patch"
+}
+
fixes () {
echo "dir: fixes"
${git} "${DIR}/patches/fixes/0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch"
-# ${git} "${DIR}/patches/fixes/0002-crypto-omap-aes-add-error-check-for-pm_runtime_get_s.patch"
${git} "${DIR}/patches/fixes/0002-fix-compilation-of-imx-hdmi.patch"
}
@@ -369,23 +378,13 @@ vivante () {
saucy () {
echo "dir: saucy"
- #need to be re-tested with v3.13-rcX
+ #need to be re-tested with v3.14-rcX
#Ubuntu Saucy: so Ubuntu decided to enable almost every Warning -> Error option...
${git} "${DIR}/patches/saucy/0001-saucy-error-variable-ilace-set-but-not-used-Werror-u.patch"
${git} "${DIR}/patches/saucy/0002-saucy-disable-Werror-pointer-sign.patch"
${git} "${DIR}/patches/saucy/0003-saucy-disable-stack-protector.patch"
}
-omap3_beagle_xm_rework () {
- echo "dir: omap3_beagle_xm_rework"
- ${git} "${DIR}/patches/omap3_beagle_xm_rework/0001-ARM-dts-beagle-xm-make-sure-dvi-is-enabled.patch"
-
- #cp arch/arm/boot/dts/omap3-beagle-xm.dts arch/arm/boot/dts/omap3-beagle-xm-ab.dts
- ${git} "${DIR}/patches/omap3_beagle_xm_rework/0002-ARM-dts-omap3-beagle-xm-ab.dtb-copy-from-omap3-beagl.patch"
- ${git} "${DIR}/patches/omap3_beagle_xm_rework/0003-ARM-dts-omap3-beagle-xm-ab.dtb-build.patch"
- ${git} "${DIR}/patches/omap3_beagle_xm_rework/0004-ARM-dts-omap3-beagle-xm-ab.dtb-invert-usb-host.patch"
-}
-
#revert
arm
drivers
@@ -402,10 +401,11 @@ dts
bone
imx_video_staging
omap_sprz319_erratum
+
+omap3_beagle_xm_rework
+
fixes
vivante
-
#saucy
-omap3_beagle_xm_rework
echo "patch.sh ran successful"
diff --git a/patches/fixes/0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch b/patches/fixes/0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
index 3610e68c27b9e083c6877b27f079a220926adb52..b9333dd653d0df889d17fa3289aa3f740850838f 100644
--- a/patches/fixes/0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
+++ b/patches/fixes/0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
@@ -1,7 +1,7 @@
-From edeaeac8e8580a76e5adcaaae420cd0f24191443 Mon Sep 17 00:00:00 2001
+From a77531bacca5c7be882deb6fa7f0a29d76c88df7 Mon Sep 17 00:00:00 2001
From: Thomas Scheiblauer <tom@sharkbay.at>
Date: Thu, 17 Oct 2013 13:14:43 -0500
-Subject: [PATCH] imx6q: work around fec tx-queue timeouts when SATA/SD +
+Subject: [PATCH 1/2] imx6q: work around fec tx-queue timeouts when SATA/SD +
ethernet is active with high throughput
When data is transferred from SATA or is SD-card tx-queue timeouts occur
@@ -34,7 +34,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
-index 0120217..ee9a1da 100644
+index 3b8d6d1..da096df 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -246,7 +246,7 @@ struct bufdesc_ex {
@@ -47,5 +47,5 @@ index 0120217..ee9a1da 100644
#define BD_ENET_RX_INT 0x00800000
--
-1.8.4.rc3
+1.8.5.3
diff --git a/patches/fixes/0002-crypto-omap-aes-add-error-check-for-pm_runtime_get_s.patch b/patches/fixes/0002-crypto-omap-aes-add-error-check-for-pm_runtime_get_s.patch
deleted file mode 100644
index a38a5aca54a2c9ccefa9a19d887c9df2f30a63de..0000000000000000000000000000000000000000
--- a/patches/fixes/0002-crypto-omap-aes-add-error-check-for-pm_runtime_get_s.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 3e0931bc770da44f0d1c18045a1ee42c6f143302 Mon Sep 17 00:00:00 2001
-From: Nishanth Menon <nm@ti.com>
-Date: Tue, 3 Dec 2013 19:43:13 -0600
-Subject: [PATCH 2/2] crypto: omap-aes: add error check for pm_runtime_get_sync
-
-The AES driver currently assumes that pm_runtime_get_sync will always
-succeed, which may not always be true, so add error handling for the
-same.
-
-This scenario was reported in the following bug:
-place. https://bugzilla.kernel.org/show_bug.cgi?id=66441
-
-Reported-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
-Signed-off-by: Nishanth Menon <nm@ti.com>
----
- drivers/crypto/omap-aes.c | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
-index a9ccbf1..dde41f1d 100644
---- a/drivers/crypto/omap-aes.c
-+++ b/drivers/crypto/omap-aes.c
-@@ -784,6 +784,7 @@ static int omap_aes_ctr_decrypt(struct ablkcipher_request *req)
- static int omap_aes_cra_init(struct crypto_tfm *tfm)
- {
- struct omap_aes_dev *dd = NULL;
-+ int err;
-
- /* Find AES device, currently picks the first device */
- spin_lock_bh(&list_lock);
-@@ -792,7 +793,13 @@ static int omap_aes_cra_init(struct crypto_tfm *tfm)
- }
- spin_unlock_bh(&list_lock);
-
-- pm_runtime_get_sync(dd->dev);
-+ err = pm_runtime_get_sync(dd->dev);
-+ if (err < 0) {
-+ dev_err(dd->dev, "%s: failed to get_sync(%d)\n",
-+ __func__, err);
-+ return err;
-+ }
-+
- tfm->crt_ablkcipher.reqsize = sizeof(struct omap_aes_reqctx);
-
- return 0;
-@@ -1182,7 +1189,12 @@ static int omap_aes_probe(struct platform_device *pdev)
- dd->phys_base = res.start;
-
- pm_runtime_enable(dev);
-- pm_runtime_get_sync(dev);
-+ err = pm_runtime_get_sync(dev);
-+ if (err < 0) {
-+ dev_err(dev, "%s: failed to get_sync(%d)\n",
-+ __func__, err);
-+ goto err_res;
-+ }
-
- omap_aes_dma_stop(dd);
-
---
-1.8.4.3
-
diff --git a/patches/fixes/0002-fix-compilation-of-imx-hdmi.patch b/patches/fixes/0002-fix-compilation-of-imx-hdmi.patch
index ccfb115abe0a154970c8c7d1efe790f0d662bf1e..a2cdb20c4c5c5de7bab0b558f1a20a3decb4b24c 100644
--- a/patches/fixes/0002-fix-compilation-of-imx-hdmi.patch
+++ b/patches/fixes/0002-fix-compilation-of-imx-hdmi.patch
@@ -1,4 +1,4 @@
-From 375ba370820e8042e09fc4fbd4e4465e15f0919a Mon Sep 17 00:00:00 2001
+From dd417336e2ebf6f8bb0f2dd78f69b466081c0d26 Mon Sep 17 00:00:00 2001
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
Date: Thu, 30 Jan 2014 16:13:47 +0000
Subject: [PATCH 2/2] fix compilation of imx-hdmi