summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt-distro
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-10-31 15:15:29 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-11-01 07:55:40 +0000
commit1b57456064b33a5838882909d26f92c00982a0a0 (patch)
tree779f08ecc748ba03645563391fa195363a48ad37 /meta-boot2qt-distro
parentdd7ede32632c6452c10aa424800c60a09cc42c8a (diff)
downloadmeta-boot2qt-1b57456064b33a5838882909d26f92c00982a0a0.tar.gz
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>
Diffstat (limited to 'meta-boot2qt-distro')
-rw-r--r--meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf11
1 files changed, 5 insertions, 6 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 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -38,12 +38,11 @@ QBSP_IMAGE_CONTENT ?= "\
38 ${IMAGE_LINK_NAME}.conf \ 38 ${IMAGE_LINK_NAME}.conf \
39 " 39 "
40 40
41INITRAMFS_IMAGE = "initramfs-basic" 41INITRAMFS_IMAGE = "core-image-minimal-initramfs"
42 42
43SYSVINIT_ENABLED_GETTYS = "1" 43SYSVINIT_ENABLED_GETTYS = "1"
44 44
45MACHINE_EXTRA_INSTALL += "\
46 grub-efi-config \
47 "
48
49SERIAL_CONSOLES += "115200;ttyUSB0" 45SERIAL_CONSOLES += "115200;ttyUSB0"
46
47WKS_FILE = "systemd-bootdisk-microcode-initramfs.wks"
48WKS_FILE_DEPENDS += "microcode-initramfs"