summaryrefslogtreecommitdiff
path: root/meta-ingrasys/meta-zaius/conf
diff options
context:
space:
mode:
authorJohn Wang <wangzqbj@inspur.com>2019-07-16 06:46:35 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-07-19 23:27:23 +0300
commit279814c43dc5dea6b65183166e7e7269070af827 (patch)
tree24f02c13437b12cd8a942105288c7f6fd9dec1bc /meta-ingrasys/meta-zaius/conf
parentd190c73c8a1def3b67e747e468bc67a55d293787 (diff)
downloadopenbmc-279814c43dc5dea6b65183166e7e7269070af827.tar.xz
zaius: enable distro feature to support MAC2
Enable the distro feature phosphor-aspeednic-use-mac2 to support MAC2 This solution is not desirable but it works for now, For details please refer to https://gerrit.openbmc-project.xyz/c/openbmc/meta-phosphor/+/23415 Noted that this changed local.conf.sample, which means you need to modify the build/conf/local.conf accordingly Tested: devtool modify u-boot and saw the aspeednic patch is applied. (From meta-ingrasys rev: c827e2bd3ec4dfddc3e895bf3643390a0d44b79d) Signed-off-by: John Wang <wangzqbj@inspur.com> Change-Id: I691671434ca143add029df6d66d86059f4e309c1 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ingrasys/meta-zaius/conf')
-rw-r--r--meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf2
-rw-r--r--meta-ingrasys/meta-zaius/conf/local.conf.sample2
2 files changed, 3 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
new file mode 100644
index 000000000..854e0fb7b
--- /dev/null
+++ b/meta-ingrasys/meta-zaius/conf/distro/openbmc-zaius.conf
@@ -0,0 +1,2 @@
+require conf/distro/openbmc-openpower.conf
+require conf/distro/include/phosphor-aspeednic-use-mac2.inc
diff --git a/meta-ingrasys/meta-zaius/conf/local.conf.sample b/meta-ingrasys/meta-zaius/conf/local.conf.sample
index c7ccc92b3..d09389ea7 100644
--- a/meta-ingrasys/meta-zaius/conf/local.conf.sample
+++ b/meta-ingrasys/meta-zaius/conf/local.conf.sample
@@ -1,5 +1,5 @@
MACHINE ??= "zaius"
-DISTRO ?= "openbmc-openpower"
+DISTRO ?= "openbmc-zaius"
PACKAGE_CLASSES ?= "package_rpm"
SANITY_TESTED_DISTROS_append ?= " *"
EXTRA_IMAGE_FEATURES = "debug-tweaks"