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 --- b2qt-init-build-env | 4 +- conf/bblayers.conf.intel.sample | 47 +++++++++++++++++++++ conf/bblayers.conf.nuc.sample | 48 ---------------------- conf/distro/include/intel-corei7-64.conf | 44 ++++++++++++++++++++ conf/distro/include/nuc.conf | 44 -------------------- 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 ++++++++++ meta-nuc-extras/classes/image_dd_efi.bbclass | 45 -------------------- meta-nuc-extras/conf/layer.conf | 32 --------------- meta-nuc-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 ---------- .../qt5/qtbase/intel-corei7-64/oe-device-extra.pri | 10 +++++ recipes-qt/qt5/qtbase/nuc/oe-device-extra.pri | 10 ----- recipes/adbd/files/intel-corei7-64/defaults | 4 ++ recipes/adbd/files/nuc/defaults | 4 -- scripts/manifest.xml | 2 +- scripts/manifest_jethro.xml | 2 +- scripts/setup-environment.sh | 4 +- 26 files changed, 294 insertions(+), 295 deletions(-) create mode 100644 conf/bblayers.conf.intel.sample delete mode 100644 conf/bblayers.conf.nuc.sample create mode 100644 conf/distro/include/intel-corei7-64.conf delete mode 100644 conf/distro/include/nuc.conf 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 delete mode 100644 meta-nuc-extras/classes/image_dd_efi.bbclass delete mode 100644 meta-nuc-extras/conf/layer.conf delete mode 100644 meta-nuc-extras/recipes/grub/grub-efi/grub.cfg delete mode 100644 meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend delete mode 100644 meta-nuc-extras/recipes/linux/linux-yocto/wlan-realtek.cfg delete mode 100644 meta-nuc-extras/recipes/linux/linux-yocto_3.%.bbappend delete mode 100644 meta-nuc-extras/recipes/recipes-qt/qtbase_git.bbappend create mode 100644 recipes-qt/qt5/qtbase/intel-corei7-64/oe-device-extra.pri delete mode 100644 recipes-qt/qt5/qtbase/nuc/oe-device-extra.pri create mode 100644 recipes/adbd/files/intel-corei7-64/defaults delete mode 100644 recipes/adbd/files/nuc/defaults diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 8447700..8541c72 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -113,8 +113,8 @@ get_groups() { raspberrypi|raspberrypi2|raspberrypi3) PROJECT_GROUPS="rpi" ;; - nuc) - PROJECT_GROUPS="nuc" + intel-corei7-64) + PROJECT_GROUPS="intel" ;; nvidia-logan) PROJECT_GROUPS="nvidia-logan" diff --git a/conf/bblayers.conf.intel.sample b/conf/bblayers.conf.intel.sample new file mode 100644 index 0000000..df1f544 --- /dev/null +++ b/conf/bblayers.conf.intel.sample @@ -0,0 +1,47 @@ +############################################################################## +## +## 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$ +## +############################################################################## + +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "6" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" +BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" + +BBLAYERS ?= " \ + ${BSPDIR}/sources/poky/meta \ + ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/meta-intel \ + ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ + ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ + ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ + ${BSPDIR}/sources/meta-b2qt \ + ${BSPDIR}/sources/meta-b2qt/meta-intel-extras \ + ${BSPDIR}/sources/meta-mingw \ + ${BSPDIR}/sources/meta-qt5 \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ${BSPDIR}/sources/poky/meta \ + ${BSPDIR}/sources/poky/meta-yocto \ + " diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.nuc.sample deleted file mode 100644 index 90998fb..0000000 --- a/conf/bblayers.conf.nuc.sample +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################## -## -## 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$ -## -############################################################################## - -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "6" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" - -BBLAYERS ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - ${BSPDIR}/sources/meta-intel \ - ${BSPDIR}/sources/meta-intel/meta-nuc \ - ${BSPDIR}/sources/meta-openembedded/meta-oe \ - ${BSPDIR}/sources/meta-openembedded/meta-python \ - ${BSPDIR}/sources/meta-openembedded/meta-networking \ - ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ - ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ - ${BSPDIR}/sources/meta-b2qt \ - ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \ - ${BSPDIR}/sources/meta-mingw \ - ${BSPDIR}/sources/meta-qt5 \ - " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf new file mode 100644 index 0000000..8a41388 --- /dev/null +++ b/conf/distro/include/intel-corei7-64.conf @@ -0,0 +1,44 @@ +############################################################################## +## +## 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$ +## +############################################################################## + +DEPLOY_CONF_NAME = "Intel NUC" + +DISTRO_FEATURES_DEFAULT += "wayland weston" + +DISTRO_FEATURES_remove = "usbgadget" + +IMAGE_CLASSES += "image_dd_efi" +IMAGE_FSTYPES += "ext3 dd" + +INITRAMFS_IMAGE = "initramfs-basic" + +SYSVINIT_ENABLED_GETTYS = "1" + +MACHINE_EXTRA_INSTALL = "\ + wayland \ + mesa-megadriver \ + grub-efi-config \ + " + +MACHINE_EXTRA_INSTALL_SDK = " \ + mesa-dev \ + " + diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/nuc.conf deleted file mode 100644 index 8a41388..0000000 --- a/conf/distro/include/nuc.conf +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################## -## -## 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$ -## -############################################################################## - -DEPLOY_CONF_NAME = "Intel NUC" - -DISTRO_FEATURES_DEFAULT += "wayland weston" - -DISTRO_FEATURES_remove = "usbgadget" - -IMAGE_CLASSES += "image_dd_efi" -IMAGE_FSTYPES += "ext3 dd" - -INITRAMFS_IMAGE = "initramfs-basic" - -SYSVINIT_ENABLED_GETTYS = "1" - -MACHINE_EXTRA_INSTALL = "\ - wayland \ - mesa-megadriver \ - grub-efi-config \ - " - -MACHINE_EXTRA_INSTALL_SDK = " \ - mesa-dev \ - " - 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 < ${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-nuc-extras/conf/layer.conf b/meta-nuc-extras/conf/layer.conf deleted file mode 100644 index f0cb66f..0000000 --- a/meta-nuc-extras/conf/layer.conf +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################## -## -## 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_nuc" -BBFILE_PATTERN_b2qt_nuc := "^${LAYERDIR}/" -BBFILE_PRIORITY_b2qt_nuc = "20" diff --git a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg b/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg deleted file mode 100644 index ca53537..0000000 --- a/meta-nuc-extras/recipes/grub/grub-efi/grub.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# 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-nuc-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend deleted file mode 100644 index d002240..0000000 --- a/meta-nuc-extras/recipes/grub/grub-efi_2.00.bbappend +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################## -## -## 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 < + groups="notdefault,intel"/> + groups="notdefault,intel"/>