From f5d1eea824d1368aaca189fa218b02da919a5b14 Mon Sep 17 00:00:00 2001
From: Jamin Lin <jamin_lin@aspeedtech.com>
Date: Fri, 7 Apr 2023 13:17:04 +0800
Subject: [PATCH] Set INITRAMFS_IMAGE to "obmc-phosphor-initramfs"

Add to build "mtd-static mtd-static-tar mtd-static-alltar"
and set INITRAMFS_IMAGE to "obmc-phosphor-initramfs"

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Change-Id: Ie2b822d176ad39e32eb04b1663073dc3c23a003b
---
 .../meta-ast2600-sdk/conf/machine/ast2600-a1-ecc.conf         | 1 +
 .../meta-ast2600-sdk/conf/machine/ast2600-a2-ecc.conf         | 1 +
 .../meta-ast2600-sdk/conf/machine/ast2600-a2-emmc.conf        | 4 ++--
 3 files changed, 4 insertions(+), 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
index 56ed078f7840..b119c30542e5 100644
--- 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
index 9fffa095e569..1bf2b7039c9a 100644
--- 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
index 2e72056b262b..d1eef7d72e34 100644
--- 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"