diff options
Diffstat (limited to 'common/conf/machine/include')
-rw-r--r-- | common/conf/machine/include/amd-common-configurations.inc | 105 | ||||
-rw-r--r-- | common/conf/machine/include/amd-features.inc | 76 |
2 files changed, 0 insertions, 181 deletions
diff --git a/common/conf/machine/include/amd-common-configurations.inc b/common/conf/machine/include/amd-common-configurations.inc deleted file mode 100644 index 526fbd41..00000000 --- a/common/conf/machine/include/amd-common-configurations.inc +++ /dev/null @@ -1,105 +0,0 @@ -require conf/machine/include/amd-features.inc - -POKY_DEFAULT_DISTRO_FEATURES_remove = "wayland" - -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 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. -MACHINE_FEATURES_remove = "qemu-usermode" - -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules alsa-utils" -MACHINE_EXTRA_RRECOMMENDS += "${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "vdpauinfo", "", d)} grub parted util-linux-blkid" -MACHINE_EXTRA_RRECOMMENDS += "rtc-test watchdog-test spi-test smbus-test gpio-test" -MACHINE_EXTRA_RRECOMMENDS += "amd-wdt amd-spi" -MACHINE_EXTRA_RRECOMMENDS += "${@bb.utils.contains_any("DISTRO", "mel mel-lite", "firmware-wireless", "", d)}" - -# Add serial consoles to kernel commandline, these should occur before the tty0 -KERNEL_SERIAL_CONSOLE ??= "" -APPEND += "${KERNEL_SERIAL_CONSOLE}" - -# Make sure the kernel messages go to the VGA console -APPEND += "console=tty0" - -# 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 -APPEND += "rootfstype=ext4,ext3,ext2" - -APPEND_ADDITIONAL ??= "" -APPEND += "${APPEND_ADDITIONAL}" - -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" - -# 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" - -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" - -# Add the basic features we know these overrides support -EXTRA_IMAGE_FEATURES_append_amdgpu := " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "multimedia", "amd-feature-multimedia", "", d)} \ - ${@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 ?= "" diff --git a/common/conf/machine/include/amd-features.inc b/common/conf/machine/include/amd-features.inc deleted file mode 100644 index 22385922..00000000 --- a/common/conf/machine/include/amd-features.inc +++ /dev/null @@ -1,76 +0,0 @@ -# This file defines AMD Features that can be added as EXTRA_IMAGE_FEATURES to -# different machines based on what is supported on a machine (MACHINE_FEATURES) -# and which additional features a user is requesting through EXTRA_IMAGE_FEATURES. -# This gives a broad flexibility and control over packages being installed on a -# machine for any image without needing to create bbappends for all the images -# that are to be supported. -# -# > Each feature can contain packages and packagegroups as its components. -# > Feature components can be dependent on DISTRO, EXTRA_IMAGE_FEATURES, or any -# variable in general other than a particular image's related variable so most -# things should be based on global configs rather than image configs. -# e.g.: Components of "amd-feature-graphics" may be dependent on "graphics" as -# an EXTRA_IMAGE_FEATURE. Some packages may only be included for a specific -# DISTRO. Some packages may only be installed if user allows them in local.conf etc. -# > Each machine must add the requested features to EXTRA_IMAGE_FEATURES in its -# own machine config file regardless of the image being built, if that particular -# feature is not handled in the common fragments. -# > Each machine can also override feature components in its own machine config -# when adding the feature to EXTRA_IMAGE_FEATURES. e.g.: A feature may be added -# to a specific machine with minimal (or extended) packages based on requirement. -# -# Features are classified as: -# -# * amd-misc-pkgs : Intended for Platform Specific Packages, Common Packages to be added to all machines, etc. -# * amd-feature-multimedia : Multimedia packages (it does not depend on graphics because a machine may not have a GUI but could play videos and sounds from console) -# * amd-feature-graphics : Graphics packages -# * amd-feature-networking : Networking packages -# * amd-feature-debug-profile : Debugging and Profiling tools -# * <add more features here> : <feature summary> - -GSTREAMER_PKGS ?= " \ - ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "gstreamer1.0-meta-x11-base", "", d)} \ - ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "gstreamer1.0-meta-audio", "", d)} \ - gstreamer1.0-meta-debug \ - gstreamer1.0-meta-video \ - ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "gstreamer1.0-omx", "", d)} \ - ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "gstreamer1.0-vaapi", "", d)} \ -" -VULKAN_PKGS ?= "" -CODEXL_PKGS ?= "" -DPDK_PKGS ?= "" - -# Additional packages can be added to the following feature specific -# variables from each machine's config file -AMD_PLATFORM_SPECIFIC_PKGS ?= "" -AMD_FEATURE_MULTIMEDIA_PKGS ?= "" -AMD_FEATURE_GRAPHICS_PKGS ?= "" -AMD_FEATURE_NETWORKING_PKGS ?= "" -AMD_FEATURE_DEBUG_PROFILE_PKGS ?= "" - -FEATURE_PACKAGES_amd-misc-pkgs = "\ - bc \ - ${AMD_PLATFORM_SPECIFIC_PKGS} \ -" - -FEATURE_PACKAGES_amd-feature-multimedia = "\ - ${@bb.utils.contains("DISTRO", "mel", "${GSTREAMER_PKGS}", "", d)} \ - ${AMD_FEATURE_MULTIMEDIA_PKGS} \ -" - -FEATURE_PACKAGES_amd-feature-graphics = "\ - ${@bb.utils.contains("INCLUDE_VULKAN", "yes", "${VULKAN_PKGS}", "", d)} \ - ${AMD_FEATURE_GRAPHICS_PKGS} \ -" -FEATURE_PACKAGES_amd-feature-graphics_append_amdgpu = " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "mesa-demos", "", d)}" -FEATURE_PACKAGES_amd-feature-graphics_append_radeon = " ${@bb.utils.contains("EXTRA_IMAGE_FEATURES", "graphics", "mesa-demos", "", d)}" - -FEATURE_PACKAGES_amd-feature-networking = "\ - ${@bb.utils.contains("DISTRO", "mel", "${DPDK_PKGS} strongswan", "", d)} \ - ${AMD_FEATURE_NETWORKING_PKGS} \ -" - -FEATURE_PACKAGES_amd-feature-debug-profile = "\ - ${@bb.utils.contains("INCLUDE_CODEXL", "yes", "${CODEXL_PKGS}", "", d)} \ - ${AMD_FEATURE_DEBUG_PROFILE_PKGS} \ -" |