76 files changed, 300 insertions, 184 deletions
diff --git a/BUILD.md b/BUILD.md
index cde6c762..0a92b55c 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -7,7 +7,7 @@ a selected AMD machine, and will start a build:
 
 ### 2.1. Select a target machine
 
-Set the environment variable `MACHINE` to the `ethanolx` bsp that you want
+Set the environment variable `MACHINE` to one of the supported AMD machines (i.e `vermeer` or `ethanolx`) that you want
 to build an image for (change the `<machine-name>` in the following example
 accordingly):
 ```sh
diff --git a/CUSTOMIZE.md b/CUSTOMIZE.md
index 56bce704..76156f27 100644
--- a/CUSTOMIZE.md
+++ b/CUSTOMIZE.md
@@ -37,12 +37,12 @@ target.
 
 #### Supported software features
 
-| Software feature      | Configuration variable      | Configuration values | Default value | Supported machines     |
-|:----------------------|:----------------------------|:---------------------|:--------------|:-----------------------|
-| ON-TARGET DEVELOPMENT | EXTRA_IMAGE_FEATURES_append | tools-sdk            |               | ethanolx (milan, rome) |
-| ON-TARGET DEBUGGING   | EXTRA_IMAGE_FEATURES_append | tools-debug          |               | ethanolx (milan, rome) |
-| ON-TARGET PROFILING   | EXTRA_IMAGE_FEATURES_append | tools-profile        |               | ethanolx (milan, rome) |
-| RT KERNEL             | RT_KERNEL_AMD               | yes, no              | no            | ethanolx (milan, rome) |
+| Software feature      | Configuration variable      | Configuration values | Default value | Supported machines              |
+|:----------------------|:----------------------------|:---------------------|:--------------|:--------------------------------|
+| ON-TARGET DEVELOPMENT | EXTRA_IMAGE_FEATURES_append | tools-sdk            |               | ethanolx (milan, rome), vermeer |
+| ON-TARGET DEBUGGING   | EXTRA_IMAGE_FEATURES_append | tools-debug          |               | ethanolx (milan, rome), vermeer |
+| ON-TARGET PROFILING   | EXTRA_IMAGE_FEATURES_append | tools-profile        |               | ethanolx (milan, rome), vermeer |
+| RT KERNEL             | RT_KERNEL_AMD               | yes, no              | no            | ethanolx (milan, rome), vermeer |
 
 #### Example configuration in local.conf
 ```sh
@@ -55,6 +55,32 @@ EXTRA_IMAGE_FEATURES_append = " tools-profile"
 RT_KERNEL_AMD = "yes"
 ```
 
+Furthermore, the `vermeer` platform does not have an on-board RS232
+serial port. Therefore, the graphical console is enabled on this
+machine by default and the user is required to interact with the
+machine using a display device plugged into a dGPU connected via the
+PCIe slot.
+
+In case the user does not have a dGPU, and wants to interact with the
+machine over the RS232 serial interface, the user needs to have an
+`LPC to UART Adapter` module plugged into the LPC header on the
+motherboard.
+
+Using a serial cable connected between the host machine's RS232 port
+and this module, the user will be able to interact with the machine
+using the serial interface, but will still not be able to install the
+OS to a harddrive using the serial interface. For that, the graphical
+console has to be disabled. In order to achieve that, add the
+following to the `local.conf` and rebuild an image.
+
+```sh
+MACHINE_FEATURES_remove = "screen-console"
+```
+
+The resulting image will have no graphical console support and will
+only have the serial console support. After this, the user will also
+be able to install the OS to a harddrive using the serial interface.
+
 ---
 #### What's next
 
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
index fcb6efc6..658ac360 100644
--- a/DOCUMENTATION.md
+++ b/DOCUMENTATION.md
@@ -3,12 +3,12 @@
 This section lists the links to official documentation of various
 features, and user guide to Yocto Project and it's build system.
 
-| Feature                                      | Documentation                                                     | Comments |
-|:---------------------------------------------|:------------------------------------------------------------------|:---------|
-| Yocto Project – Overview and Concepts Manual | https://docs.yoctoproject.org/3.3/overview-manual/index.html      |          |
-| Yocto Project – Quick Build                  | https://docs.yoctoproject.org/3.3/brief-yoctoprojectqs/index.html |          |
-| Yocto Project – Toaster Manual               | https://docs.yoctoproject.org/3.3/toaster-manual/index.html       |          |
-| Yocto Project – SDK Manual                   | https://docs.yoctoproject.org/3.3/sdk-manual/index.html           |          |
-| KGDB                                         | https://www.kernel.org/doc/html/v5.10/dev-tools/kgdb.html         |          |
-| LTTng                                        | https://lttng.org/docs/v2.12                                      |          |
-| DPDK                                         | https://doc.dpdk.org/guides-20.11                                 |          |
+| Feature                                      | Documentation                                                       | Comments |
+|:---------------------------------------------|:--------------------------------------------------------------------|:---------|
+| Yocto Project – Overview and Concepts Manual | https://docs.yoctoproject.org/3.3.2/overview-manual/index.html      |          |
+| Yocto Project – Quick Build                  | https://docs.yoctoproject.org/3.3.2/brief-yoctoprojectqs/index.html |          |
+| Yocto Project – Toaster Manual               | https://docs.yoctoproject.org/3.3.2/toaster-manual/index.html       |          |
+| Yocto Project – SDK Manual                   | https://docs.yoctoproject.org/3.3.2/sdk-manual/index.html           |          |
+| KGDB                                         | https://www.kernel.org/doc/html/v5.10/dev-tools/kgdb.html           |          |
+| LTTng                                        | https://lttng.org/docs/v2.12                                        |          |
+| DPDK                                         | https://doc.dpdk.org/guides-20.11                                   |          |
diff --git a/FEATURES.md b/FEATURES.md
index ae6903a8..0c0057f2 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -4,102 +4,104 @@ This section lists the features supported on the AMD machines. In each
 machine column, a 'Y' represents that the feature in this row is supported
 on this machine.
 
-| Category                        | Feature                                 | MILAN | ROME |
-|:--------------------------------|:----------------------------------------|:-----:|:----:|
-| Images                          |                                         |       |      |
-|                                 | core-image-sato                         |       |      |
-|                                 | core-image-base                         | Y     | Y    |
-| Images Types                    |                                         |       |      |
-|                                 | WIC                                     | Y     | Y    |
-|                                 | ISO                                     | Y     | Y    |
-| Board Devices                   |                                         |       |      |
-|                                 | USB 2.0 Host                            | Y     | Y    |
-|                                 | USB 3.0 Host (MSC)                      | Y     | Y    |
-|                                 | USB 3.1 Host                            |       |      |
-|                                 | NVMe                                    | Y     | Y    |
-|                                 | M.2 SATA                                |       |      |
-|                                 | I2C                                     | Y     | Y    |
-|                                 | UART                                    | Y     | Y    |
-|                                 | eMMC                                    |       |      |
-|                                 | SMP                                     | Y     | Y    |
-|                                 | SPI                                     | Y     | Y    |
-| I/O                             |                                         |       |      |
-|                                 | USB Host                                | Y     | Y    |
-|                                 | USB Mass Storage                        | Y     | Y    |
-|                                 | Audio                                   |       |      |
-|                                 | UART                                    | Y     | Y    |
-|                                 | Bluetooth                               |       |      |
-|                                 | USB Wi-Fi                               |       |      |
-|                                 | HDD/SATA                                | Y     | Y    |
-|                                 | SD/MMC                                  |       |      |
-| Networking                      |                                         |       |      |
-|                                 | Ethernet                                |       |      |
-|                                 | SGMII                                   |       |      |
-|                                 | RGMII                                   |       |      |
-| Network Protocols               |                                         |       |      |
-|                                 | IPv4                                    | Y     | Y    |
-|                                 | IPv6                                    | Y     | Y    |
-| General Purpose Kernel Features |                                         |       |      |
-|                                 | Control Groups                          | Y     | Y    |
-|                                 | CPU Hot Plugging                        | Y     | Y    |
-|                                 | High Resolution Timers (HRT)            | Y     | Y    |
-|                                 | POSIX Message Queues & Semaphores       | Y     | Y    |
-|                                 | Prioritized OOM Killer                  | Y     | Y    |
-|                                 | Symmetric Multi-Processing (SMP)        | Y     | Y    |
-|                                 | Native POSIX Thread Library             | Y     | Y    |
-| Kernel Preemption               |                                         |       |      |
-|                                 | Preemptive Kernel (Low-Latency Desktop) | Y     | Y    |
-|                                 | Fully Preemptible Kernel (RT)           | Y     | Y    |
-| Filesystems                     |                                         |       |      |
-|                                 | Devtmpfs                                | Y     | Y    |
-|                                 | EXT2                                    | Y     | Y    |
-|                                 | EXT3                                    | Y     | Y    |
-|                                 | EXT4                                    | Y     | Y    |
-|                                 | FAT                                     | Y     | Y    |
-|                                 | NFSv3                                   | Y     | Y    |
-|                                 | ProcFS                                  | Y     | Y    |
-|                                 | RamFS                                   | Y     | Y    |
-|                                 | SysFS                                   | Y     | Y    |
-|                                 | tmpfs                                   | Y     | Y    |
-| HID (Input Devices)             |                                         |       |      |
-|                                 | Input Core (CONFIG_INPUT)               | Y     | Y    |
-|                                 | Mouse Interface                         |       |      |
-|                                 | Keyboards                               | Y     | Y    |
-|                                 | Touchscreen                             |       |      |
-| Display Device Support          |                                         |       |      |
-|                                 | DP                                      |       |      |
-|                                 | HDMI                                    |       |      |
-| Kernel Debug/Trace              |                                         |       |      |
-|                                 | KGDB                                    | Y     | Y    |
-|                                 | LTTng - Kernel Tracing                  | Y     | Y    |
-|                                 | LTTng - Userspace Tracing               | Y     | Y    |
-| USB Protocols                   |                                         |       |      |
-|                                 | USB 2.0                                 | Y     | Y    |
-|                                 | USB 3.0                                 | Y     | Y    |
-|                                 | USB 3.1                                 |       |      |
-| Sound Support                   |                                         |       |      |
-|                                 | ALSA                                    |       |      |
-| Multimedia Support              |                                         |       |      |
-|                                 | Accelerated gstreamer                   |       |      |
-|                                 | Unaccelerated gstreamer                 |       |      |
-|                                 | OMX                                     |       |      |
-|                                 | VDPAU                                   |       |      |
-|                                 | VAAPI                                   |       |      |
-|                                 | mesa (accelerated graphics)             |       |      |
-|                                 | unaccelerated graphics                  |       |      |
-|                                 | Vulkan                                  |       |      |
-|                                 | multi-display                           |       |      |
-|                                 | CodeXL                                  |       |      |
-|                                 | RGP                                     |       |      |
-|                                 | MP4                                     |       |      |
-|                                 | MPEG2                                   |       |      |
-|                                 | MPEG4                                   |       |      |
-|                                 | VC-1                                    |       |      |
-|                                 | H.264                                   |       |      |
-|                                 | H.265                                   |       |      |
-|                                 | ROCm-OpenCL                             |       |      |
-| Network Security                |                                         |       |      |
-|                                 | IPSEC (strongswan)                      |       |      |
-|                                 | DPDK                                    |       |      |
-| Kernel Virtualization           |                                         |       |      |
-|                                 | KVM                                     | Y     | Y    |
+| Category                        | Feature                                 | MILAN | ROME | VERMEER |
+|:--------------------------------|:----------------------------------------|:-----:|:----:|:-------:|
+| Images                          |                                         |       |      |         |
+|                                 | core-image-sato                         |       |      |         |
+|                                 | core-image-base                         | Y     | Y    | Y       |
+| Images Types                    |                                         |       |      |         |
+|                                 | WIC                                     | Y     | Y    | Y       |
+|                                 | ISO                                     | Y     | Y    | Y       |
+| Board Devices                   |                                         |       |      |         |
+|                                 | USB 2.0 Host                            | Y     | Y    | Y       |
+|                                 | USB 3.0 Host (MSC)                      | Y     | Y    | Y       |
+|                                 | USB 3.1 Host                            |       |      | Y       |
+|                                 | USB Type C                              |       |      | Y       |
+|                                 | NVMe                                    | Y     | Y    | Y       |
+|                                 | M.2 SATA                                |       |      | Y       |
+|                                 | I2C                                     | Y     | Y    | Y       |
+|                                 | UART                                    | Y     | Y    |         |
+|                                 | eMMC                                    |       |      |         |
+|                                 | SMP                                     | Y     | Y    | Y       |
+|                                 | SPI                                     | Y     | Y    | Y       |
+| I/O                             |                                         |       |      |         |
+|                                 | USB Host                                | Y     | Y    | Y       |
+|                                 | USB Mass Storage                        | Y     | Y    | Y       |
+|                                 | Audio                                   |       |      |         |
+|                                 | UART                                    | Y     | Y    | Y*      |
+|                                 | _* via LPC to UART Adapter module_      |       |      |         |
+|                                 | Bluetooth                               |       |      |         |
+|                                 | USB Wi-Fi                               |       |      |         |
+|                                 | HDD/SATA                                | Y     | Y    | Y       |
+|                                 | SD/MMC                                  |       |      |         |
+| Networking                      |                                         |       |      |         |
+|                                 | Ethernet                                |       |      | Y       |
+|                                 | SGMII                                   |       |      | Y       |
+|                                 | RGMII                                   |       |      | Y       |
+| Network Protocols               |                                         |       |      |         |
+|                                 | IPv4                                    | Y     | Y    | Y       |
+|                                 | IPv6                                    | Y     | Y    | Y       |
+| General Purpose Kernel Features |                                         |       |      |         |
+|                                 | Control Groups                          | Y     | Y    | Y       |
+|                                 | CPU Hot Plugging                        | Y     | Y    | Y       |
+|                                 | High Resolution Timers (HRT)            | Y     | Y    | Y       |
+|                                 | POSIX Message Queues & Semaphores       | Y     | Y    | Y       |
+|                                 | Prioritized OOM Killer                  | Y     | Y    | Y       |
+|                                 | Symmetric Multi-Processing (SMP)        | Y     | Y    | Y       |
+|                                 | Native POSIX Thread Library             | Y     | Y    | Y       |
+| Kernel Preemption               |                                         |       |      |         |
+|                                 | Preemptive Kernel (Low-Latency Desktop) | Y     | Y    | Y       |
+|                                 | Fully Preemptible Kernel (RT)           | Y     | Y    | Y       |
+| Filesystems                     |                                         |       |      |         |
+|                                 | Devtmpfs                                | Y     | Y    | Y       |
+|                                 | EXT2                                    | Y     | Y    | Y       |
+|                                 | EXT3                                    | Y     | Y    | Y       |
+|                                 | EXT4                                    | Y     | Y    | Y       |
+|                                 | FAT                                     | Y     | Y    | Y       |
+|                                 | NFSv3                                   | Y     | Y    | Y       |
+|                                 | ProcFS                                  | Y     | Y    | Y       |
+|                                 | RamFS                                   | Y     | Y    | Y       |
+|                                 | SysFS                                   | Y     | Y    | Y       |
+|                                 | tmpfs                                   | Y     | Y    | Y       |
+| HID (Input Devices)             |                                         |       |      |         |
+|                                 | Input Core (CONFIG_INPUT)               | Y     | Y    | Y       |
+|                                 | Mouse Interface                         |       |      |         |
+|                                 | Keyboards                               | Y     | Y    | Y       |
+|                                 | Touchscreen                             |       |      |         |
+| Display Device Support          |                                         |       |      |         |
+|                                 | DP                                      |       |      |         |
+|                                 | HDMI                                    |       |      |         |
+| Kernel Debug/Trace              |                                         |       |      |         |
+|                                 | KGDB                                    | Y     | Y    | Y       |
+|                                 | LTTng - Kernel Tracing                  | Y     | Y    | Y       |
+|                                 | LTTng - Userspace Tracing               | Y     | Y    | Y       |
+| USB Protocols                   |                                         |       |      |         |
+|                                 | USB 2.0                                 | Y     | Y    | Y       |
+|                                 | USB 3.0                                 | Y     | Y    | Y       |
+|                                 | USB 3.1                                 |       |      | Y       |
+| Sound Support                   |                                         |       |      |         |
+|                                 | ALSA                                    |       |      |         |
+| Multimedia Support              |                                         |       |      |         |
+|                                 | Accelerated gstreamer                   |       |      |         |
+|                                 | Unaccelerated gstreamer                 |       |      |         |
+|                                 | OMX                                     |       |      |         |
+|                                 | VDPAU                                   |       |      |         |
+|                                 | VAAPI                                   |       |      |         |
+|                                 | mesa (accelerated graphics)             |       |      |         |
+|                                 | unaccelerated graphics                  |       |      |         |
+|                                 | Vulkan                                  |       |      |         |
+|                                 | multi-display                           |       |      |         |
+|                                 | CodeXL                                  |       |      |         |
+|                                 | RGP                                     |       |      |         |
+|                                 | MP4                                     |       |      |         |
+|                                 | MPEG2                                   |       |      |         |
+|                                 | MPEG4                                   |       |      |         |
+|                                 | VC-1                                    |       |      |         |
+|                                 | H.264                                   |       |      |         |
+|                                 | H.265                                   |       |      |         |
+|                                 | ROCm-OpenCL                             |       |      |         |
+| Network Security                |                                         |       |      |         |
+|                                 | IPSEC (strongswan)                      |       |      |         |
+|                                 | DPDK                                    |       |      |         |
+| Kernel Virtualization           |                                         |       |      |         |
+|                                 | KVM                                     | Y     | Y    | Y       |
diff --git a/RELEASE.md b/RELEASE.md
index 65019784..635923f1 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,24 +1,24 @@
 # Release notes
 
-This is the release notes document for the AMD machine ETHANOLX. This document
+This is the release notes document for the AMD machine VERMEER. This document
 contains information about the Yocto layers' git repos, their branches
 and commit hashes, software versions, and known/fixed issues/limitations.
 
 ## Bitbake layers
 | Layer             | Git Repo                                     | Branch    | Commit Hash/Tag                          |
 |:------------------|:---------------------------------------------|:----------|:-----------------------------------------|
-| poky              | git://git.yoctoproject.org/poky              | hardknott | tags/yocto-3.3                           |
-| meta-openembedded | git://git.openembedded.org/meta-openembedded | hardknott | cf5bd6a8308108b4313a1e45ce8aa87e73125bf9 |
-| meta-dpdk         | git://git.yoctoproject.org/meta-dpdk         | master    | c011004a49ffb1304f376f0fdc65066913102d5f |
-| meta-amd          | git://git.yoctoproject.org/meta-amd          | hardknott | tags/hardknott-ethanolx-ga-202107                                     |
+| poky              | git://git.yoctoproject.org/poky              | hardknott | tags/yocto-3.3.2                         |
+| meta-openembedded | git://git.openembedded.org/meta-openembedded | hardknott | aaa1c12b2cdea197d420953c8df873e8af5cc507 |
+| meta-dpdk         | git://git.yoctoproject.org/meta-dpdk         | hardknott | c011004a49ffb1304f376f0fdc65066913102d5f |
+| meta-amd          | git://git.yoctoproject.org/meta-amd          | hardknott | tags/hardknott-vermeer-ga-202110                                     |
 
 ## Software versions
 | Software        | Version  |
 |:----------------|:---------|
-| Yocto Poky base | 3.3      |
+| Yocto Poky base | 3.3.2    |
 | grub            | 2.06-rc1 |
-| linux-yocto     | 5.10.25  |
-| linux-yocto-rt  | 5.10.25  |
+| linux-yocto     | 5.10.47  |
+| linux-yocto-rt  | 5.10.47  |
 | gcc             | 10.2.0   |
 | util-linux      | 2.36.2   |
 | lttng           | 2.12     |
@@ -29,13 +29,16 @@ and commit hashes, software versions, and known/fixed issues/limitations.
 | strongswan      | 5.9.2    |
 
 ## Fixed issues
-| __ETHANOLX Fixed Issues__ |
-|:--------------------------|
-| None                      |
+| __VERMEER Fixed Issues__ |
+|:-------------------------|
+| None                     |
 
 ## Known issues
-| __ETHANOLX Known Issues/Limitations__                                                       |
-|:--------------------------------------------------------------------------------------------|
-| Network is detected from only one NIC card when two NIC cards are connected on the platform |
-| AMD SPI Kernel Driver fails to access the SPI ROM registers                                 |
-| _** Workaround: Disable ‘Rom Armor’ setting under ‘Chipset’ tab in BIOS_                    |
+| __VERMEER Known Issues/Limitations__                                                                                                                                                                            |
+|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| The Qogir board for Vermeer does not have an RS232/UART serial port/header.                                                                                                                                     |
+| _** Workaround: Use an LPC to UART Adapter module for serial communication_                                                                                                                                     |
+| The serial communication from a host machine with Vermeer using an LPC to UART Adapter module may not work properly with some hosts because the module lacks Hardware Flow Control signals such as CTS and RTS. |
+| _** Workaround: Connect the RTS & CTS pins on the host side with each other in order to achieve a No Handshake based serial communication_                                                                      |
+| Install option in the GRUB menu does not work by default using the serial interface and only works on the graphical console.                                                                                    |
+| _** Workaround: Disable the graphical console by setting `MACHINE_FEATURES_remove = “screen-console”` in the `local.conf` and rebuild an image_                                                                 |
diff --git a/SETUP.md b/SETUP.md
index 0257f4b4..4e589640 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -2,22 +2,22 @@
 
 Building images for AMD machines requires setting up the Yocto Project
 Build System. Please follow the guidelines on
-[Yocto Project Overview and Concepts Manual](https://docs.yoctoproject.org/3.3/overview-manual/index.html)
-and [Yocto Project Quick Build Guide](https://docs.yoctoproject.org/3.3/brief-yoctoprojectqs/index.html)
+[Yocto Project Overview and Concepts Manual](https://docs.yoctoproject.org/3.3.2/overview-manual/index.html)
+and [Yocto Project Quick Build Guide](https://docs.yoctoproject.org/3.3.2/brief-yoctoprojectqs/index.html)
 if you are not familiar with the Yocto Project and it's Build System.
 
 Running the following commands will setup the build system and will
-enable us to build recipes & images for the `ethanolx` bsp.
+enable us to build recipes & images for any of the supported AMD machines (i.e `vermeer` or `ethanolx`).
 
 ### 1.1 Prerequisites
 
 Install the build system's dependencies:
 ```sh
-sudo apt install -y gawk wget git-core diffstat unzip texinfo \
-     gcc-multilib build-essential chrpath socat cpio python3 \
-     python3-pip python3-pexpect xz-utils debianutils iputils-ping \
-     python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 \
-     xterm python3-subunit mesa-common-dev
+sudo apt install -y gawk wget git diffstat unzip texinfo gcc \
+     build-essential chrpath socat cpio python3 python3-pip \
+     python3-pexpect xz-utils debianutils iputils-ping python3-git \
+     python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 xterm \
+     python3-subunit mesa-common-dev
 ```
 
 ### 1.2 Download the build system and the meta-data layers
@@ -34,7 +34,7 @@ git clone --single-branch --branch "${YOCTO_BRANCH}" \
 cd poky-amd-${YOCTO_BRANCH}
 git clone --single-branch --branch "${YOCTO_BRANCH}" \
     "git://git.openembedded.org/meta-openembedded"
-git clone --single-branch --branch master \
+git clone --single-branch --branch "${YOCTO_BRANCH}" \
     "git://git.yoctoproject.org/meta-dpdk"
 git clone --single-branch --branch "${YOCTO_BRANCH}" \
     "git://git.yoctoproject.org/meta-amd"
@@ -42,13 +42,13 @@ git clone --single-branch --branch "${YOCTO_BRANCH}" \
 
 Checkout commit hashes:
 ```sh
-git checkout --quiet tags/yocto-3.3
+git checkout --quiet tags/yocto-3.3.2
 cd meta-openembedded
-git checkout --quiet cf5bd6a8308108b4313a1e45ce8aa87e73125bf9
+git checkout --quiet aaa1c12b2cdea197d420953c8df873e8af5cc507
 cd ../meta-dpdk
 git checkout --quiet c011004a49ffb1304f376f0fdc65066913102d5f
 cd ../meta-amd
-git checkout --quiet tags/hardknott-ethanolx-ga-202107
+git checkout --quiet tags/hardknott-vermeer-ga-202110
 cd ..
 ```
 
diff --git a/meta-amd-bsp/README.md b/meta-amd-bsp/README.md
index 7dc8dd9e..1ade6fca 100644
--- a/meta-amd-bsp/README.md
+++ b/meta-amd-bsp/README.md
@@ -12,6 +12,7 @@ The supported AMD machines/platforms are:
 
 * ethanolx  - AMD EPYC™ 7003 Series (a.k.a. milan)
 * ethanolx  - AMD EPYC™ 7002 Series (a.k.a. rome)
+* vermeer  -  AMD Ryzen™ 9 5950X
 
 Please see the README file contained in the root meta-amd directory
 for general information and usage details.
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"
diff --git a/meta-amd-bsp/dpdk/recipes-extended/dpdk/dpdk_20.11.1.bbappend b/meta-amd-bsp/dpdk/recipes-extended/dpdk/dpdk_20.11.1.bbappend
index 88cfca79..87c1b92f 100644
--- a/meta-amd-bsp/dpdk/recipes-extended/dpdk/dpdk_20.11.1.bbappend
+++ b/meta-amd-bsp/dpdk/recipes-extended/dpdk/dpdk_20.11.1.bbappend
@@ -1,5 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
 DEPENDS += "openssl"
 
+SRC_URI_append_v1000 = " file://0001-axgbe_ethdev.c-use-RV-AXGBE-as-pci_search_device-doe.patch"
+
 RDEPENDS_dpdk-tools += "\
   python3-shell \
   python3-json \
diff --git a/meta-amd-bsp/dpdk/recipes-extended/dpdk/files/0001-axgbe_ethdev.c-use-RV-AXGBE-as-pci_search_device-doe.patch b/meta-amd-bsp/dpdk/recipes-extended/dpdk/files/0001-axgbe_ethdev.c-use-RV-AXGBE-as-pci_search_device-doe.patch
new file mode 100644
index 00000000..16460072
--- /dev/null
+++ b/meta-amd-bsp/dpdk/recipes-extended/dpdk/files/0001-axgbe_ethdev.c-use-RV-AXGBE-as-pci_search_device-doe.patch
@@ -0,0 +1,41 @@
+From f5def6aa0d45b545f77e47bade5ff79e17a1a4ff Mon Sep 17 00:00:00 2001
+From: "Arsalan H. Awan" <Arsalan_Awan@mentor.com>
+Date: Wed, 4 Aug 2021 14:29:45 +0500
+Subject: [PATCH] axgbe_ethdev.c: use RV AXGBE as pci_search_device doesnt work
+ well
+
+As Yocto is a custom OS, and pci_search_device doesnt work well on
+custom OS, as a temporary solution, we remove the pci_search_device
+and SNOWY AXGBE, and hardcode it with RV AXGBE for V1000.
+
+Signed-off-by: Arsalan H. Awan <Arsalan_Awan@mentor.com>
+---
+ drivers/net/axgbe/axgbe_ethdev.c | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
+index 9cd056d04a..081f4fe2d3 100644
+--- a/drivers/net/axgbe/axgbe_ethdev.c
++++ b/drivers/net/axgbe/axgbe_ethdev.c
+@@ -1984,15 +1984,10 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
+ 	pdata->pci_dev = pci_dev;
+ 
+ 	/*
+-	 * Use root complex device ID to differentiate RV AXGBE vs SNOWY AXGBE
++	 * Patch for RV AXGBE. This does not work for SNOWY AXGBE
+ 	 */
+-	if (pci_search_device(AMD_PCI_RV_ROOT_COMPLEX_ID)) {
+-		pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;
+-		pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;
+-	} else {
+-		pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
+-		pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
+-	}
++	pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;
++	pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;
+ 
+ 	pdata->xgmac_regs =
+ 		(void *)pci_dev->mem_resource[AXGBE_AXGMAC_BAR].addr;
+-- 
+2.25.1
+
diff --git a/meta-amd-bsp/recipes-bsp/formfactor/formfactor/vermeer/machconfig b/meta-amd-bsp/recipes-bsp/formfactor/formfactor/vermeer/machconfig
new file mode 100644
index 00000000..28ca080e
--- /dev/null
+++ b/meta-amd-bsp/recipes-bsp/formfactor/formfactor/vermeer/machconfig
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=n
+HAVE_KEYBOARD=y
diff --git a/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf b/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf
deleted file mode 100644
index 3389f0c7..00000000
--- a/meta-amd-bsp/recipes-kernel/kmod/files/blacklist-ccp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-blacklist ccp
-blacklist ccp_crypto
diff --git a/meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend b/meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend
deleted file mode 100644
index 3ce16fe9..00000000
--- a/meta-amd-bsp/recipes-kernel/kmod/kmod_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://blacklist-ccp.conf"
-
-do_install_append_ethanolx () {
-    install -m755 ${WORKDIR}/blacklist-ccp.conf \
-                  ${D}${sysconfdir}/modprobe.d/blacklist-ccp.conf
-}
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0001-usb-xhci-Add-LPM-support-to-AMD-xhci-controller.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0001-usb-xhci-Add-LPM-support-to-AMD-xhci-controller.patch
index 387ea135..387ea135 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0001-usb-xhci-Add-LPM-support-to-AMD-xhci-controller.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0001-usb-xhci-Add-LPM-support-to-AMD-xhci-controller.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0002-amd-xgbe-fix-for-the-crash-which-happens-during-SFP-.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0002-amd-xgbe-fix-for-the-crash-which-happens-during-SFP-.patch
index 9cbb46a0..9cbb46a0 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0002-amd-xgbe-fix-for-the-crash-which-happens-during-SFP-.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0002-amd-xgbe-fix-for-the-crash-which-happens-during-SFP-.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0003-amd-xgbe-Fix-NETDEV-WATCHDOG-transmit-queue-timed-ou.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0003-amd-xgbe-Fix-NETDEV-WATCHDOG-transmit-queue-timed-ou.patch
index 0f349c8c..0f349c8c 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0003-amd-xgbe-Fix-NETDEV-WATCHDOG-transmit-queue-timed-ou.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0003-amd-xgbe-Fix-NETDEV-WATCHDOG-transmit-queue-timed-ou.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0004-spi-spidev-Add-dummy-spidev-device-to-SPI-bus.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0004-spi-spidev-Add-dummy-spidev-device-to-SPI-bus.patch
index 7efbde04..7efbde04 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0004-spi-spidev-Add-dummy-spidev-device-to-SPI-bus.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0004-spi-spidev-Add-dummy-spidev-device-to-SPI-bus.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0005-amd-xgbe-Fix-for-Network-fluctuations.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0005-amd-xgbe-Fix-for-Network-fluctuations.patch
index 72638d6d..72638d6d 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0005-amd-xgbe-Fix-for-Network-fluctuations.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0005-amd-xgbe-Fix-for-Network-fluctuations.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0006-amd-xgbe-sets-XGBE_LINK_INIT-when-there-is-a-link-fa.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0006-amd-xgbe-sets-XGBE_LINK_INIT-when-there-is-a-link-fa.patch
index a506c211..a506c211 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0006-amd-xgbe-sets-XGBE_LINK_INIT-when-there-is-a-link-fa.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0006-amd-xgbe-sets-XGBE_LINK_INIT-when-there-is-a-link-fa.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0007-amd-xgbe-improved-KR-training-sequence.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0007-amd-xgbe-improved-KR-training-sequence.patch
index 92c253e3..92c253e3 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0007-amd-xgbe-improved-KR-training-sequence.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0007-amd-xgbe-improved-KR-training-sequence.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0008-amd-xgbe-rrc-is-required-only-for-Fixed-PHY-configur.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0008-amd-xgbe-rrc-is-required-only-for-Fixed-PHY-configur.patch
index 29be3aee..29be3aee 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0008-amd-xgbe-rrc-is-required-only-for-Fixed-PHY-configur.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0008-amd-xgbe-rrc-is-required-only-for-Fixed-PHY-configur.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0009-amd-xgbe-increased-cdr-delay.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0009-amd-xgbe-increased-cdr-delay.patch
index 19eedbf1..19eedbf1 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0009-amd-xgbe-increased-cdr-delay.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0009-amd-xgbe-increased-cdr-delay.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch
index 8fd1c8b5..8fd1c8b5 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/afalg.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/afalg.cfg
index 3a101779..3a101779 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/afalg.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/afalg.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-ccp.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-ccp.cfg
index 109cda5c..109cda5c 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-ccp.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-ccp.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-emmc-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-emmc-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-emmc-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-emmc-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-spi-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-spi-patches.scc
index 6c97c1aa..6c97c1aa 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-spi-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-spi-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-usb-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-usb-patches.scc
index 76ea98f4..76ea98f4 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-usb-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-usb-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-xgbe-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-xgbe-patches.scc
index e2922c00..e2922c00 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-xgbe-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-xgbe-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-xgbe.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-xgbe.cfg
index 463ed1e8..463ed1e8 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amd-xgbe.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amd-xgbe.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-extra-config.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-extra-config.cfg
index 3a88bccf..3a88bccf 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-extra-config.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-extra-config.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-standard-only.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-standard-only.cfg
index bfc1701d..bfc1701d 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-standard-only.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-standard-only.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-user-config.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-user-config.cfg
index 76a144e0..56c40629 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-user-config.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-user-config.cfg
@@ -1,5 +1,3 @@
-CONFIG_X86_BIGSMP=y
-
 #
 # IRQ subsystem
 #
@@ -127,6 +125,7 @@ CONFIG_PCI_ATS=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-user-features.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-user-features.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-user-features.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-user-features.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-user-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-user-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86-user-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86-user-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86.cfg
index b321cee6..b321cee6 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/amdx86.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/amdx86.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/disable-graphics.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/disable-graphics.cfg
new file mode 100644
index 00000000..615724e7
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/disable-graphics.cfg
@@ -0,0 +1,2 @@
+# CONFIG_DRM is not set
+# CONFIG_AGP is not set
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/disable-graphics.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/disable-screen-console.cfg
index da9cb204..ebf9ce28 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/disable-graphics.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/disable-screen-console.cfg
@@ -1,4 +1,3 @@
 # CONFIG_FB is not set
-# CONFIG_DRM is not set
-# CONFIG_AGP is not set
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
 # CONFIG_VGA_SWITCHEROO is not set
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/dpdk.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/dpdk.cfg
index 00225509..00225509 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/dpdk.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/dpdk.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/enable-graphics.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/enable-graphics.cfg
new file mode 100644
index 00000000..e90c34d6
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/enable-graphics.cfg
@@ -0,0 +1,2 @@
+CONFIG_DRM=y
+CONFIG_AGP=y
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/enable-screen-console.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/enable-screen-console.cfg
new file mode 100644
index 00000000..ff5f2709
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/enable-screen-console.cfg
@@ -0,0 +1,3 @@
+CONFIG_FB=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_VGA_SWITCHEROO=y
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/kvm.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/kvm.cfg
index f4ca1c77..f4ca1c77 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25-amdx86/kvm.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47-amdx86/kvm.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-emmc-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-emmc-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-emmc-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-emmc-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-spi-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-spi-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-spi-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-spi-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-usb-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-usb-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-usb-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-usb-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-wdt-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-wdt-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-wdt-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-wdt-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-xgbe-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-xgbe-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amd-xgbe-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amd-xgbe-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amdgpu-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amdgpu-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/amdgpu-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/amdgpu-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/console.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/console.cfg
index 9e30450e..9e30450e 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/console.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/console.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/disable-bluetooth.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/disable-bluetooth.cfg
index ce6ddb43..ce6ddb43 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/disable-bluetooth.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/disable-bluetooth.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/disable-intel-graphics.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/disable-intel-graphics.cfg
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/disable-intel-graphics.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/disable-intel-graphics.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/disable-kgdb.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/disable-kgdb.cfg
index b8a2218b..b8a2218b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/disable-kgdb.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/disable-kgdb.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/enable-bluetooth.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/enable-bluetooth.cfg
index 581830f0..581830f0 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/enable-bluetooth.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/enable-bluetooth.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/enable-kgdb.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/enable-kgdb.cfg
index 55f296b2..55f296b2 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/enable-kgdb.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/enable-kgdb.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/hid.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/hid.cfg
index cbab0fa7..cbab0fa7 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/hid.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/hid.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/logo.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/logo.cfg
index 9772c12e..9772c12e 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/logo.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/logo.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/misc-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/misc-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/misc-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/misc-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/sound.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/sound.cfg
index 250714ae..250714ae 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/sound.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/sound.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/spi-driver.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/spi-driver.cfg
index 67795055..67795055 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/spi-driver.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/spi-driver.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/usb-serial.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/usb-serial.cfg
index 11402439..11402439 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/usb-serial.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/usb-serial.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/wdt-driver.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/wdt-driver.cfg
index a4f53782..a4f53782 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/wdt-driver.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/wdt-driver.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/wifi-drivers.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/wifi-drivers.cfg
index 8b407303..8b407303 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.25/wifi-drivers.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10.47/wifi-drivers.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc
index 395f1538..f37e5a81 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc
@@ -6,11 +6,12 @@ SRC_URI_append_amdx86 += "file://amdx86-user-features.scc \
     file://amdx86-user-config.cfg \
     file://amdx86-extra-config.cfg \
     file://amd-xgbe.cfg \
-    file://amd-ccp.cfg \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'ccp', 'file://amd-ccp.cfg', '', d)} \
     file://kvm.cfg \
     ${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'amd-feature-networking', 'file://dpdk.cfg', '', d)} \
     file://afalg.cfg \
-    file://disable-graphics.cfg \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'screen', 'file://enable-graphics.cfg', 'file://disable-graphics.cfg', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'screen-console', 'file://enable-screen-console.cfg', 'file://disable-screen-console.cfg', d)} \
     file://amdx86-standard-only.cfg \
 "
 
@@ -31,6 +32,7 @@ do_validate_branches_append() {
     sed -i '/CONFIG_FRAMEBUFFER_CONSOLE/d' ${WORKDIR}/${KMETA}/cfg/efi-ext.cfg
 
     # Drop configs limiting the max number of cpus - we use our own setting in amdx86-user-config.cfg
+    sed -i '/CONFIG_X86_BIGSMP/d' ${WORKDIR}/${KMETA}/cfg/smp.cfg
     sed -i '/CONFIG_NR_CPUS/d' ${WORKDIR}/${KMETA}/cfg/smp.cfg
     sed -i '/CONFIG_NR_CPUS/d' ${WORKDIR}/${KMETA}/cfg/smp_64.cfg
 }
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-common_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-common_5.10.inc
index f0e4fab9..9995e726 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-common_5.10.inc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-common_5.10.inc
@@ -2,8 +2,8 @@ INC_PR := "r0"
 PR := "${INC_PR}.1"
 
 KMACHINE_amd ?= "common-pc-64"
-SRCREV_meta_amd ?= "031f6c76e488a3563f35258c72ff1de3e25a512e"
-LINUX_VERSION_amd ?= "5.10.25"
+SRCREV_meta_amd ?= "82899c6a7119b9668be9ae508159f5ac96554cc2"
+LINUX_VERSION_amd ?= "5.10.47"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto-${LINUX_VERSION}:"
 
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rt_5.10.bbappend b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rt_5.10.bbappend
index a70452fe..e3910b8d 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rt_5.10.bbappend
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rt_5.10.bbappend
@@ -1,6 +1,6 @@
 require linux-yocto-common_5.10.inc
 
 KBRANCH_amd ?= "v5.10/standard/preempt-rt/base"
-SRCREV_machine_amd ?= "be2935bce35f9adb6d0e735d42651e81a5094adf"
+SRCREV_machine_amd ?= "42032770803ba26765376967cef09945f48abe04"
 
 include linux-yocto-${MACHINE}_5.10.inc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-vermeer_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-vermeer_5.10.inc
new file mode 100644
index 00000000..fcffab8c
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-vermeer_5.10.inc
@@ -0,0 +1,3 @@
+require linux-yocto-amdx86_5.10.inc
+
+COMPATIBLE_MACHINE = "vermeer"
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto_5.10.bbappend b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto_5.10.bbappend
index 9b45f237..3d3cdbfe 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto_5.10.bbappend
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto_5.10.bbappend
@@ -1,7 +1,7 @@
 require linux-yocto-common_5.10.inc
 
 KBRANCH_amd ?= "v5.10/standard/base"
-SRCREV_machine_amd ?= "cf5b0320cf4544d3db9ce3ddd6ddb7553a610651"
+SRCREV_machine_amd ?= "52bcc5b2342739bbfc8fc385d151616883c4425c"
 
 SRC_URI_append_amdgpu += "file://amdgpu-patches.scc \
 			  file://misc-patches.scc"