X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fconf%2Finclude%2Fagl_qemux86-64.inc;h=81310001ead6463af815f543460e7db7a6dbbc86;hb=93f724675d9c47d48ea56d82843e162a12ac41b4;hp=165deae41cace1596882f29ac9d79c8a825ddd0b;hpb=b6dc44f585b839ab1a2f0133b74958037fe1cb64;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index 165deae41..81310001e 100644
--- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
@@ -3,25 +3,38 @@
 # To get wide screen than default, there are a selection of resolutions
 # available:
 #
-#APPEND += "uvesafb.mode_option=1024x768-32"
-APPEND += "uvesafb.mode_option=1280x1024-32"
-#APPEND += "uvesafb.mode_option=1600x1200-32"
+#UVESA_MODE = "1024x768-32"
+UVESA_MODE = "1280x1024-32"
+#UVESA_MODE = "1600x1200-32"
 #
 # To avoid corrupt boot screen by systemd message, you can use serial
 # console separated from VGA console or disable all boot messages by
 # kernel command line.
 #
 # Configuration for serial console
-APPEND += "console=ttyS0,115200n8"
+QB_KERNEL_CMDLINE_APPEND_append = " console=ttyS0,115200n8"
 #
 # All boot message will be off
-APPEND += "quiet"
+QB_KERNEL_CMDLINE_APPEND_append = " quiet"
 
 # Build updatable image. Only takes effect when sota.bbclass is inherited
 DISTRO_FEATURES_append = " sota"
 
+# Add firmware required by Up^2 board and default Intel mPCIe wifi card
+# sold by upshop.org
+MACHINE_EXTRA_RRECOMMENDS_append = " \
+    linux-firmware-i915 \
+    linux-firmware-rtl8168 \
+    linux-firmware-ibt-hw-37-8 \
+    linux-firmware-iwlwifi-7265d \
+    wireless-regdb-static \
+"
+
 # Image support
-AGL_EXTRA_IMAGE_FSTYPES = "wic.vmdk"
+# NOTE: wic.{xz,bmap} are here since qemu targets override
+#       AGL_DEFAULT_IMAGE_FSTYPES to not include them, but for Intel
+#       we actually do want them for use on physical hardware.
+AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'wic.vmdk.xz', 'wic.vmdk', d)}"
 IMAGE_BOOT_FILES_sota = "u-boot-qemux86-64.rom"
 
 # Root device
@@ -29,3 +42,9 @@ ROOT_VM = "root=PARTUUID=${DISK_SIGNATURE}-02"
 
 # Force the virtio video device as 'vmware' doesn't always work
 QB_OPT_APPEND_append = " -vga virtio"
+
+# DRM device weston/compositor systemd unit should depend upon
+WESTON_DRM_DEVICE = "dev-dri-card0.device"
+
+# Use our own wks file
+WKS_FILE="systemd-intel-corei7-64-bootdisk.wks"