diff options
Diffstat (limited to 'common/conf/machine/include/amd-common-configurations.inc')
| -rw-r--r-- | common/conf/machine/include/amd-common-configurations.inc | 60 |
1 files changed, 53 insertions, 7 deletions
diff --git a/common/conf/machine/include/amd-common-configurations.inc b/common/conf/machine/include/amd-common-configurations.inc index 6fc90ba6..526fbd41 100644 --- a/common/conf/machine/include/amd-common-configurations.inc +++ b/common/conf/machine/include/amd-common-configurations.inc @@ -6,11 +6,18 @@ PREFERRED_PROVIDER_jpeg ?= "jpeg" PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" PREFERRED_VERSION_linux-yocto ?= "4.4%" PREFERRED_VERSION_libav ?= "9.18" +PREFERRED_PROVIDER_llvm ?= "llvm7" + +# Components that depend on LLVM should set versions here +# so we know what needs to be changed/validated as LLVM moves +MESA_LLVM_RELEASE_amd = "7" +CLAMAV_LLVM_RELEASE_amd = "7" MULTILIBS ?= "" require conf/multilib.conf -MACHINE_FEATURES += "wifi efi pcbios alsa" +MACHINE_FEATURES += "wifi efi alsa" +MACHINE_FEATURES += "${@'swupdate' if 'mentor-swupdate' in '${BBFILE_COLLECTIONS}'.split() else '' }" # QEMU does not support some of the enhanced instructions available # on the AMD chips which causes some build time failures. @@ -29,9 +36,7 @@ APPEND += "${KERNEL_SERIAL_CONSOLE}" # Make sure the kernel messages go to the VGA console APPEND += "console=tty0" -# Set a generic video mode, use vga=xxx for syslinux and -# gfxpayload=wxh for grub2 -SYSLINUX_KERNEL_ARGS += "vga=803" +# Set a generic video mode, use gfxpayload=wxh for grub2 GRUB_OPTS_append = ";set gfxpayload=1024x768" # We use ext4 rootfs normally so give it priority rather than trying other FS first @@ -42,12 +47,48 @@ APPEND += "${APPEND_ADDITIONAL}" EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" -IMAGE_FSTYPES += "hddimg iso" +# IMAGE_FSTYPES "live" is enabled by default in oe-core which is +# responsible for building both "iso" & "hddimg". Although the +# right way to specify which ones to build is using NOISO & NOHDD +# vars, there's a specific scenario where Toaster build artifacts +# collection mechanism depends on the IMAGE_FSTYPES variable to +# specify the image types explicitly (See: commit a5b1aa4). +# Also, "iso" doesn't get built even if specified explicitly +# because NOISO = "1" by default (See c787dcd in oe-core). +# Therefore, we do as follows: +IMAGE_FSTYPES += "wic iso" +NOISO = "0" +NOHDD = "1" + +WKS_FILES ?= "amd-usbimage.wks" + +# Contents of IMAGE_BOOT_FILES are deployed into "amd-usbimage.wks" wic image +MACHINE_BOOT_FILES = " \ + ${EFIIMGDIR}${EFIDIR}/*;EFI/BOOT/ \ + ${EFIIMGDIR}/startup.nsh;startup.nsh \ + ${KERNEL_IMAGETYPE} \ + ${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz;initrd \ + ${ROOTFS};rootfs.img \ +" +IMAGE_BOOT_FILES = "${MACHINE_BOOT_FILES}" + +# Force our swupdate implementation to not pick up boot files while creating +# the .swu otherwise we run into a circular dependency +# This can still be overridden from local.conf +SWDESC_INCLUDE_BOOT_FILES ?= "0" + +# This makes sure that boot files are deployed before do_image_wic starts execution +do_image_wic[depends] += "${IMAGE_BASENAME}:do_bootimg" IMAGE_OVERHEAD_FACTOR = "1.1" -MACHINE_FEATURES_append_amdgpu = " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "x11", "", d)}" -MACHINE_FEATURES_append_radeon = " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "x11", "", d)}" +IOT_PACKAGES_mel ?= "packagegroup-xmpp \ + packagegroup-mqtt \ + packagegroup-ble \ + packagegroup-http-restful" + +MACHINE_FEATURES_append_amdgpu := " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "x11", "", d)}" +MACHINE_FEATURES_append_radeon := " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "x11", "", d)}" # Add common feartures to be supported for all machines here EXTRA_IMAGE_FEATURES += "amd-misc-pkgs" @@ -57,3 +98,8 @@ EXTRA_IMAGE_FEATURES_append_amdgpu := " ${@bb.utils.contains("EXTRA_IMAGE_FEATUR ${@bb.utils.contains_any("EXTRA_IMAGE_FEATURES", "graphics", "amd-feature-graphics", "", d)}" EXTRA_IMAGE_FEATURES_append_radeon := " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "multimedia", "amd-feature-multimedia", "", d)} \ ${@bb.utils.contains_any("EXTRA_IMAGE_FEATURES", "graphics", "amd-feature-graphics", "", d)}" + +# Workaround for a MEL related issue +# revert as soon as the fixes are merged +# in the main layer. +dm-initramfs_mel ?= "" |