intel: rework initramfs support

The WKS image creation ignored our old initramfs. Change to using
an existing core-image-minimal-initramfs recipe and extend it with
support for the internal MMC reader. Add separate recipe to combine
the intel microcode and the new initramfs, and add wks file to use it.
Remove all old recipes that are no longer used.

Change-Id: I4e1f244685a7f2bd304aa23d9e07580fa9dc9652
Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

11 files changed, 51 insertions, 246 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
index 64432d3..8d106ce 100644
--- a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
+++ b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 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.
@@ -38,12 +38,11 @@ QBSP_IMAGE_CONTENT ?= "\
     ${IMAGE_LINK_NAME}.conf \
     "
 
-INITRAMFS_IMAGE = "initramfs-basic"
+INITRAMFS_IMAGE = "core-image-minimal-initramfs"
 
 SYSVINIT_ENABLED_GETTYS = "1"
 
-MACHINE_EXTRA_INSTALL += "\
-        grub-efi-config \
-        "
-
 SERIAL_CONSOLES += "115200;ttyUSB0"
+
+WKS_FILE = "systemd-bootdisk-microcode-initramfs.wks"
+WKS_FILE_DEPENDS += "microcode-initramfs"
diff --git a/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh b/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
deleted file mode 100644
index 94eb39b..0000000
--- a/meta-boot2qt/recipes-core/initramfs-basic/files/init.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ROOT_MOUNT="/sysroot/"
-ROOT_DEVICE=""
-
-early_setup() {
-
-    mkdir -p /proc
-    mkdir -p /sys
-    mount -t proc proc /proc
-    mount -t sysfs sysfs /sys
-    mount -t devtmpfs none /dev
-
-    mkdir -p /run
-    mkdir -p /var/run
-}
-
-read_args() {
-
-    for arg in $(cat /proc/cmdline); do
-        value=$(echo ${arg} | cut -s -f2- -d '=')
-        case $arg in
-            root=*)
-                root=$value
-                ;;
-            debugshell*)
-                if [ -z "$value" ]; then
-                     shelltimeout=30
-                else
-                     shelltimeout=$value
-                fi
-                ;;
-        esac
-    done
-
-    if [ -z "$root" ] ; then
-        debug_shell "No root= specified via kernel command line."
-    else
-        case $root in
-            LABEL=*)
-                label=${root#LABEL=}
-                ;;
-            *)
-                debug_shell "This init script only supports root=LABEL=* for specifying root file system, but root=$root was provided."
-                ;;
-        esac
-    fi
-}
-
-mount_rootfs() {
-
-    mkdir -p $ROOT_MOUNT
-    mount $ROOT_DEVICE $ROOT_MOUNT
-    mount -n --move /proc $ROOT_MOUNT/proc
-    mount -n --move /sys $ROOT_MOUNT/sys
-    mount -n --move /dev $ROOT_MOUNT/dev
-
-    exec switch_root $ROOT_MOUNT /sbin/init || debug_shell "Couldn't switch_root."
-}
-
-switch_real_root() {
-
-    echo "Searching for media..."
-    C=0
-    while true
-    do
-
-    rootfs=$(findfs LABEL=$label)
-    if [ -n "$rootfs" ] ; then
-        ROOT_DEVICE=$rootfs
-        mount_rootfs
-    fi
-
-    # don't wait for more than $shelltimeout seconds, if it's set
-    if [ -n "$shelltimeout" ]; then
-        echo -n " " $(( $shelltimeout - $C ))
-        if [ $C -ge $shelltimeout ]; then
-            debug_shell "Cannot find root file system."
-        fi
-        C=$(( C + 1 ))
-    fi
-
-    sleep 1
-    done
-}
-
-debug_shell() {
-
-    echo ${1}
-    echo "Dropping to a shell."
-    exec sh
-}
-
-main() {
-
-    early_setup
-    read_args
-
-    if [ -f init-device ]; then
-        source init-device
-    fi
-
-    switch_real_root
-}
-
-main
diff --git a/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb b/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb
deleted file mode 100644
index 39d590a..0000000
--- a/meta-boot2qt/recipes-core/initramfs-basic/init-basic.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-SUMMARY = "Simple init script that mounts root filesystem by label."
-LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
-SRC_URI = "file://init.sh"
-
-S = "${WORKDIR}"
-
-do_install () {
-    install -m 0755 ${WORKDIR}/init.sh ${D}/init
-}
-
-inherit allarch
-
-FILES_${PN} += "/init"
diff --git a/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb b/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb
deleted file mode 100644
index 283a681..0000000
--- a/meta-boot2qt/recipes-core/initramfs-basic/initramfs-basic.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-DESCRIPTION = "Basic initramfs image. Useful as a template for more advanced functionality."
-LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
-
-# findfs from busybox fails to do its jobs, the full version from util-linux-findfs works fine
-PACKAGE_INSTALL = "init-basic busybox util-linux-findfs ${ROOTFS_BOOTSTRAP_INSTALL}"
-
-# Do not pollute the initramfs image with rootfs features
-IMAGE_FEATURES = ""
-
-export IMAGE_BASENAME = "initramfs-basic"
-IMAGE_LINGUAS = ""
-
-IMAGE_FSTYPES = "cpio.gz"
-inherit core-image
-
-IMAGE_ROOTFS_SIZE = "8192"
-IMAGE_ROOTFS_EXTRA_SPACE = "0"
-
-BAD_RECOMMENDATIONS += "busybox-syslog"
-
diff --git a/meta-intel-extras/recipes/grub/grub-efi/grub.cfg b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
deleted file mode 100644
index 287cf7c..0000000
--- a/meta-intel-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=0
-
-menuentry 'boot' {
-    linux /boot/bzImage root=LABEL=rootfs
-    initrd /boot/initramfs
-}
-
diff --git a/meta-intel-extras/recipes/initramfs-basic/initramfs-basic.bbappend b/meta-intel-extras/recipes/images/core-image-minimal-initramfs.bbappend
index 1ac5f03..c1918ba 100644
--- a/meta-intel-extras/recipes/initramfs-basic/initramfs-basic.bbappend
+++ b/meta-intel-extras/recipes/images/core-image-minimal-initramfs.bbappend
@@ -27,4 +27,5 @@
 ##
 ############################################################################
 
+INITRAMFS_SCRIPTS += "initramfs-module-rtsx-pci-sdmmc"
 PACKAGE_INSTALL += "kernel-module-rtsx-pci-sdmmc"
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
deleted file mode 100644
index 09eadbf..0000000
--- a/meta-intel-extras/recipes/initramfs-basic/init-basic/init-device.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-modprobe rtsx_pci_sdmmc
diff --git a/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rtsx_pci_sdmmc b/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rtsx_pci_sdmmc
new file mode 100644
index 0000000..dd14d6d
--- /dev/null
+++ b/meta-intel-extras/recipes/initrdscripts/initramfs-framework/rtsx_pci_sdmmc
@@ -0,0 +1,8 @@
+#!/bin/sh
+rtsx_pci_sdmmc_enabled() {
+    return 0
+}
+
+rtsx_pci_sdmmc_run() {
+    load_kernel_module rtsx_pci_sdmmc
+}
diff --git a/meta-intel-extras/recipes/initramfs-basic/init-basic.bbappend b/meta-intel-extras/recipes/initrdscripts/initramfs-framework_1.0.bbappend
index ab69a09..cfd05cd 100644
--- a/meta-intel-extras/recipes/initramfs-basic/init-basic.bbappend
+++ b/meta-intel-extras/recipes/initrdscripts/initramfs-framework_1.0.bbappend
@@ -29,10 +29,14 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += "file://init-device.sh"
+SRC_URI += "file://rtsx_pci_sdmmc"
 
-do_install_append () {
-    install -m 0755 ${WORKDIR}/init-device.sh ${D}/init-device
+do_install_append() {
+    install -m 0755 ${WORKDIR}/rtsx_pci_sdmmc ${D}/init.d/20-rtsx_pci_sdmmc
 }
 
-FILES_${PN} += "/init-device"
+PACKAGES += "initramfs-module-rtsx-pci-sdmmc"
+
+SUMMARY_initramfs-module-rtsx-pci-sdmmc = "initramfs support for rtsx_pci_sdmmc"
+RDEPENDS_initramfs-module-rtsx-pci-sdmmc = "${PN}-base"
+FILES_initramfs-module-rtsx-pci-sdmmc = "/init.d/20-rtsx_pci_sdmmc"
diff --git a/meta-intel-extras/recipes/grub/grub-efi_%.bbappend b/meta-intel-extras/recipes/microcode-initramfs/microcode-initramfs.bb
index f3a95f2..8682c27 100644
--- a/meta-intel-extras/recipes/grub/grub-efi_%.bbappend
+++ b/meta-intel-extras/recipes/microcode-initramfs/microcode-initramfs.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 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.
@@ -27,33 +27,26 @@
 ##
 ############################################################################
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://grub.cfg"
+SUMMARY = "Initramfs with early load intel microcode"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
 
-do_install[depends] += " \
-    virtual/kernel:do_deploy \
+inherit deploy nopackages
+
+do_compile[depends] += " \
     ${INITRAMFS_IMAGE}:do_image_complete \
     ${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', 'intel-microcode:do_deploy', '', d)} \
-"
-
-do_deploy_prepend() {
+    "
 
-cat > ${WORKDIR}/cfg <<EOF
-search.file /boot/grub2/grub.cfg root
-set prefix=/boot/grub2
-EOF
+do_compile() {
+    # https://www.kernel.org/doc/Documentation/x86/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 > ${S}/microcode-initramfs
 }
 
-do_install_append() {
-
-    install -d ${D}/boot/grub2/
-    install -m 644 ${WORKDIR}/grub.cfg ${D}/boot/grub2/
-
-    # 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 > ${D}/boot/initramfs
-    chmod 0644 ${D}/boot/initramfs
+do_deploy() {
+    install -d ${DEPLOYDIR}
+    install -m 0644 ${S}/microcode-initramfs ${DEPLOYDIR}/
 }
 
-PACKAGES += "${PN}-config"
-FILES_${PN}-config = "/boot/grub2/ /boot/initramfs"
+addtask deploy before do_build after do_compile
diff --git a/meta-intel-extras/wic/systemd-bootdisk-microcode-initramfs.wks b/meta-intel-extras/wic/systemd-bootdisk-microcode-initramfs.wks
new file mode 100644
index 0000000..4907631
--- /dev/null
+++ b/meta-intel-extras/wic/systemd-bootdisk-microcode-initramfs.wks
@@ -0,0 +1,13 @@
+# short-description: Create an EFI disk image with systemd-boot
+# long-description: Creates a partitioned EFI disk image that the user
+# can directly dd to boot media. The selected bootloader is systemd-boot.
+# It also includes intel-microcode as an initrd for early update support.
+# Based on OE-core's systemd-bootdisk.wks file.
+
+part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode-initramfs" --ondisk sda --label msdos --active --align 1024 --use-uuid
+
+part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
+
+part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid
+
+bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0"