12 files changed, 116 insertions, 36 deletions
diff --git a/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc b/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
index 9152fe3f..0d216749 100644
--- a/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
+++ b/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
@@ -1,12 +1,9 @@
 require conf/machine/include/amd-features.inc
 
-POKY_DEFAULT_DISTRO_FEATURES_remove = "wayland"
+POKY_DEFAULT_DISTRO_FEATURES:remove = "wayland"
 
-PREFERRED_VERSION_grub-efi ?= "2.02"
-PREFERRED_VERSION_grub ?= "2.02"
 PREFERRED_PROVIDER_jpeg ?= "jpeg"
 PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native"
-PREFERRED_VERSION_linux-yocto ?= "5.4%"
 
 MULTILIBS ?= ""
 require conf/multilib.conf
@@ -15,12 +12,11 @@ MACHINE_FEATURES += "wifi efi alsa"
 
 # 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_FEATURES:remove = "qemu-usermode"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules alsa-utils"
 MACHINE_EXTRA_RRECOMMENDS += "grub parted util-linux-blkid"
-MACHINE_EXTRA_RRECOMMENDS += "rtc-test watchdog-test spi-test smbus-test gpio-test"
-MACHINE_EXTRA_RRECOMMENDS += "amd-spi"
+MACHINE_EXTRA_RRECOMMENDS += "rtc-test watchdog-test smbus-test gpio-test"
 
 # Add serial consoles to kernel commandline, these should occur before the tty0
 KERNEL_SERIAL_CONSOLE ??= ""
@@ -30,7 +26,7 @@ APPEND += "${KERNEL_SERIAL_CONSOLE}"
 APPEND += "console=tty0"
 
 # Set a generic video mode, use gfxpayload=wxh for grub2
-GRUB_OPTS_append = ";set gfxpayload=1024x768"
+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"
@@ -38,7 +34,7 @@ APPEND += "rootfstype=ext4,ext3,ext2"
 APPEND_ADDITIONAL ??= ""
 APPEND += "${APPEND_ADDITIONAL}"
 
-EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
+EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi"
 
 # Add common feartures to be supported for all machines here
 EXTRA_IMAGE_FEATURES += "amd-misc-pkgs"
diff --git a/meta-amd-bsp/conf/machine/include/amd-features.inc b/meta-amd-bsp/conf/machine/include/amd-features.inc
index 0ac536b2..61ad06a4 100644
--- a/meta-amd-bsp/conf/machine/include/amd-features.inc
+++ b/meta-amd-bsp/conf/machine/include/amd-features.inc
@@ -63,8 +63,7 @@ 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("IMAGE_FEATURES", "x11-base", "mesa-demos", "", d)}"
-FEATURE_PACKAGES_amd-feature-graphics_append_radeon = " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "mesa-demos", "", d)}"
+FEATURE_PACKAGES_amd-feature-graphics:append:radeon = " ${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "mesa-demos", "", d)}"
 
 FEATURE_PACKAGES_amd-feature-networking = "\
     ${DPDK_PKGS} \
diff --git a/meta-amd-bsp/conf/machine/include/amdx86.inc b/meta-amd-bsp/conf/machine/include/amdx86.inc
index 67933d74..db824e36 100644
--- a/meta-amd-bsp/conf/machine/include/amdx86.inc
+++ b/meta-amd-bsp/conf/machine/include/amdx86.inc
@@ -1,20 +1,17 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "${@bb.utils.contains('RT_KERNEL_AMD', 'yes', "linux-yocto-rt", "linux-yocto", d)}"
-PREFERRED_VERSION_linux-yocto ?= "5.4%"
-PREFERRED_VERSION_linux-yocto-rt ?= "5.4%"
 
-require conf/machine/include/tune-amdx86.inc
 require conf/machine/include/amd-common-configurations.inc
 include conf/machine/include/amd-customer-configurations.inc
 
-MACHINE_FEATURES_remove = "alsa"
-MACHINE_EXTRA_RRECOMMENDS_remove = " rtc-test alsa-utils"
+# Add machine specific AMD features and feature pkgs here
+DPDK_PKGS = "${@bb.utils.contains("BBFILE_COLLECTIONS", "dpdk", "dpdk dpdk-examples dpdk-tools dpdk-module", "", d)}"
 
-# Disable the graphical console, no graphics support for now
-# this allows the serial console to be used for installation
-APPEND_remove="console=tty0"
+MACHINE_FEATURES:remove = "screen alsa"
+MACHINE_EXTRA_RRECOMMENDS:remove = " rtc-test alsa-utils"
 
-# Drop features we do not need
-DISTRO_FEATURES_remove="opengl x11 alsa pulseaudio"
+# Disable the graphical console when machine does not have a screen.
+# This allows the serial console to be used for installation.
+APPEND:remove="${@bb.utils.contains('MACHINE_FEATURES', 'screen-console', '', 'console=tty0', d)}"
 
 MACHINEOVERRIDES =. "amd:amdx86:"
 
diff --git a/meta-amd-bsp/conf/machine/include/ethanolx.inc b/meta-amd-bsp/conf/machine/include/ethanolx.inc
new file mode 100644
index 00000000..1e174c72
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/ethanolx.inc
@@ -0,0 +1,9 @@
+require conf/machine/include/x86/x86-base.inc
+
+# Setup a getty on all serial ports
+SERIAL_CONSOLES = "115200;ttyS0"
+
+# Enable the kernel console on ttyS0
+APPEND += "console=tty0 console=ttyS0,115200n8"
+
+MACHINE_FEATURES += "efi"
diff --git a/meta-amd-bsp/conf/machine/include/fox.inc b/meta-amd-bsp/conf/machine/include/fox.inc
new file mode 100644
index 00000000..a108c399
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/fox.inc
@@ -0,0 +1,9 @@
+require conf/machine/include/x86/x86-base.inc
+
+# ttyS4 is J39 on the board
+SERIAL_CONSOLES = "115200;ttyS4"
+
+# Enable the kernel console on ttyS4
+APPEND += "console=tty0 console=ttyS4,115200n8"
+
+MACHINE_FEATURES += "efi"
diff --git a/meta-amd-bsp/conf/machine/include/quartz.inc b/meta-amd-bsp/conf/machine/include/quartz.inc
new file mode 100644
index 00000000..231aeb2f
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/quartz.inc
@@ -0,0 +1,7 @@
+require conf/machine/include/x86/x86-base.inc
+
+SERIAL_CONSOLES = "115200;ttyS0"
+
+APPEND += "console=tty0 console=ttyS0,115200n8"
+
+MACHINE_FEATURES += "efi"
diff --git a/meta-amd-bsp/conf/machine/include/tune-amd64.inc b/meta-amd-bsp/conf/machine/include/tune-amd64.inc
new file mode 100644
index 00000000..4debbf2a
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/tune-amd64.inc
@@ -0,0 +1,15 @@
+DEFAULTTUNE ?= "amd64"
+
+require conf/machine/include/x86/arch-x86.inc
+require conf/machine/include/x86/x86-base.inc
+
+# AMD x86 64-bit
+TUNEVALID[amd64] = "Enable AMD x86 (64 bit) specific processor optimizations"
+TUNECONFLICTS[amd64] = "m32 mx32"
+
+# Extra tune selections
+AVAILTUNES += "amd64"
+TUNE_FEATURES:tune-amd64 = "m64"
+BASE_LIB:tune-amd64 = "lib64"
+TUNE_PKGARCH:tune-amd64 = "amd64"
+PACKAGE_EXTRA_ARCHS:tune-amd64 = "${TUNE_PKGARCH:tune-amd64}"
diff --git a/meta-amd-bsp/conf/machine/include/tune-amdx86.inc b/meta-amd-bsp/conf/machine/include/tune-amdx86.inc
deleted file mode 100644
index 4d1816c5..00000000
--- a/meta-amd-bsp/conf/machine/include/tune-amdx86.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFAULTTUNE ?= "dbfp5"
-
-require conf/machine/include/x86/arch-x86.inc
-require conf/machine/include/x86-base.inc
-# AMD DB-FP5 64bit (amdx86)
-TUNEVALID[dbfp5] = "Enable AMD DB-FP5 (64 bit) specific processor optimizations"
-TUNECONFLICTS[dbfp5] = "m32 mx32"
-TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "dbfp5", " -march=znver1", "", d)}"
-
-# Extra tune selections
-AVAILTUNES += "dbfp5"
-TUNE_FEATURES_tune-dbfp5 = "m64 dbfp5"
-BASE_LIB_tune-dbfp5 = "lib64"
-TUNE_PKGARCH_tune-dbfp5 = "dbfp5"
-PACKAGE_EXTRA_ARCHS_tune-dbfp5 = "${TUNE_PKGARCH_tune-dbfp5}"
diff --git a/meta-amd-bsp/conf/machine/include/tune-zen1.inc b/meta-amd-bsp/conf/machine/include/tune-zen1.inc
new file mode 100644
index 00000000..3dd48f7b
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/tune-zen1.inc
@@ -0,0 +1,18 @@
+DEFAULTTUNE ?= "zen1"
+
+require conf/machine/include/x86/arch-x86.inc
+
+TUNEVALID[zen1] = "Enable AMD x86 (64 bit) Zen 1 Core Architecture specific optimizations"
+TUNECONFLICTS[zen1] = "m32 mx32"
+
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'zen1', ' -march=znver1', '', d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'zen1', 'zen1:', '', d)}"
+
+AVAILTUNES += "zen1"
+TUNE_FEATURES:tune-zen1         = "${TUNE_FEATURES:tune-x86-64} zen1"
+TUNE_PKGARCH:tune-zen1          = "zen1"
+PACKAGE_EXTRA_ARCHS:tune-zen1   = "${PACKAGE_EXTRA_ARCHS:tune-x86-64} zen1"
+BASE_LIB:tune-zen1              = "lib64"
+
+# user mode qemu doesn't support zen1
+MACHINE_FEATURES_BACKFILL_CONSIDERED:append = " ${@bb.utils.contains('TUNE_FEATURES', 'zen1', 'qemu-usermode', '', d)}"
diff --git a/meta-amd-bsp/conf/machine/include/tune-zen2.inc b/meta-amd-bsp/conf/machine/include/tune-zen2.inc
new file mode 100644
index 00000000..64666204
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/tune-zen2.inc
@@ -0,0 +1,19 @@
+DEFAULTTUNE ?= "zen2"
+
+require conf/machine/include/tune-zen1.inc
+
+TUNEVALID[zen2] = "Enable AMD x86 (64 bit) Zen 2 Core Architecture specific optimizations"
+TUNECONFLICTS[zen2] = "m32 mx32"
+
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'zen2', ' -march=znver2', '', d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'zen2', 'zen2:', '', d)}"
+
+AVAILTUNES += "zen2"
+TUNE_FEATURES:tune-zen2         = "${TUNE_FEATURES:tune-x86-64} zen2"
+TUNE_PKGARCH:tune-zen2          = "zen2"
+PACKAGE_EXTRA_ARCHS:tune-zen2   = "${PACKAGE_EXTRA_ARCHS:tune-zen1} zen2"
+BASE_LIB:tune-zen2              = "lib64"
+
+# user mode qemu doesn't support zen2
+MACHINE_FEATURES_BACKFILL_CONSIDERED:append = " ${@bb.utils.contains('TUNE_FEATURES', 'zen2', 'qemu-usermode', '', d)}"
+
diff --git a/meta-amd-bsp/conf/machine/include/tune-zen3.inc b/meta-amd-bsp/conf/machine/include/tune-zen3.inc
new file mode 100644
index 00000000..81f6b507
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/tune-zen3.inc
@@ -0,0 +1,19 @@
+DEFAULTTUNE ?= "zen3"
+
+require conf/machine/include/tune-zen2.inc
+
+TUNEVALID[zen3] = "Enable AMD x86 (64 bit) Zen 3 Core Architecture specific optimizations"
+TUNECONFLICTS[zen3] = "m32 mx32"
+
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'zen3', ' -march=znver3', '', d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'zen3', 'zen3:', '', d)}"
+
+AVAILTUNES += "zen3"
+TUNE_FEATURES:tune-zen3         = "${TUNE_FEATURES:tune-x86-64} zen3"
+TUNE_PKGARCH:tune-zen3          = "zen3"
+PACKAGE_EXTRA_ARCHS:tune-zen3   = "${PACKAGE_EXTRA_ARCHS:tune-zen2} zen3"
+BASE_LIB:tune-zen3              = "lib64"
+
+# user mode qemu doesn't support zen3
+MACHINE_FEATURES_BACKFILL_CONSIDERED:append = " ${@bb.utils.contains('TUNE_FEATURES', 'zen3', 'qemu-usermode', '', d)}"
+
diff --git a/meta-amd-bsp/conf/machine/include/wallaby.inc b/meta-amd-bsp/conf/machine/include/wallaby.inc
new file mode 100644
index 00000000..8f8da791
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/wallaby.inc
@@ -0,0 +1,7 @@
+require conf/machine/include/x86/x86-base.inc
+
+SERIAL_CONSOLES = "115200;ttyS4 115200;ttyS5"
+
+APPEND += "console=tty0 console=ttyS4,115200n8"
+
+MACHINE_FEATURES += "efi"