patch cleanup

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

patch.sh

@@ -191,15 +191,15 @@ dts () {
 	${git} "${DIR}/patches/dts/0002-ARM-dts-omap3-beagle-xm-spidev.patch"
 	${git} "${DIR}/patches/dts/0003-ARM-DTS-omap3-beagle.dts-enable-twl4030-power-reset.patch"
 	${git} "${DIR}/patches/dts/0004-arm-dts-omap4-move-emif-so-panda-es-b3-now-boots.patch"
-	${git} "${DIR}/patches/dts/0006-first-pass-imx6q-ccimx6sbc.patch"
-	${git} "${DIR}/patches/dts/0007-imx6-wl1835-base-boards.patch"
-	${git} "${DIR}/patches/dts/0008-imx6q-sabresd-add-support-for-wilink8-wlan-and-bluet.patch"
-	${git} "${DIR}/patches/dts/0009-imx6sl-evk-add-support-for-wilink8-wlan-and-bluetoot.patch"
-	${git} "${DIR}/patches/dts/0010-arm-obvious.patch"
-	${git} "${DIR}/patches/dts/0011-dts-am57xx-beagle-x15-make-sure-vdd_sd-is-on-fixex-v.patch"
+	${git} "${DIR}/patches/dts/0005-first-pass-imx6q-ccimx6sbc.patch"
+	${git} "${DIR}/patches/dts/0006-imx6-wl1835-base-boards.patch"
+	${git} "${DIR}/patches/dts/0007-imx6q-sabresd-add-support-for-wilink8-wlan-and-bluet.patch"
+	${git} "${DIR}/patches/dts/0008-imx6sl-evk-add-support-for-wilink8-wlan-and-bluetoot.patch"
+	${git} "${DIR}/patches/dts/0009-arm-obvious.patch"
+	${git} "${DIR}/patches/dts/0010-dts-am57xx-beagle-x15-make-sure-vdd_sd-is-on-fixex-v.patch"
 
 	if [ "x${regenerate}" = "xenable" ] ; then
-		number=11
+		number=10
 		cleanup
 	fi
 }

patches/dts/0001-ARM-dts-omap3-beagle-add-i2c2.patch

@@ -1,15 +1,15 @@
-From 737d2bdf04ce017c25763f056b01996f1b4c0f51 Mon Sep 17 00:00:00 2001
+From 6a40dc4b6619b75b0709f486dd137650c5d9b667 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Thu, 13 Feb 2014 10:03:57 -0600
-Subject: [PATCH 01/11] ARM: dts: omap3-beagle: add i2c2
+Subject: [PATCH 01/10] ARM: dts: omap3-beagle: add i2c2
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
  arch/arm/boot/dts/omap3-beagle.dts | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
-index a547411..637c240 100644
+index 67659a0..2e45844a 100644
 --- a/arch/arm/boot/dts/omap3-beagle.dts
 +++ b/arch/arm/boot/dts/omap3-beagle.dts
 @@ -274,6 +274,10 @@
@@ -24,5 +24,5 @@ index a547411..637c240 100644
  #include "twl4030_omap3.dtsi"
 
 -- 
-2.5.1
+2.5.3
 

patches/dts/0002-ARM-dts-omap3-beagle-xm-spidev.patch

@@ -1,7 +1,7 @@
-From c6b166dd1fdd0d2b2269d34ec487b9c5677fd083 Mon Sep 17 00:00:00 2001
+From 4940b39694d5dd92f44d40ac1fbdb8d8e360351e Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Wed, 19 Feb 2014 09:29:54 -0600
-Subject: [PATCH 02/11] ARM: dts: omap3-beagle-xm: spidev
+Subject: [PATCH 02/10] ARM: dts: omap3-beagle-xm: spidev
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -76,5 +76,5 @@ index 7c4dca1..4374a7e 100644
  	ti,use-leds;
  	/* pullups: BIT(1) */
 -- 
-2.5.1
+2.5.3
 

patches/dts/0003-ARM-DTS-omap3-beagle.dts-enable-twl4030-power-reset.patch

@@ -1,15 +1,15 @@
-From e23e335e06fe769ba271c78091549696d4584016 Mon Sep 17 00:00:00 2001
+From dfa1c71729e0c7cb8b6c35ddbb351e0a55c946f3 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Fri, 2 May 2014 15:30:02 -0500
-Subject: [PATCH 03/11] ARM: DTS: omap3-beagle.dts: enable twl4030-power-reset
+Subject: [PATCH 03/10] ARM: DTS: omap3-beagle.dts: enable twl4030-power-reset
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
  arch/arm/boot/dts/omap3-beagle.dts | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
-index 637c240..fd792a4 100644
+index 2e45844a..18b178b 100644
 --- a/arch/arm/boot/dts/omap3-beagle.dts
 +++ b/arch/arm/boot/dts/omap3-beagle.dts
 @@ -271,6 +271,11 @@
@@ -25,5 +25,5 @@ index 637c240..fd792a4 100644
  };
 
 -- 
-2.5.1
+2.5.3
 

patches/dts/0004-arm-dts-omap4-move-emif-so-panda-es-b3-now-boots.patch

@@ -1,7 +1,7 @@
-From 326de104c529e24a98a7d2125e523cd34251728d Mon Sep 17 00:00:00 2001
+From 9070df4189d96cc5d783b67b9bf2d949371dea79 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Wed, 22 Apr 2015 12:06:40 -0500
-Subject: [PATCH 04/11] arm: dts: omap4: move emif so panda-es-b3 now boots
+Subject: [PATCH 04/10] arm: dts: omap4: move emif so panda-es-b3 now boots
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -213,18 +213,18 @@ index dac86ed..b68af5c 100644
 
  &keypad {
 diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
-index abc4473..092fbfc 100644
+index 5a206c1..6fa8b82 100644
 --- a/arch/arm/boot/dts/omap4.dtsi
 +++ b/arch/arm/boot/dts/omap4.dtsi
-@@ -680,6 +680,7 @@
+@@ -681,6 +681,7 @@
  			hw-caps-read-idle-ctrl;
  			hw-caps-ll-interface;
  			hw-caps-temp-alert;
 +			status = "disabled";
  		};
 
  		emif2: emif@4d000000 {
-@@ -692,6 +693,7 @@
+@@ -693,6 +694,7 @@
  			hw-caps-read-idle-ctrl;
  			hw-caps-ll-interface;
  			hw-caps-temp-alert;
@@ -233,5 +233,5 @@ index abc4473..092fbfc 100644
 
  		ocp2scp@4a0ad000 {
 -- 
-2.5.1
+2.5.3
 

patches/dts/0006-first-pass-imx6q-ccimx6sbc.patch → patches/dts/0005-first-pass-imx6q-ccimx6sbc.patch

@@ -1,7 +1,7 @@
-From 7d3db1de20623254080888dcc688202fae2e7dc3 Mon Sep 17 00:00:00 2001
+From cd4b50826b5cb411e5db3d4ae774d692974fa7b0 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Fri, 26 Jun 2015 19:58:47 -0500
-Subject: [PATCH 06/11] first pass: imx6q-ccimx6sbc
+Subject: [PATCH 05/10] first pass: imx6q-ccimx6sbc
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -332,5 +332,5 @@ index 0000000..d249240
 +	status = "okay";
 +};
 -- 
-2.5.1
+2.5.3
 

patches/dts/0007-imx6-wl1835-base-boards.patch → patches/dts/0006-imx6-wl1835-base-boards.patch

@@ -1,7 +1,7 @@
-From c38eceb01b39a8dcdeebde939d499f80f156246f Mon Sep 17 00:00:00 2001
+From aa5f5b9304db8f09ed5abaf11668bbf2af0fc6ca Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Thu, 14 May 2015 10:01:51 -0500
-Subject: [PATCH 07/11] imx6: wl1835 base boards
+Subject: [PATCH 06/10] imx6: wl1835 base boards
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -1339,5 +1339,5 @@ index 0000000..945887d
 +	status = "okay";
 +};
 -- 
-2.5.1
+2.5.3
 

patches/dts/0008-imx6q-sabresd-add-support-for-wilink8-wlan-and-bluet.patch → patches/dts/0007-imx6q-sabresd-add-support-for-wilink8-wlan-and-bluet.patch

@@ -1,7 +1,7 @@
-From 542d9fc37bf4cfb364fc00cc8dd243d4c523ccec Mon Sep 17 00:00:00 2001
+From 9f8337432c5f9415f76b50fc41a7958b3ff53f99 Mon Sep 17 00:00:00 2001
 From: Eyal Reizer <eyalr@ti.com>
 Date: Wed, 13 May 2015 17:06:48 +0300
-Subject: [PATCH 08/11] imx6q-sabresd: add support for wilink8 wlan and
+Subject: [PATCH 07/10] imx6q-sabresd: add support for wilink8 wlan and
  bluetooth
 
 * enable uart5 used for bluetooth with wilink8 with flow control
@@ -153,5 +153,5 @@ index a626e6d..862dfbd 100644
 
  &usdhc3 {
 -- 
-2.5.1
+2.5.3
 

patches/dts/0009-imx6sl-evk-add-support-for-wilink8-wlan-and-bluetoot.patch → patches/dts/0008-imx6sl-evk-add-support-for-wilink8-wlan-and-bluetoot.patch

@@ -1,7 +1,7 @@
-From 609a1ad7f95fa920caa412b30eeb86cf30db12ce Mon Sep 17 00:00:00 2001
+From 8560f6efca77e6329529f45247710864c0a9181b Mon Sep 17 00:00:00 2001
 From: Eyal Reizer <eyalr@ti.com>
 Date: Thu, 14 May 2015 17:24:26 +0300
-Subject: [PATCH 09/11] imx6sl-evk: add support for wilink8 wlan and bluetooth
+Subject: [PATCH 08/10] imx6sl-evk: add support for wilink8 wlan and bluetooth
 
 * enable uart4 used for bluetooth with wilink8 with flow control
 * configure SD3 to be used for sdio communication to wilink8 wlan
@@ -207,5 +207,5 @@ index 945887d..e5853f3 100644
 +	};
  };
 -- 
-2.5.1
+2.5.3
 

patches/dts/0010-arm-obvious.patch → patches/dts/0009-arm-obvious.patch

@@ -1,7 +1,7 @@
-From e78c7ef0abc4286b392e7873d77e21c18b15c2dc Mon Sep 17 00:00:00 2001
+From 0d28a23af7fe8220630a8d57e367d497c8c6f1b5 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Wed, 9 Sep 2015 16:44:48 -0500
-Subject: [PATCH 10/11] arm: obvious
+Subject: [PATCH 09/10] arm: obvious
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
@@ -22,5 +22,5 @@ index 6e02d22..4865389 100644
  	sun4i-a10-marsboard.dtb \
  	sun4i-a10-mini-xplus.dtb \
 -- 
-2.5.1
+2.5.3
 

patches/dts/0011-dts-am57xx-beagle-x15-make-sure-vdd_sd-is-on-fixex-v.patch → patches/dts/0010-dts-am57xx-beagle-x15-make-sure-vdd_sd-is-on-fixex-v.patch

@@ -1,7 +1,7 @@
-From 71b95811f405b5791f5cd44f66833fc73c30f1b7 Mon Sep 17 00:00:00 2001
+From 4b29d72169f102c0a80cb1143d4581d9660d2146 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Thu, 24 Sep 2015 09:49:30 -0500
-Subject: [PATCH 11/11] dts: am57xx-beagle-x15: make sure vdd_sd is on, fixex
+Subject: [PATCH 10/10] dts: am57xx-beagle-x15: make sure vdd_sd is on, fixex
  video with emmc
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -10,10 +10,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
-index 261c6ad..d9884e2 100644
+index 6a90de9..46a11ef 100644
 --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
 +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
-@@ -419,6 +419,7 @@
+@@ -406,6 +406,7 @@
  					regulator-name = "ldo1";
  					regulator-min-microvolt = <1800000>;
  					regulator-max-microvolt = <3300000>;
@@ -22,5 +22,5 @@ index 261c6ad..d9884e2 100644
  				};
 
 -- 
-2.5.1
+2.5.3
 

patches/packaging/0001-packaging-sync-builddeb-changes.patch

@@ -1,15 +1,15 @@
-From 0a717fefdb59f84604485fcb3cd863284e142ee4 Mon Sep 17 00:00:00 2001
+From 4f33c89f812e3e9f93bf0c64f8d971e2f9146aaa Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 9 Sep 2015 12:42:20 -0500
+Date: Fri, 25 Sep 2015 18:48:19 -0500
 Subject: [PATCH] packaging: sync builddeb changes
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- scripts/package/builddeb | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
+ scripts/package/builddeb | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 0cd46e1..69d8ff0d 100755
+index 0cd46e1..690996a 100755
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
 @@ -52,7 +52,7 @@ set_debarch() {
@@ -21,6 +21,15 @@ index 0cd46e1..69d8ff0d 100755
  	*)
  		debarch=$(dpkg --print-architecture)
  		echo "" >&2
+@@ -115,7 +115,7 @@ esac
+ BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
+
+ # Setup the directory structure
+-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir"
++rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
+ mkdir -m 755 -p "$tmpdir/DEBIAN"
+ mkdir -p "$tmpdir/lib" "$tmpdir/boot"
+ mkdir -p "$fwdir/lib/firmware/$version/"
 @@ -140,9 +140,18 @@ else
  fi
 
@@ -41,6 +50,15 @@ index 0cd46e1..69d8ff0d 100755
  	fi
  fi
 
+@@ -408,7 +417,7 @@ binary-arch:
+ 	\$(MAKE) KDEB_SOURCENAME=${sourcename} KDEB_PKGVERSION=${packageversion} bindeb-pkg
+
+ clean:
+-	rm -rf debian/*tmp
++	rm -rf debian/*tmp debian/files
+ 	mv debian/ debian.backup # debian/ might be cleaned away
+ 	\$(MAKE) clean
+ 	mv debian.backup debian
 -- 
-2.5.1
+2.5.3