summaryrefslogtreecommitdiff
path: root/meta-yadro/meta-nicole/conf/machine
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2020-05-26 22:34:40 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2020-05-26 22:34:40 +0300
commit028c1a3663f63db3fdf4b92e6f091506c1c784f9 (patch)
tree0b28e401de9ee2da03fde96c81a3838fbd3521a7 /meta-yadro/meta-nicole/conf/machine
parentb83c9dda9eabe4c0124decec25bce46e0ae11160 (diff)
parent83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff)
downloadopenbmc-028c1a3663f63db3fdf4b92e6f091506c1c784f9.tar.xz
Merge tag 'wht-0.56' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-yadro/meta-nicole/conf/machine')
-rw-r--r--meta-yadro/meta-nicole/conf/machine/nicole.conf2
1 files changed, 0 insertions, 2 deletions
diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf
index 11b35417d..d815ef330 100644
--- a/meta-yadro/meta-nicole/conf/machine/nicole.conf
+++ b/meta-yadro/meta-nicole/conf/machine/nicole.conf
@@ -3,8 +3,6 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
UBOOT_MACHINE = "ast_g5_ncsi_config"
-PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
-
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
require conf/machine/include/openpower.inc