Merge remote-tracking branch 'upstream/aspeed-master' into aspeed-master

AspeedTech-BMC · Dec 25, 2023 · 5db6cc4 · 5db6cc4
2 parents 742fec7 + 9e5b530
commit 5db6cc4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/meta-aspeed-sdk/recipes-aspeed/packagegroups/packagegroup-oss.bb b/meta-aspeed-sdk/recipes-aspeed/packagegroups/packagegroup-oss.bb
@@ -43,6 +43,7 @@ RDEPENDS:${PN}-apps = " \
     aer-inject \
     fio \
     mctp \
+    memtester \
     "
 
 SUMMARY:${PN}-extended = "Open Source Extended Applications"

diff --git a/meta-aspeed-sdk/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed-sdk/recipes-kernel/linux/linux-aspeed_git.bb
@@ -2,7 +2,7 @@ KBRANCH = "aspeed-master-v6.6"
 LINUX_VERSION ?= "6.6.1"
 
 # Tag for v00.06.00
-SRCREV = "866b061494ddcd9b8a2fa90d4a6f760466ce2e8d"
+SRCREV = "db6d4731c26304858292ca2bd4803e59c05ad9c5"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ RDEPENDS:${PN}-apps = " \ @@
         aer-inject \
         fio \
         mctp \
+        memtester \
         "
     SUMMARY:${PN}-extended = "Open Source Extended Applications"
@@ Expand Down @@