aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Dracup <andy.dracup@windriver.com>2022-04-28 11:21:20 +0000
committerAndy Dracup <andy.dracup@windriver.com>2022-04-28 11:21:20 +0000
commit1920b3e1b928858fed6fb79bc71a032064c1fdf6 (patch)
tree183d2cdf1545d51f5e04d931746b44eea21a9898
parente675b3d75d8e28644bc77e01e15ca36c6e8f4d75 (diff)
parentbdbf7070e5452e19ffc4089ad0bcadf368ce8f2e (diff)
downloadmeta-amd-honister.tar.gz
meta-amd-honister.tar.bz2
meta-amd-honister.zip
Merge branch 'master-next' into 'master'yocto-3.4honister
update for honister-3.4 See merge request windriver-amd/meta-amd!5
-rw-r--r--BUILD.md2
-rw-r--r--CUSTOMIZE.md12
-rw-r--r--DOCUMENTATION.md18
-rw-r--r--README.md6
-rw-r--r--RELEASE.md28
-rw-r--r--SETUP.md10
-rw-r--r--meta-amd-bsp/conf/machine/include/amd-features.inc1
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0001-usb-xhci-Add-LPM-support-to-AMD-xhci-controller.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0001-usb-xhci-Add-LPM-support-to-AMD-xhci-controller.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0002-amd-xgbe-fix-for-the-crash-which-happens-during-SFP-.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0002-amd-xgbe-fix-for-the-crash-which-happens-during-SFP-.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0003-amd-xgbe-Fix-NETDEV-WATCHDOG-transmit-queue-timed-ou.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0003-amd-xgbe-Fix-NETDEV-WATCHDOG-transmit-queue-timed-ou.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0004-spi-spidev-Add-dummy-spidev-device-to-SPI-bus.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0004-spi-spidev-Add-dummy-spidev-device-to-SPI-bus.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0005-amd-xgbe-Fix-for-Network-fluctuations.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0005-amd-xgbe-Fix-for-Network-fluctuations.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0006-amd-xgbe-sets-XGBE_LINK_INIT-when-there-is-a-link-fa.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0006-amd-xgbe-sets-XGBE_LINK_INIT-when-there-is-a-link-fa.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0007-amd-xgbe-improved-KR-training-sequence.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0007-amd-xgbe-improved-KR-training-sequence.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0008-amd-xgbe-rrc-is-required-only-for-Fixed-PHY-configur.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0008-amd-xgbe-rrc-is-required-only-for-Fixed-PHY-configur.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0009-amd-xgbe-increased-cdr-delay.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0009-amd-xgbe-increased-cdr-delay.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/afalg.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/afalg.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-ccp.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-ccp.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-emmc-patches.scc (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-emmc-patches.scc)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-spi-patches.scc (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-spi-patches.scc)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-usb-patches.scc (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-usb-patches.scc)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-wdt-patches.scc (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-wdt-patches.scc)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-xgbe-patches.scc (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-xgbe-patches.scc)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-xgbe.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-xgbe.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-extra-config.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-extra-config.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-standard-only.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-standard-only.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-config.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-config.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-features.scc (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-features.scc)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-patches.scc (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-patches.scc)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/console.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/console.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-bluetooth.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-bluetooth.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-graphics.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/disable-graphics.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-intel-graphics.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-intel-graphics.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-kgdb.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-kgdb.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-screen-console.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/disable-screen-console.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/dpdk.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/dpdk.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-bluetooth.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/enable-bluetooth.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-graphics.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/enable-graphics.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-kgdb.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/enable-kgdb.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-screen-console.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/enable-screen-console.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/hid.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/hid.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/kvm.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/kvm.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/logo.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/logo.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/sound.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/sound.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/spi-driver.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/spi-driver.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/usb-serial.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/usb-serial.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/wdt-driver.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/wdt-driver.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/wifi-drivers.cfg (renamed from meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/wifi-drivers.cfg)0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86_5.10.inc4
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-common_5.10.inc3
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-e3000_5.10.inc3
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-ethanolx_5.10.inc3
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-milan_5.10.inc3
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rome_5.10.inc3
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rt_5.10.bbappend5
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-v1000_5.10.inc3
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-vermeer_5.10.inc3
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-emmc-patches.scc0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-spi-patches.scc0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-usb-patches.scc0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-xgbe-patches.scc0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amdgpu-patches.scc0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/misc-patches.scc0
-rw-r--r--meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto_5.10.bbappend8
66 files changed, 49 insertions, 66 deletions
diff --git a/BUILD.md b/BUILD.md
index 0a92b55c..2edcc931 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 one of the supported AMD machines (i.e `vermeer` or `ethanolx`) that you want
+Set the environment variable `MACHINE` to one of the supported AMD machines (i.e `vermeer` `rome` or `milan`) 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 b2d0856e..497e6d2b 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), 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 |
+| Software feature | Configuration variable | Configuration values | Default value | Supported machines |
+|:----------------------|:----------------------------|:---------------------|:--------------|:---------------------|
+| ON-TARGET DEVELOPMENT | EXTRA_IMAGE_FEATURES:append | tools-sdk | | milan, rome, vermeer |
+| ON-TARGET DEBUGGING | EXTRA_IMAGE_FEATURES:append | tools-debug | | milan, rome, vermeer |
+| ON-TARGET PROFILING | EXTRA_IMAGE_FEATURES:append | tools-profile | | milan, rome, vermeer |
+| RT KERNEL | RT_KERNEL_AMD | yes, no | no | milan, rome, vermeer |
#### Example configuration in local.conf
```sh
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
index 658ac360..01d8256a 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.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 | |
+| Feature | Documentation | Comments |
+|:---------------------------------------------|:------------------------------------------------------------------|:---------|
+| Yocto Project – Overview and Concepts Manual | https://docs.yoctoproject.org/3.4/overview-manual/index.html | |
+| Yocto Project – Quick Build | https://docs.yoctoproject.org/3.4/brief-yoctoprojectqs/index.html | |
+| Yocto Project – Toaster Manual | https://docs.yoctoproject.org/3.4/toaster-manual/index.html | |
+| Yocto Project – SDK Manual | https://docs.yoctoproject.org/3.4/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/README.md b/README.md
index a0f6940f..1b103161 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,6 @@ may take longer.
The per layer gatekeepers are the following.
-- meta-amd-bsp: Wade Farnsworth, wade_farnsworth@mentor.com
-- meta-amd-distro: Wade Farnsworth, wade_farnsworth@mentor.com
-- meta-seattle: Adrian Calianu, adrian.calianu@enea.com
+- meta-amd-bsp: Andy Dracup <andy.dracup@windriver.com>
+- meta-amd-distro: Andy Dracup <andy.dracup@windriver.com>
+- meta-seattle: Adrian Calianu, <adrian.calianu@enea.com>
diff --git a/RELEASE.md b/RELEASE.md
index 635923f1..15f75ed0 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -7,26 +7,26 @@ 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.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 |
+| poky | git://git.yoctoproject.org/poky | hardknott | tags/yocto-3.4 |
+| meta-openembedded | git://git.openembedded.org/meta-openembedded | hardknott | 9a0caf5b09e14a28a54c3f8524d97530aeb8152c |
+| meta-dpdk | git://git.yoctoproject.org/meta-dpdk | hardknott | 6c1b9b6cfe495ed5e62e1d2b8f75f24a790ee696 |
+| meta-amd | git://git.yoctoproject.org/meta-amd | hardknott | tags/yocto-3.4 |
## Software versions
| Software | Version |
|:----------------|:---------|
-| Yocto Poky base | 3.3.2 |
+| Yocto Poky base | 3.4 |
| grub | 2.06-rc1 |
-| linux-yocto | 5.10.47 |
-| linux-yocto-rt | 5.10.47 |
-| gcc | 10.2.0 |
-| util-linux | 2.36.2 |
-| lttng | 2.12 |
+| linux-yocto | 5.10.70 |
+| linux-yocto-rt | 5.10.70 |
+| gcc | 11.2.0 |
+| util-linux | 2.37.2 |
+| lttng | 2.13 |
| babeltrace | 1.5.8 |
-| connman | 1.39 |
-| gdb | 10.1 |
+| connman | 1.40 |
+| gdb | 10.2 |
| dpdk | 20.11.1 |
-| strongswan | 5.9.2 |
+| strongswan | 5.9.4 |
## Fixed issues
| __VERMEER Fixed Issues__ |
@@ -41,4 +41,4 @@ and commit hashes, software versions, and known/fixed issues/limitations.
| 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_ |
+| _** 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 4e589640..b0c7d776 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -24,7 +24,7 @@ sudo apt install -y gawk wget git diffstat unzip texinfo gcc \
Select the Yocto Project branch:
```sh
-YOCTO_BRANCH="hardknott"
+YOCTO_BRANCH="honister"
```
Clone the git repositories:
@@ -42,13 +42,13 @@ git clone --single-branch --branch "${YOCTO_BRANCH}" \
Checkout commit hashes:
```sh
-git checkout --quiet tags/yocto-3.3.2
+git checkout --quiet tags/yocto-3.4
cd meta-openembedded
-git checkout --quiet aaa1c12b2cdea197d420953c8df873e8af5cc507
+git checkout --quiet 9a0caf5b09e14a28a54c3f8524d97530aeb8152c
cd ../meta-dpdk
-git checkout --quiet c011004a49ffb1304f376f0fdc65066913102d5f
+git checkout --quiet 6c1b9b6cfe495ed5e62e1d2b8f75f24a790ee696
cd ../meta-amd
-git checkout --quiet tags/hardknott-vermeer-ga-202110
+git checkout --quiet tags/yocto-3.4
cd ..
```
diff --git a/meta-amd-bsp/conf/machine/include/amd-features.inc b/meta-amd-bsp/conf/machine/include/amd-features.inc
index d87061ea..61ad06a4 100644
--- a/meta-amd-bsp/conf/machine/include/amd-features.inc
+++ b/meta-amd-bsp/conf/machine/include/amd-features.inc
@@ -63,7 +63,6 @@ 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-networking = "\
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-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/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-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/0001-usb-xhci-Add-LPM-support-to-AMD-xhci-controller.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-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/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-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/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-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/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-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/0003-amd-xgbe-Fix-NETDEV-WATCHDOG-transmit-queue-timed-ou.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-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/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-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/0004-spi-spidev-Add-dummy-spidev-device-to-SPI-bus.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0005-amd-xgbe-Fix-for-Network-fluctuations.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0005-amd-xgbe-Fix-for-Network-fluctuations.patch
index 72638d6d..72638d6d 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0005-amd-xgbe-Fix-for-Network-fluctuations.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0005-amd-xgbe-Fix-for-Network-fluctuations.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-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/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-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/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-amdx86/0007-amd-xgbe-improved-KR-training-sequence.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0007-amd-xgbe-improved-KR-training-sequence.patch
index 92c253e3..92c253e3 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0007-amd-xgbe-improved-KR-training-sequence.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0007-amd-xgbe-improved-KR-training-sequence.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-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/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-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/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-amdx86/0009-amd-xgbe-increased-cdr-delay.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0009-amd-xgbe-increased-cdr-delay.patch
index 19eedbf1..19eedbf1 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0009-amd-xgbe-increased-cdr-delay.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0009-amd-xgbe-increased-cdr-delay.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/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-amdx86/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/0010-amd-xgbe-synchronization-between-AN-state-machine-an.patch
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/afalg.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/afalg.cfg
index 3a101779..3a101779 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/afalg.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/afalg.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-ccp.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-ccp.cfg
index 109cda5c..109cda5c 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-ccp.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-ccp.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-emmc-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-emmc-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-emmc-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-emmc-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-spi-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-spi-patches.scc
index 6c97c1aa..6c97c1aa 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-spi-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-spi-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-usb-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-usb-patches.scc
index 76ea98f4..76ea98f4 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-usb-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-usb-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-wdt-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-wdt-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-wdt-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-wdt-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-xgbe-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-xgbe-patches.scc
index e2922c00..e2922c00 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-xgbe-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-xgbe-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-xgbe.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-xgbe.cfg
index 463ed1e8..463ed1e8 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amd-xgbe.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amd-xgbe.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-extra-config.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-extra-config.cfg
index 3a88bccf..3a88bccf 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-extra-config.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-extra-config.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-standard-only.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-standard-only.cfg
index bfc1701d..bfc1701d 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-standard-only.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-standard-only.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-config.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-config.cfg
index 56c40629..56c40629 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-config.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-config.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-features.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-features.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-features.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-features.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-patches.scc
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86-user-patches.scc
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86-user-patches.scc
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86.cfg
index b321cee6..b321cee6 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/amdx86.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/amdx86.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/console.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/console.cfg
index 9e30450e..9e30450e 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/console.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/console.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-bluetooth.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-bluetooth.cfg
index ce6ddb43..ce6ddb43 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-bluetooth.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-bluetooth.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/disable-graphics.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-graphics.cfg
index 615724e7..615724e7 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/disable-graphics.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-graphics.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-intel-graphics.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-intel-graphics.cfg
index e69de29b..e69de29b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-intel-graphics.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-intel-graphics.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-kgdb.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-kgdb.cfg
index b8a2218b..b8a2218b 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/disable-kgdb.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-kgdb.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/disable-screen-console.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-screen-console.cfg
index ebf9ce28..ebf9ce28 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/disable-screen-console.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/disable-screen-console.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/dpdk.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/dpdk.cfg
index 00225509..00225509 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/dpdk.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/dpdk.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/enable-bluetooth.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-bluetooth.cfg
index 581830f0..581830f0 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/enable-bluetooth.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-bluetooth.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/enable-graphics.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-graphics.cfg
index e90c34d6..e90c34d6 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/enable-graphics.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-graphics.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/enable-kgdb.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-kgdb.cfg
index 55f296b2..55f296b2 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/enable-kgdb.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-kgdb.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/enable-screen-console.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-screen-console.cfg
index ff5f2709..ff5f2709 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/enable-screen-console.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/enable-screen-console.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/hid.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/hid.cfg
index cbab0fa7..cbab0fa7 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/hid.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/hid.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/kvm.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/kvm.cfg
index f4ca1c77..f4ca1c77 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-amdx86/kvm.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/kvm.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/logo.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/logo.cfg
index 9772c12e..9772c12e 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/logo.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/logo.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/sound.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/sound.cfg
index 250714ae..250714ae 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/sound.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/sound.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/spi-driver.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/spi-driver.cfg
index 67795055..67795055 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/spi-driver.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/spi-driver.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/usb-serial.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/usb-serial.cfg
index 11402439..11402439 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/usb-serial.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/usb-serial.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/wdt-driver.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/wdt-driver.cfg
index a4f53782..a4f53782 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/wdt-driver.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/wdt-driver.cfg
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/wifi-drivers.cfg b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/wifi-drivers.cfg
index 8b407303..8b407303 100644
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/wifi-drivers.cfg
+++ b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-5.10/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 6e0b203e..d0358aee 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
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-amdx86:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-5.10:"
-SRC_URI:append:amdx86 += "file://amdx86-user-features.scc \
+SRC_URI:append:amdx86 = " file://amdx86-user-features.scc \
file://amdx86-user-patches.scc \
file://amdx86.cfg \
file://amdx86-user-config.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 42d8f782..eb3328af 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
@@ -1,11 +1,10 @@
INC_PR := "r0"
-PR := "${INC_PR}.1"
KMACHINE:amd ?= "common-pc-64"
SRCREV_meta:amd ?= "f8afd84b117f336477846b9e22178ebefb26c08d"
LINUX_VERSION:amd ?= "5.10.70"
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-5.10:"
SRC_URI:append:amd = " file://amd-xgbe-patches.scc \
file://amd-emmc-patches.scc \
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-e3000_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-e3000_5.10.inc
deleted file mode 100644
index c33aa632..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-e3000_5.10.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require linux-yocto-amdx86_5.10.inc
-
-COMPATIBLE_MACHINE = "e3000"
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-ethanolx_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-ethanolx_5.10.inc
deleted file mode 100644
index 614df797..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-ethanolx_5.10.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require linux-yocto-amdx86_5.10.inc
-
-COMPATIBLE_MACHINE = "ethanolx"
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-milan_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-milan_5.10.inc
deleted file mode 100644
index 246647e2..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-milan_5.10.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require linux-yocto-amdx86_5.10.inc
-
-COMPATIBLE_MACHINE = "milan"
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rome_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rome_5.10.inc
deleted file mode 100644
index 86c530a6..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-rome_5.10.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require linux-yocto-amdx86_5.10.inc
-
-COMPATIBLE_MACHINE = "rome"
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 d0dcf017..80f032bd 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,9 @@
require linux-yocto-common_5.10.inc
+PR := "${INC_PR}.1"
+
KBRANCH:amd ?= "v5.10/standard/preempt-rt/base"
SRCREV_machine:amd ?= "42d1c4e85643d634bddd98e5c4d8a9bcc61b3e18"
-include linux-yocto-${MACHINE}_5.10.inc
+require linux-yocto-amdx86_5.10.inc
+COMPATIBLE_MACHINE = "${MACHINE}"
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-v1000_5.10.inc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-v1000_5.10.inc
deleted file mode 100644
index a4ca1efc..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-v1000_5.10.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require linux-yocto-amdx86_5.10.inc
-
-COMPATIBLE_MACHINE = "v1000"
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
deleted file mode 100644
index fcffab8c..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto-vermeer_5.10.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-require linux-yocto-amdx86_5.10.inc
-
-COMPATIBLE_MACHINE = "vermeer"
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-emmc-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-emmc-patches.scc
deleted file mode 100644
index e69de29b..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-emmc-patches.scc
+++ /dev/null
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-spi-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-spi-patches.scc
deleted file mode 100644
index e69de29b..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-spi-patches.scc
+++ /dev/null
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-usb-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-usb-patches.scc
deleted file mode 100644
index e69de29b..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-usb-patches.scc
+++ /dev/null
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-xgbe-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-xgbe-patches.scc
deleted file mode 100644
index e69de29b..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amd-xgbe-patches.scc
+++ /dev/null
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amdgpu-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amdgpu-patches.scc
deleted file mode 100644
index e69de29b..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/amdgpu-patches.scc
+++ /dev/null
diff --git a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/misc-patches.scc b/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/misc-patches.scc
deleted file mode 100644
index e69de29b..00000000
--- a/meta-amd-bsp/recipes-kernel/linux-5.10/linux-yocto/misc-patches.scc
+++ /dev/null
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 8b9f1581..bb99db35 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,9 +1,9 @@
require linux-yocto-common_5.10.inc
+PR := "${INC_PR}.1"
+
KBRANCH:amd ?= "v5.10/standard/base"
SRCREV_machine:amd ?= "7dda2a9f69de7f80e572d38236896e97be79f39d"
-SRC_URI:append:amdgpu += "file://amdgpu-patches.scc \
- file://misc-patches.scc"
-
-include linux-yocto-${MACHINE}_5.10.inc
+require linux-yocto-amdx86_5.10.inc
+COMPATIBLE_MACHINE = "${MACHINE}"