aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2019-06-12 12:37:47 +0500
committerAwais Belal <awais_belal@mentor.com>2019-06-12 12:37:50 +0500
commitc3957514c6e1aedf22163d2b4077e4a8ca237cc3 (patch)
treec1e76c1bd8736171eca24a3a14d8b58e389b6430
parent5880e2bec3fb945e3a0a9baa8b1bb49e3f274b09 (diff)
downloadmeta-amd-c3957514c6e1aedf22163d2b4077e4a8ca237cc3.tar.gz
meta-amd-c3957514c6e1aedf22163d2b4077e4a8ca237cc3.tar.bz2
meta-amd-c3957514c6e1aedf22163d2b4077e4a8ca237cc3.zip
linux-yocto: move updates from meta-r1000 to common
This allows the latest updates to be used on other BSPs such as the v1000 where these modifications are applicable. Signed-off-by: Awais Belal <awais_belal@mentor.com>
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch (renamed from meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch)0
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch (renamed from meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch)0
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch (renamed from meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch)0
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch (renamed from meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch)0
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch (renamed from meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch)0
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch (renamed from meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch)0
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch (renamed from meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch)0
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc1
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc3
-rwxr-xr-xcommon/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc4
-rw-r--r--meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-amdgpu-patches.scc3
-rw-r--r--meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-emmc-patches.scc1
-rw-r--r--meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-xgbe-patches.scc3
-rw-r--r--meta-r1000/recipes-kernel/linux/linux-yocto_4.14.bbappend5
14 files changed, 8 insertions, 12 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch
index 898d0c2d..898d0c2d 100644
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5759-mmc-sdhci-add-tuning-error-codes.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch
index abd22a27..abd22a27 100644
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch
index e5317536..e5317536 100644
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch
index 692e419f..692e419f 100644
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5762-net-phy-marvell10g-update-header-comments.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch
index 6c869f19..6c869f19 100644
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch
index 6f13687e..6f13687e 100644
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch
index f1dd23e9..f1dd23e9 100644
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc b/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc
index b7c8d685..45ac77d3 100644
--- a/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-emmc-patches.scc
@@ -15,3 +15,4 @@ patch 5737-mmc-sdhci-Add-32-bit-block-count-support-for-v4-mode.patch
patch 5738-mmc-sdhci-Add-Auto-CMD-Auto-Select-support.patch
patch 5746-amd-eMMC-sdhci-HS400-workaround-for-ZP.patch
patch 5758-RTQA4-Fix-build-error-for-hs400-and-hs200.patch
+patch 5759-mmc-sdhci-add-tuning-error-codes.patch
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc b/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc
index 32d73c30..9de599b9 100644
--- a/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/amd-xgbe-patches.scc
@@ -20,3 +20,6 @@ patch 5744-net-phy-Add-helper-for-advertise-to-lcl-value.patch
patch 5745-drivers-net-remove-net-busy_poll.h-inclusion-when-no.patch
patch 5749-net-phy-Also-request-modules-for-C45-IDs.patch
patch 5750-amd-xgbe-Fix-mdio-access-for-non-zero-ports-and-clau.patch
+patch 5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch
+patch 5762-net-phy-marvell10g-update-header-comments.patch
+patch 5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc b/common/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc
index 0618a367..6788d267 100755
--- a/common/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/amdgpu-patches.scc
@@ -5714,4 +5714,6 @@ patch 5754-drm-amdgpu-make-gfx9-enter-into-rlc-safe-mode-when-s.patch
patch 5755-Revert-drm-amdgpu-revert-the-commit-interim-disable-.patch
patch 5756-Revert-drm-amdgpu-revert-psp-firmware-load-status-ch.patch
patch 5757-drm-amdgpu-psp-ignore-psp-response-status.patch
-
+patch 5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch
+patch 5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch
+patch 5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-amdgpu-patches.scc b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-amdgpu-patches.scc
deleted file mode 100644
index 985d0c9c..00000000
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-amdgpu-patches.scc
+++ /dev/null
@@ -1,3 +0,0 @@
-patch 5760-Revert-drm-amdgpu-interim-disable-RV2-GFX-CG-flag-fo.patch
-patch 5764-Revert-drm-amdgpu-enable-gfxoff-in-non-sriov-and-stu.patch
-patch 5765-drm-amd-powerplay-enable-UMDPSTATE-support-on-raven2.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-emmc-patches.scc b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-emmc-patches.scc
deleted file mode 100644
index 544ec114..00000000
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-emmc-patches.scc
+++ /dev/null
@@ -1 +0,0 @@
-patch 5759-mmc-sdhci-add-tuning-error-codes.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-xgbe-patches.scc b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-xgbe-patches.scc
deleted file mode 100644
index 8333e09e..00000000
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/r1000-xgbe-patches.scc
+++ /dev/null
@@ -1,3 +0,0 @@
-patch 5761-net-phy-marvell10g-remove-XGMII-as-an-option-for-88x.patch
-patch 5762-net-phy-marvell10g-update-header-comments.patch
-patch 5763-amd-xgbe-Sometimes-driver-report-incorrect-link-stat.patch
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto_4.14.bbappend b/meta-r1000/recipes-kernel/linux/linux-yocto_4.14.bbappend
index 93e2f4b8..9f13e492 100644
--- a/meta-r1000/recipes-kernel/linux/linux-yocto_4.14.bbappend
+++ b/meta-r1000/recipes-kernel/linux/linux-yocto_4.14.bbappend
@@ -1,6 +1,3 @@
require linux-yocto-r1000_4.14.inc
-SRC_URI_append_r1000 = " file://r1000-standard-only.cfg \
- file://r1000-amdgpu-patches.scc \
- file://r1000-emmc-patches.scc \
- file://r1000-xgbe-patches.scc"
+SRC_URI_append_r1000 = " file://r1000-standard-only.cfg"