59 files changed, 11 insertions, 27 deletions

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}"