diff options
| author | Serhii Voloshynov <serhii.voloshynov@globallogic.com> | 2020-07-20 05:45:57 -0500 |
|---|---|---|
| committer | Serhii Voloshynov <serhii.voloshynov@globallogic.com> | 2020-07-20 05:45:57 -0500 |
| commit | 8a2db2f03ee5edad89481db8c8165c61f3a386d1 (patch) | |
| tree | 995de6ce5d86280e4684b988472fe9f026243d71 /recipes-kernel/linux | |
| parent | e55908accd5443c9b15c6c4acfc121c8414c7c39 (diff) | |
| parent | 924098ad3f648f06719cee25334744c1e51bb717 (diff) | |
| download | meta-multitech-atmel-8a2db2f03ee5edad89481db8c8165c61f3a386d1.tar.gz meta-multitech-atmel-8a2db2f03ee5edad89481db8c8165c61f3a386d1.tar.bz2 meta-multitech-atmel-8a2db2f03ee5edad89481db8c8165c61f3a386d1.zip | |
Merge branch 'master' into 'vs/feature-diff-upgrade'
# Conflicts:
# recipes-kernel/linux/linux-at91_4.9.87.bb
Diffstat (limited to 'recipes-kernel/linux')
| -rw-r--r-- | recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch (renamed from recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch) | 0 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch (renamed from recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch) | 4 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-at91_4.9.87.bb | 13 |
3 files changed, 10 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch b/recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch index 6c78c81..6c78c81 100644 --- a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch +++ b/recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch diff --git a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch b/recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch index f3795b7..7ed5c9b 100644 --- a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch +++ b/recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch @@ -11,8 +11,8 @@ index 156f7f85e4860d682d679df68bfe8cfe2a3d4b3b..2474618404f5e592c0fe56d38c30c898 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -908,7 +908,7 @@ static const struct usb_device_id products[] = { - {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */ - {QMI_QUIRK_SET_DTR(0x1bc7, 0x1040, 2)}, /* Telit LE922A */ + {QMI_FIXED_INTF(0x1bc7, 0x1100, 3)}, /* Telit ME910 */ + {QMI_FIXED_INTF(0x1bc7, 0x1101, 3)}, /* Telit ME910 dual modem */ {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ - {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */ + {QMI_QUIRK_SET_DTR(0x1bc7, 0x1201, 2)}, /* Telit LE920, LE920A4 */ diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb index c6fbe36..4ae9f41 100644 --- a/recipes-kernel/linux/linux-at91_4.9.87.bb +++ b/recipes-kernel/linux/linux-at91_4.9.87.bb @@ -20,6 +20,7 @@ KERNEL_EXTRA_ARGS ="LOADADDR=0x20008000" PR = "r11" KERNEL_VERSION = "${PV}" +KERNEL_REVISION = "${PR}" EXTRAVERSION = "" SAMV = "linux4sam_5.8" @@ -42,13 +43,12 @@ COMMON_PATCHES = " \ file://linux-4.9-cdc-acm-ignore-exar-devices.patch \ file://EXTRAVERSION.patch \ file://linux-4.9-ledtrig-netdev.patch \ - file://linux-4.9-telit_print_qmi_wwan.patch \ file://linux-4.9-addl-time-for-pmeccerrloc.patch \ file://950-0090-OF-DT-Overlay-configfs-interface.patch \ file://linux-4.9-led-core-Fix-brightness-setting-when-setting-delay_off-0.patch \ file://linux-4.9-linux4sam-usb-serial-option.patch \ - file://linux-4.9-quectel_qmi_wwan_support.patch \ - file://make-kernel-reproducible.patch \ + file://0001-linux-4.9-quectel_qmi_wwan_support.patch \ + file://0002-linux-4.9-telit_print_qmi_wwan.patch \ " @@ -100,8 +100,11 @@ do_deploy_append() { fi } -# Kernel PR is used for MLINUX_KERNEL_EXTRA_VERSION; share it here: +# Files needed to build external kernel modules. do_shared_workdir_append() { + install -d -m 755 ${STAGING_KERNEL_BUILDDIR}/include/config + cp -a ${B}/include/config ${STAGING_KERNEL_BUILDDIR}/include/ + cp -a ${B}/scripts ${STAGING_KERNEL_BUILDDIR} echo ${PR} > ${STAGING_KERNEL_BUILDDIR}/mlinux_pr } @@ -154,4 +157,4 @@ do_install_append() { cp -a ${STAGING_KERNEL_DIR}/include/dt-bindings ${STAGING_DIR_TARGET}/${includedir}/linux } -FILES_kernel-dt-bindings-dev = "/usr/include/linux/dt-bindings" +FILES_kernel-dt-bindings-dev = "/usr/include/linux/dt-bindings"
\ No newline at end of file |