From f5431f64bb7e0337a3049ef96d13177d4887fc94 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Sat, 20 Feb 2021 10:32:31 -0600 Subject: 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 Change-Id: I56a6f57b26915908b5c05bc922e54e764cf72300 --- meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf | 1 - meta-ingrasys/meta-zaius/conf/machine/zaius.conf | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-ingrasys') 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 -- cgit v1.2.3