NUC: use the common intel-corei7-64 BSP

meta-intel no longer has specific BSPs for each machine, but they
share a common BSP based on the architecture.

Change-Id: Ibbb7b8b2153103367168ea37d904ce23bc245108
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

7 files changed, 183 insertions, 0 deletions

diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
new file mode 100644
index 0000000..7bbff62
--- /dev/null
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
@@ -0,0 +1,45 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+DESCRIPTION = "Extends image_dd class to boot via GRUB-EFI and initramfs."
+LICENSE = "CLOSED"
+
+inherit image_dd
+
+EXTRA_IMAGECMD_ext3 += "-L rootfs"
+IMAGE_DEPENDS_ext3 += "initramfs-basic:do_rootfs"
+
+IMAGE_CMD_ext3_prepend() {
+
+    # https://www.kernel.org/doc/Documentation/x86/early-microcode.txt
+    microcode="${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}"
+    cat ${microcode} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz > ${IMAGE_ROOTFS}/boot/initramfs
+    chmod 0644 ${IMAGE_ROOTFS}/boot/initramfs
+}
+
+do_populate_boot() {
+
+    mkdir -p ${WORKDIR}/EFI/BOOT/
+    # Path where EFI firmware searches for EFI executable
+    cp ${DEPLOY_DIR_IMAGE}/bootx64.efi ${WORKDIR}/EFI/BOOT/
+    mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI
+}
+
diff --git a/meta-intel-extras/conf/layer.conf b/meta-intel-extras/conf/layer.conf
new file mode 100644
index 0000000..3b7be9d
--- /dev/null
+++ b/meta-intel-extras/conf/layer.conf
@@ -0,0 +1,32 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_intel"
+BBFILE_PATTERN_b2qt_intel := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_intel = "20"
diff --git a/meta-intel-extras/recipes/grub/grub-efi/grub.cfg b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
new file mode 100644
index 0000000..ca53537
--- /dev/null
+++ b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
@@ -0,0 +1,10 @@
+# Created by meta-b2qt
+serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
+default=boot
+timeout=10
+
+menuentry 'boot' {
+    linux /boot/bzImage root=LABEL=rootfs
+    initrd /boot/initramfs
+}
+
diff --git a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
new file mode 100644
index 0000000..d002240
--- /dev/null
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
@@ -0,0 +1,40 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://grub.cfg"
+
+do_deploy_prepend() {
+
+cat > ${WORKDIR}/cfg <<EOF
+search.file /boot/grub2/grub.cfg root
+set prefix=/boot/grub2
+EOF
+}
+
+do_install_append() {
+
+    install -d ${D}/boot/grub2/
+    install -m 644 ${WORKDIR}/grub.cfg ${D}/boot/grub2/
+}
+
+PACKAGES += "${PN}-config"
+FILES_${PN}-config = "/boot/grub2/"
diff --git a/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
new file mode 100644
index 0000000..65ac248
--- /dev/null
+++ b/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
@@ -0,0 +1,9 @@
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_DEBUG=n
+CONFIG_RTL8723AE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8188EE=m
diff --git a/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
new file mode 100644
index 0000000..55ac1a2
--- /dev/null
+++ b/meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend
@@ -0,0 +1,25 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://wlan-realtek.cfg \
+    "
diff --git a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
new file mode 100644
index 0000000..2346521
--- /dev/null
+++ b/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
@@ -0,0 +1,22 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+PACKAGECONFIG += "kms"