diff options
| author | John Klug <john.klug@multitech.com> | 2022-05-24 14:02:48 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2022-05-24 14:52:42 -0500 |
| commit | 3601f32e7e6657b8497598ec4d362ace7193a58e (patch) | |
| tree | bd34184ef8bd0266994bde68a8e99503adb40a20 | |
| parent | 7f34ce94e42c0311a1a24c5101c51fb51d649cce (diff) | |
| download | meta-multitech-atmel-3601f32e7e6657b8497598ec4d362ace7193a58e.tar.gz meta-multitech-atmel-3601f32e7e6657b8497598ec4d362ace7193a58e.tar.bz2 meta-multitech-atmel-3601f32e7e6657b8497598ec4d362ace7193a58e.zip | |
Update recipes to build linux-at91-5.4.195
3 files changed, 19 insertions, 15 deletions
diff --git a/recipes-kernel/linux/linux-at91-5.4.195/EXTRAVERSION.patch b/recipes-kernel/linux/linux-at91-5.4.195/EXTRAVERSION.patch index 9d7ca43..5aae2f8 100644 --- a/recipes-kernel/linux/linux-at91-5.4.195/EXTRAVERSION.patch +++ b/recipes-kernel/linux/linux-at91-5.4.195/EXTRAVERSION.patch @@ -14,8 +14,8 @@ index 97efb5b..5bbb760 100644 @@ -2,7 +2,7 @@ VERSION = 5 PATCHLEVEL = 4 - SUBLEVEL = 81 --EXTRAVERSION = -linux4sam-2020.10-rc5 + SUBLEVEL = 195 +-EXTRAVERSION = -linux4sam-2022.05 +EXTRAVERSION = NAME = Kleptomaniac Octopus diff --git a/recipes-kernel/linux/linux-at91-5.4.195/linux-5.4-cdc-acm-ignore-exar-devices.patch b/recipes-kernel/linux/linux-at91-5.4.195/linux-5.4-cdc-acm-ignore-exar-devices.patch index b4d68e5..bda5d85 100644 --- a/recipes-kernel/linux/linux-at91-5.4.195/linux-5.4-cdc-acm-ignore-exar-devices.patch +++ b/recipes-kernel/linux/linux-at91-5.4.195/linux-5.4-cdc-acm-ignore-exar-devices.patch @@ -7,11 +7,11 @@ Subject: [PATCH] linux-5.4-cdc-acm-ignore-exar-devices drivers/usb/class/cdc-acm.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) -diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c -index 16c98e7..422f216 100644 ---- a/drivers/usb/class/cdc-acm.c -+++ b/drivers/usb/class/cdc-acm.c -@@ -1174,8 +1174,10 @@ static int acm_probe(struct usb_interface *intf, + Updated for 5.4.195 on 24 May 2022 by John Klug +diff -Naru orig/drivers/usb/class/cdc-acm.c new/drivers/usb/class/cdc-acm.c +--- orig/drivers/usb/class/cdc-acm.c 2022-05-24 13:14:11.796098096 -0500 ++++ new/drivers/usb/class/cdc-acm.c 2022-05-24 13:15:08.688096765 -0500 +@@ -1186,8 +1186,10 @@ /* normal quirks */ quirks = (unsigned long)id->driver_info; @@ -23,8 +23,8 @@ index 16c98e7..422f216 100644 memset(&h, 0x00, sizeof(struct usb_cdc_parsed_header)); -@@ -1937,6 +1939,20 @@ static int acm_pre_reset(struct usb_interface *intf) - .driver_info = SEND_ZERO_PACKET, +@@ -1976,6 +1978,20 @@ + .driver_info = IGNORE_DEVICE, }, + /* Ignore Exar XR21V141X usb serial chips diff --git a/recipes-kernel/linux/linux-at91_5.4.195.bb b/recipes-kernel/linux/linux-at91_5.4.195.bb index a4300cf..92a352e 100644 --- a/recipes-kernel/linux/linux-at91_5.4.195.bb +++ b/recipes-kernel/linux/linux-at91_5.4.195.bb @@ -14,20 +14,21 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" RDEPENDS_kernel-modules_remove = "kernel-module-softdog" FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" -SRCREV = "6cb5b8839e5f8b9bdd69273bd396ded4f0edd09e" +SRCREV = "ae7a63c21ca8d85578db1acef1dae5a5c803a8a3" SRCREV_sama7g5ek = "d67f0979dcc377863060e803a2280b7a7e1a22c0" -PR = "r2" +PR = "r1" KERNEL_VERSION = "${PV}" KERNEL_REVISION = "${PR}" EXTRAVERSION = "" -S = "${WORKDIR}/git" +S = "${WORKDIR}/linux4sam-${PV}" KBRANCH = "linux-5.4-at91" KBRANCH_sama7g5ek-sd = "sama7g5_early" KBRANCH_sama7g5ek-emmc = "sama7g5_early" -SRC_URI = "git://github.com/linux4sam/linux-at91.git;protocol=https;branch=${KBRANCH}" +SRC_URI[sha256sum] = "93bce339c8a13ee62adb6915cb5a9f50e8d522eaa240a6f9ddb4ea6734ed9e93" +SRC_URI = "https://www.multitech.net/mlinux/sources/linux4sam-${PV}.tar.xz" SRC_URI += "file://defconfig" SRC_URI_remove_sama7g5ek = "file://defconfig" @@ -39,6 +40,9 @@ COMMON_PATCHES = " \ file://linux-5.4-export-mmc_pwrseq_alloc.patch \ file://linux-5.4-spidev_squack.patch \ file://linux-5.4-add-num_accessory_ports-config-option.patch \ +" + +xyzJAK = " \ file://linux-5.4-cdc-acm-ignore-exar-devices.patch \ file://EXTRAVERSION.patch \ file://linux-5.4-addl-time-for-pmeccerrloc.patch \ @@ -79,8 +83,8 @@ python __anonymous () { copy_mts_dts_files () { # Install MTS device tree files - cp -f ${THISDIR}/linux-at91-5.4.81/mts-dts/${MACHINE}.dts ${S}/arch/${ARCH}/boot/dts/ - cp -f ${THISDIR}/linux-at91-5.4.81/mt-at91.h ${S}/include/dt-bindings/gpio + cp -f ${THISDIR}/${PN}-${PV}/mts-dts/${MACHINE}.dts ${S}/arch/${ARCH}/boot/dts/ + cp -f ${THISDIR}/${PN}-${PV}/mt-at91.h ${S}/include/dt-bindings/gpio } python do_unpack_append () { |