diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-02-20 19:32:31 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-04-01 18:59:38 +0300 |
| commit | a5fae32d20d4d6555510bd473dce1193691d2ed2 (patch) | |
| tree | 52547ee89065bd6026641f2f2c37f34afe7c15bc /meta-inspur | |
| parent | 06911e3b0f92a81bcb2442d3857fe6bb7288132e (diff) | |
| download | openbmc-a5fae32d20d4d6555510bd473dce1193691d2ed2.tar.xz | |
inspur: fp5280g2: move mac2 to machine config
We have a distro feature used within u-boot-aspeed to control the
use of MAC2. This is effectively a function of the machine and
not a function of the distro. Move the 'require' statement from
the openbmc-fp5280g2 distro into the fp5280g2 machine config to
reflect this.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I03ce75d4d8288433cded9b8b5c5eb61763eafdfe
Diffstat (limited to 'meta-inspur')
| -rw-r--r-- | meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf | 1 | ||||
| -rw-r--r-- | meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf index de0682cf6..95edf37d9 100644 --- a/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf +++ b/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf @@ -1,3 +1,2 @@ require conf/distro/openbmc-openpower.conf -require conf/distro/include/phosphor-aspeednic-use-mac2.inc require conf/distro/include/inspur-distrovars.inc diff --git a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf index 193336888..8c66a4976 100644 --- a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf +++ b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf @@ -13,3 +13,5 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc + +require conf/distro/include/phosphor-aspeednic-use-mac2.inc |