From 2f745904ddf909956d325594d99840891735556b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 16 Mar 2016 09:27:00 +0200 Subject: 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 --- meta-intel-extras/classes/image_dd_efi.bbclass | 45 ++++++++++++++++++++++ meta-intel-extras/conf/layer.conf | 32 +++++++++++++++ meta-intel-extras/recipes/grub/grub-efi/grub.cfg | 10 +++++ .../recipes/grub/grub-efi_2.00.bbappend | 40 +++++++++++++++++++ .../recipes/linux/linux-yocto/wlan-realtek.cfg | 9 +++++ .../recipes/linux/linux-yocto_3.%.bbappend | 25 ++++++++++++ .../recipes/recipes-qt/qtbase_git.bbappend | 22 +++++++++++ 7 files changed, 183 insertions(+) create mode 100644 meta-intel-extras/classes/image_dd_efi.bbclass create mode 100644 meta-intel-extras/conf/layer.conf create mode 100644 meta-intel-extras/recipes/grub/grub-efi/grub.cfg create mode 100644 meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend create mode 100644 meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg create mode 100644 meta-intel-extras/recipes/linux/linux-yocto_3.%.bbappend create mode 100644 meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend (limited to 'meta-intel-extras') 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 <