From 65f827435691830403f2465f33f45915216b2b1e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 Mar 2018 14:07:27 +0200 Subject: nuc: enable boot from internal sd cardreader Include required kernel modules into initramfs and load them before trying to find the rootfs, if it happends to be in the internal SD cardreader. Task-number: QTBUG-61043 Change-Id: Iafc760e3a872566a819903c4776168a73577bb59 Reviewed-by: Ville Voutilainen --- .../recipes/initramfs-basic/init-basic.bbappend | 38 ++++++++++++++++++++++ .../initramfs-basic/init-basic/init-device.sh | 4 +++ .../initramfs-basic/initramfs-basic.bbappend | 30 +++++++++++++++++ .../recipes/linux/linux-yocto/b2qt.cfg | 2 ++ recipes/initramfs-basic/files/init.sh | 5 +++ 5 files changed, 79 insertions(+) create mode 100644 meta-intel-extras/recipes/initramfs-basic/init-basic.bbappend create mode 100644 meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh create mode 100644 meta-intel-extras/recipes/initramfs-basic/initramfs-basic.bbappend diff --git a/meta-intel-extras/recipes/initramfs-basic/init-basic.bbappend b/meta-intel-extras/recipes/initramfs-basic/init-basic.bbappend new file mode 100644 index 0000000..ab69a09 --- /dev/null +++ b/meta-intel-extras/recipes/initramfs-basic/init-basic.bbappend @@ -0,0 +1,38 @@ +############################################################################ +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://init-device.sh" + +do_install_append () { + install -m 0755 ${WORKDIR}/init-device.sh ${D}/init-device +} + +FILES_${PN} += "/init-device" diff --git a/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh b/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh new file mode 100644 index 0000000..fedc607 --- /dev/null +++ b/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +insmod /lib/modules/$(uname -r)/kernel/drivers/mfd/rtsx_pci.ko +insmod /lib/modules/$(uname -r)/kernel/drivers/mmc/host/rtsx_pci_sdmmc.ko diff --git a/meta-intel-extras/recipes/initramfs-basic/initramfs-basic.bbappend b/meta-intel-extras/recipes/initramfs-basic/initramfs-basic.bbappend new file mode 100644 index 0000000..1ac5f03 --- /dev/null +++ b/meta-intel-extras/recipes/initramfs-basic/initramfs-basic.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +PACKAGE_INSTALL += "kernel-module-rtsx-pci-sdmmc" diff --git a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg b/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg index 7902798..af765b5 100644 --- a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg +++ b/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg @@ -1 +1,3 @@ CONFIG_HID_MULTITOUCH=m +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MFD_RTSX_PCI=m diff --git a/recipes/initramfs-basic/files/init.sh b/recipes/initramfs-basic/files/init.sh index 3db235b..94eb39b 100644 --- a/recipes/initramfs-basic/files/init.sh +++ b/recipes/initramfs-basic/files/init.sh @@ -96,6 +96,11 @@ main() { early_setup read_args + + if [ -f init-device ]; then + source init-device + fi + switch_real_root } -- cgit v1.2.3-54-g00ecf From 45f1fecb444754049147506121a03a33e532285b Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 8 Mar 2018 14:00:07 +0200 Subject: quickcompiler: Update QC to 5.9.5 version Task-number: QTBUG-66252 Change-Id: I09d1699079f41b8990ae49eb0a337a32e521d5fb Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtquickcompiler_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 677d0d2..235d091 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "a9196dd301edca8c1198b24154d9e4b5faefb3a3" +SRCREV = "471b0c064d9b11c95242769d30d2ac7deca394e3" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 44896836d73b558764ab06e4ffffe212bf0330c2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 Mar 2018 10:41:01 +0200 Subject: nuc: use modprobe to load kernel module Change-Id: I7446944c7fdd1fc9bd4f01daef6723a6b5690c63 Reviewed-by: Mikko Gronoff --- meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh b/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh index fedc607..09eadbf 100644 --- a/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh +++ b/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh @@ -1,4 +1,3 @@ #!/bin/sh -insmod /lib/modules/$(uname -r)/kernel/drivers/mfd/rtsx_pci.ko -insmod /lib/modules/$(uname -r)/kernel/drivers/mmc/host/rtsx_pci_sdmmc.ko +modprobe rtsx_pci_sdmmc -- cgit v1.2.3-54-g00ecf From 0c1582ca065ba21611940f49846bd74e928b14ab Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 6 Mar 2018 12:48:06 +0200 Subject: poky: update to latest revision in morty branch Task-number: QTBUG-66252 Change-Id: Ib5e8108c1635f5036cfc99e9d2043862d6c79c7a Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 96bcf7f..8ca3ca0 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,7 +16,7 @@ Date: Mon, 26 Mar 2018 15:45:56 +0300 Subject: qtdeviceutilities: update revision Task-number: QTBUG-66280 Change-Id: I4a87babf55708d5c780b6ace336db0c48e6affa3 Reviewed-by: Ville Voutilainen --- recipes-qt/qt5/qtdeviceutilities.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb index 60b5534..4a6c8f5 100644 --- a/recipes-qt/qt5/qtdeviceutilities.bb +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -39,6 +39,6 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ade83ab2c5dc02a0e59c4abcf528bc3592179137" +SRCREV = "8f3dfc1e6364fbd1aaf62d2c0aba0e4d6ac1742f" DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf From b250388fc22322720bc73e6584c6aaa5e2c3dbe6 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 15 Mar 2018 09:52:17 +0200 Subject: meta-qt5: update meta layer - Update Qt submodules to 5.9.5 RC - Update QuickCompiler Task-number: QTBUG-66252 Change-Id: Icc3d3d9137373217cbbfd8a41a3873f46cf4e4f0 Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- scripts/manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 235d091..c5140c3 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "471b0c064d9b11c95242769d30d2ac7deca394e3" +SRCREV = "c7a681d02db3daeacd32e203a46df6415c60515e" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 8ca3ca0..ea7b114 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Wed, 11 Apr 2018 09:14:12 +0300 Subject: meta-qt5: update meta layer Update to Qt 5.9.5 RC2 (qtwebengine update) Task-number: QTBUG-66252 Change-Id: Ie47c05abb4e3a802d5b46e9ffd2af5d808c5892c Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index ea7b114..fb900be 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/>