Sanitize the version of the kernel removing dirty and at91

3 files changed, 25 insertions, 30 deletions

diff --git a/recipes-kernel/linux/linux-at91-4.9.87/EXTRAVERSION.patch b/recipes-kernel/linux/linux-at91-4.9.87/EXTRAVERSION.patch
new file mode 100644
index 0000000..3a7eb03
--- /dev/null
+++ b/recipes-kernel/linux/linux-at91-4.9.87/EXTRAVERSION.patch
@@ -0,0 +1,12 @@
+diff -Naru linux-4.9.87.orig/Makefile linux-4.9.87/Makefile
+--- linux-4.9.87.orig/Makefile	2019-01-04 18:26:08.064684388 -0600
++++ linux-4.9.87/Makefile	2019-01-04 18:26:31.408683697 -0600
+@@ -1,7 +1,7 @@
+ VERSION = 4
+ PATCHLEVEL = 9
+ SUBLEVEL = 87
+-EXTRAVERSION = -linux4sam_5.8
++#EXTRAVERSION = -linux4sam_5.8
+ NAME = Roaring Lionus
+ 
+ # *DOCUMENTATION*
diff --git a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-pps-gpio.patch b/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-pps-gpio.patch
index 554b53f..7d8881c 100644
--- a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-pps-gpio.patch
+++ b/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-pps-gpio.patch
@@ -1,3 +1,4 @@
+# It appears that capture clear is now implemented.  Keep the doc fix.
 diff -uprN old/Documentation/devicetree/bindings/pps/pps-gpio.txt new/Documentation/devicetree/bindings/pps/pps-gpio.txt
 --- old/Documentation/devicetree/bindings/pps/pps-gpio.txt	2016-09-19 09:51:11.271472335 -0500
 +++ new/Documentation/devicetree/bindings/pps/pps-gpio.txt	2016-09-19 09:49:27.283474197 -0500
@@ -7,25 +8,3 @@ diff -uprN old/Documentation/devicetree/bindings/pps/pps-gpio.txt new/Documentat
  		assert-falling-edge;
 +		capture-clear;
  	};
-diff -uprN old/drivers/pps/clients/pps-gpio.c new/drivers/pps/clients/pps-gpio.c
---- old/drivers/pps/clients/pps-gpio.c	2016-09-19 09:51:11.271472335 -0500
-+++ new/drivers/pps/clients/pps-gpio.c	2016-09-19 17:09:02.367001869 -0500
-@@ -119,6 +119,8 @@ static int pps_gpio_probe(struct platfor
- 
- 		if (of_get_property(np, "assert-falling-edge", NULL))
- 			data->assert_falling_edge = true;
-+		if (of_get_property(np, "capture-clear", NULL))
-+			data->capture_clear = true;
- 	}
- 
- 	/* GPIO setup */
-@@ -208,6 +210,8 @@ static struct platform_driver pps_gpio_d
- module_platform_driver(pps_gpio_driver);
- MODULE_AUTHOR("Ricardo Martins <rasm@fe.up.pt>");
- MODULE_AUTHOR("James Nuss <jamesnuss@nanometrics.ca>");
-+MODULE_AUTHOR("Gary Miller <gem@rellim.com>");
-+
- MODULE_DESCRIPTION("Use GPIO pin as PPS source");
- MODULE_LICENSE("GPL");
--MODULE_VERSION("1.0.0");
-+MODULE_VERSION("1.0.1");
diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb
index 8b55f61..2e73876 100644
--- a/recipes-kernel/linux/linux-at91_4.9.87.bb
+++ b/recipes-kernel/linux/linux-at91_4.9.87.bb
@@ -15,19 +15,23 @@ KERNEL_EXTRA_ARGS ="LOADADDR=0x20008000"
 
 PR = "r0"
 # PV = "4.9+git${SRCPV}"
+KERNEL_VERSION = "${PV}"
+EXTRAVERSION = ""
 
-S = "${WORKDIR}/git"
+SAMV = "linux4sam_5.8"
+S = "${WORKDIR}/linux-at91-${SAMV}"
 
 SRCREV = "29796588eb6a4c89795baaea3035764d15d0e44a"
 
 KBRANCH = "linux-4.9-at91"
-SRC_URI = "git://github.com/linux4sam/linux-at91.git;protocol=git;branch=${KBRANCH}"
-SRC_URI += "file://defconfig"
-
-# gpio set single ended required device tree changes for pull-ups
-#            file://linux-4.9-at91_gpio_set_single_ended.patch
-
-COMMON_PATCHES = "file://linux-4.9-pps-gpio.patch"
+#SRC_URI = "git://github.com/linux4sam/linux-at91.git;protocol=git;branch=${KBRANCH}"
+SRC_URI = "https://github.com/linux4sam/linux-at91/archive/${SAMV}.tar.gz"
+SRC_URI[md5sum] = "09002b6b7e5a654d65ddf3fcc9574add"
+SRC_URI[sha256sum] = "eaff5fdba506bef95ca57db1a53e19b6807bc9b090f97d3348b1712708c32d4e"
+
+COMMON_PATCHES = "file://linux-4.9-pps-gpio.patch \
+		  file://EXTRAVERSION.patch \
+		 "
 
 #            file://at91pinctrl_reprobe.patch