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>

7 files changed, 46 insertions, 40 deletions

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"