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

AspeedTech-BMC · Apr 7, 2023 · 064b33d · 064b33d
2 parents d9eeb0e + 210e5ef
commit 064b33d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2600-a1-ecc.conf b/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2600-a1-ecc.conf
@@ -1,5 +1,6 @@
 require conf/machine/include/ast2600-sdk.inc
 require conf/machine/include/ast-ssp.inc
+require conf/machine/include/obmc-bsp-common.inc
 
 # Overwrite flash layout
 FLASH_SIZE = "65536"

diff --git a/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2600-a2-ecc.conf b/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2600-a2-ecc.conf
@@ -1,5 +1,6 @@
 require conf/machine/include/ast2600-sdk.inc
 require conf/machine/include/ast-ssp.inc
+require conf/machine/include/obmc-bsp-common.inc
 
 # Overwrite flash layout
 FLASH_SIZE = "65536"

diff --git a/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2600-a2-emmc.conf b/meta-aspeed-sdk/meta-ast2600-sdk/conf/machine/ast2600-a2-emmc.conf
@@ -1,8 +1,8 @@
 require conf/machine/include/ast2600-sdk.inc
 require conf/machine/include/ast-mmc.inc
-# remove phosphor-mmc distro feature if build aspeed-image-sdk
-require ${@bb.utils.contains('INITRAMFS_IMAGE', 'aspeed-image-initramfs', '', 'conf/distro/include/phosphor-mmc.inc', d)}
+require conf/distro/include/phosphor-mmc.inc
 require conf/machine/include/ast-ssp.inc
+require conf/machine/include/obmc-bsp-common.inc
 
 # eMMC Partition Layout File
 WKS_FILE = "ast2600-emmc.wks.in"