| commit | f5431f64bb7e0337a3049ef96d13177d4887fc94 | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Sat Feb 20 10:32:31 2021 -0600 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Mon Feb 22 17:20:08 2021 -0600 |
| tree | 9cb1f95c0adc9c99bfbb1a2e1ec0ac0cf2cc882d | |
| parent | 8fbd66db60f61226218919386e791e91cd995c4e [diff] |
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
diff --git a/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf b/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf index 854e0fb..2570a9a 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 26595fa..7a558bc 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/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