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
diff --git a/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf
index de0682c..95edf37 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 1933368..8c66a49 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/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