10 files changed, 57 insertions, 21 deletions
diff --git a/meta-amd-bsp/conf/machine/e3000.conf b/meta-amd-bsp/conf/machine/e3000.conf
index 1d372572..8ad98f06 100644
--- a/meta-amd-bsp/conf/machine/e3000.conf
+++ b/meta-amd-bsp/conf/machine/e3000.conf
@@ -3,6 +3,7 @@
 
 #@DESCRIPTION: Machine configuration for e3000 systems
 
+require conf/machine/include/tune-zen1.inc
 require conf/machine/include/amdx86.inc
 
 # Setup a getty on all serial ports
@@ -13,3 +14,6 @@ KERNEL_SERIAL_CONSOLE ?= "console=ttyS4,115200n8"
 
 # Add machine specific AMD features and feature pkgs here
 EXTRA_IMAGE_FEATURES += "amd-feature-networking"
+
+# Enable AMD Cryptographic Co-processor Encryption Controller drivers
+MACHINE_FEATURES_append = " ccp"
diff --git a/meta-amd-bsp/conf/machine/ethanolx.conf b/meta-amd-bsp/conf/machine/ethanolx.conf
index a3e64f97..ffd3ca0d 100644
--- a/meta-amd-bsp/conf/machine/ethanolx.conf
+++ b/meta-amd-bsp/conf/machine/ethanolx.conf
@@ -3,6 +3,7 @@
 
 #@DESCRIPTION: Machine configuration for ethanolx (i.e. rome & milan) systems
 
+require conf/machine/include/tune-zen1.inc
 require conf/machine/include/amdx86.inc
 
 # Setup a getty on all serial ports
diff --git a/meta-amd-bsp/conf/machine/include/amdx86.inc b/meta-amd-bsp/conf/machine/include/amdx86.inc
index edd09756..b1562028 100644
--- a/meta-amd-bsp/conf/machine/include/amdx86.inc
+++ b/meta-amd-bsp/conf/machine/include/amdx86.inc
@@ -2,23 +2,22 @@ PREFERRED_PROVIDER_virtual/kernel ?= "${@bb.utils.contains('RT_KERNEL_AMD', 'yes
 PREFERRED_VERSION_linux-yocto ?= "5.10%"
 PREFERRED_VERSION_linux-yocto-rt ?= "5.10%"
 
-require conf/machine/include/tune-amdx86.inc
 require conf/machine/include/amd-common-configurations.inc
 include conf/machine/include/amd-customer-configurations.inc
 
 # 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)}"
 
-MACHINE_FEATURES_remove = "alsa"
+MACHINE_FEATURES_remove = "screen alsa"
 MACHINE_EXTRA_RRECOMMENDS_remove = " rtc-test alsa-utils"
 
-# Disable the graphical console, no graphics support for now
-# this allows the serial console to be used for installation
-APPEND_remove="console=tty0"
-
 # 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:"
 
 # Mask out recipes for packages we do not support for
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..83b6089e
--- /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-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..2061c604
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/tune-zen1.inc
@@ -0,0 +1,5 @@
+require conf/machine/include/tune-amd64.inc
+
+TUNEVALID[zen1] = "Enable AMD x86 (64 bit) Zen 1 Core Architecture specific optimizations"
+TUNE_FEATURES_tune-amd64 = "m64 zen1"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'zen1', ' -march=znver1', '', 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..3365f2ee
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/tune-zen2.inc
@@ -0,0 +1,5 @@
+require conf/machine/include/tune-amd64.inc
+
+TUNEVALID[zen2] = "Enable AMD x86 (64 bit) Zen 2 Core Architecture specific optimizations"
+TUNE_FEATURES_tune-amd64 = "m64 zen2"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'zen2', ' -march=znver2', '', 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..cc06af59
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/include/tune-zen3.inc
@@ -0,0 +1,5 @@
+require conf/machine/include/tune-amd64.inc
+
+TUNEVALID[zen3] = "Enable AMD x86 (64 bit) Zen 3 Core Architecture specific optimizations"
+TUNE_FEATURES_tune-amd64 = "m64 zen3"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'zen3', ' -march=znver3', '', d)}"
diff --git a/meta-amd-bsp/conf/machine/v1000.conf b/meta-amd-bsp/conf/machine/v1000.conf
index 6c322d18..7687e002 100644
--- a/meta-amd-bsp/conf/machine/v1000.conf
+++ b/meta-amd-bsp/conf/machine/v1000.conf
@@ -3,6 +3,7 @@
 
 #@DESCRIPTION: Machine configuration for v1000 systems
 
+require conf/machine/include/tune-zen1.inc
 require conf/machine/include/amdx86.inc
 
 # Setup a getty on all serial ports
diff --git a/meta-amd-bsp/conf/machine/vermeer.conf b/meta-amd-bsp/conf/machine/vermeer.conf
new file mode 100644
index 00000000..c6628524
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/vermeer.conf
@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: vermeer
+
+#@DESCRIPTION: Machine configuration for vermeer systems
+
+require conf/machine/include/tune-zen2.inc
+require conf/machine/include/amdx86.inc
+
+# Setup a getty on all serial ports
+SERIAL_CONSOLES = "115200;ttyS0"
+
+# Enable the kernel console on ttyS4/COM0
+KERNEL_SERIAL_CONSOLE ?= "console=ttyS0,115200n8"
+
+# Add screen-console to enable graphical console as well
+MACHINE_FEATURES_append = " screen-console"