5 files changed, 26 insertions, 10 deletions
diff --git a/meta-amd-bsp/conf/machine/e3000.conf b/meta-amd-bsp/conf/machine/e3000.conf
index 30279e6e..1d372572 100644
--- a/meta-amd-bsp/conf/machine/e3000.conf
+++ b/meta-amd-bsp/conf/machine/e3000.conf
@@ -13,4 +13,3 @@ KERNEL_SERIAL_CONSOLE ?= "console=ttyS4,115200n8"
 
 # Add machine specific AMD features and feature pkgs here
 EXTRA_IMAGE_FEATURES += "amd-feature-networking"
-DPDK_PKGS = "${@bb.utils.contains("BBFILE_COLLECTIONS", "dpdk", "dpdk dpdk-examples dpdk-test", "", d)}"
diff --git a/meta-amd-bsp/conf/machine/rome.conf b/meta-amd-bsp/conf/machine/ethanolx.conf
index 1859880d..a3e64f97 100644
--- a/meta-amd-bsp/conf/machine/rome.conf
+++ b/meta-amd-bsp/conf/machine/ethanolx.conf
@@ -1,7 +1,7 @@
 #@TYPE: Machine
-#@NAME: rome
+#@NAME: ethanolx
 
-#@DESCRIPTION: Machine configuration for rome systems
+#@DESCRIPTION: Machine configuration for ethanolx (i.e. rome & milan) systems
 
 require conf/machine/include/amdx86.inc
 
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..4c8cc1b8 100644
--- a/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
+++ b/meta-amd-bsp/conf/machine/include/amd-common-configurations.inc
@@ -2,11 +2,11 @@ require conf/machine/include/amd-features.inc
 
 POKY_DEFAULT_DISTRO_FEATURES_remove = "wayland"
 
-PREFERRED_VERSION_grub-efi ?= "2.02"
-PREFERRED_VERSION_grub ?= "2.02"
+PREFERRED_VERSION_grub-efi ?= "2.04%"
+PREFERRED_VERSION_grub ?= "2.04%"
 PREFERRED_PROVIDER_jpeg ?= "jpeg"
 PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native"
-PREFERRED_VERSION_linux-yocto ?= "5.4%"
+PREFERRED_VERSION_linux-yocto ?= "5.10%"
 
 MULTILIBS ?= ""
 require conf/multilib.conf
@@ -19,8 +19,7 @@ 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 ??= ""
diff --git a/meta-amd-bsp/conf/machine/include/amdx86.inc b/meta-amd-bsp/conf/machine/include/amdx86.inc
index 67933d74..edd09756 100644
--- a/meta-amd-bsp/conf/machine/include/amdx86.inc
+++ b/meta-amd-bsp/conf/machine/include/amdx86.inc
@@ -1,11 +1,14 @@
 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%"
+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_EXTRA_RRECOMMENDS_remove = " rtc-test alsa-utils"
 
diff --git a/meta-amd-bsp/conf/machine/v1000.conf b/meta-amd-bsp/conf/machine/v1000.conf
new file mode 100644
index 00000000..6c322d18
--- /dev/null
+++ b/meta-amd-bsp/conf/machine/v1000.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: v1000
+
+#@DESCRIPTION: Machine configuration for v1000 systems
+
+require conf/machine/include/amdx86.inc
+
+# Setup a getty on all serial ports
+SERIAL_CONSOLES = "115200;ttyS4 115200;ttyS5"
+
+# Enable the kernel console on ttyS4/COM0
+KERNEL_SERIAL_CONSOLE ?= "console=ttyS4,115200n8"
+
+# Add machine specific AMD features and feature pkgs here
+EXTRA_IMAGE_FEATURES += "amd-feature-networking"