diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-02-20 19:32:31 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-02-23 02:20:08 +0300 |
| commit | f5431f64bb7e0337a3049ef96d13177d4887fc94 (patch) | |
| tree | 9cb1f95c0adc9c99bfbb1a2e1ec0ac0cf2cc882d /meta-ingrasys | |
| parent | 8fbd66db60f61226218919386e791e91cd995c4e (diff) | |
| download | openbmc-f5431f64bb7e0337a3049ef96d13177d4887fc94.tar.xz | |
ingrasys: zaius: 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-zaius distro into the zaius machine config to reflect
this.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I56a6f57b26915908b5c05bc922e54e764cf72300
Diffstat (limited to 'meta-ingrasys')
| -rw-r--r-- | meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf | 1 | ||||
| -rw-r--r-- | meta-ingrasys/meta-zaius/conf/machine/zaius.conf | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf b/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf index 854e0fb7b..2570a9a19 100644 --- a/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf @@ -1,2 +1 @@ require conf/distro/openbmc-openpower.conf -require conf/distro/include/phosphor-aspeednic-use-mac2.inc diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 26595fa3d..7a558bcc1 100644 --- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -9,3 +9,5 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ingrasys.inc require conf/machine/include/p9.inc + +require conf/distro/include/phosphor-aspeednic-use-mac2.inc |