diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-06-19 01:34:17 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-06-19 01:34:17 +0300 |
commit | aea9e7cbf9bd7677228747a8e7bab4d22bc80103 (patch) | |
tree | 94f59c0b6566fbd9c459918177ceb49e53128aa7 /meta-inspur/meta-on5263m5/conf | |
parent | 10bc2ef852277cf8e9858f75cea9f55b482bf85b (diff) | |
parent | f3b2f5e9e3e0fe093d5ab1e3dcdede0aa3000450 (diff) | |
download | openbmc-aea9e7cbf9bd7677228747a8e7bab4d22bc80103.tar.xz |
Merge branch 'master' of ssh://github.com/openbmc/openbmc into intel
Diffstat (limited to 'meta-inspur/meta-on5263m5/conf')
-rw-r--r-- | meta-inspur/meta-on5263m5/conf/layer.conf | 6 | ||||
-rw-r--r-- | meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index 93db95c5c..b49d300bf 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -6,7 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "on5263m5-layer" -BBFILE_PATTERN_on5263m5-layer = "" -BBFILE_PRIORITY_on5263m5-layer = "5" -LAYERSERIES_COMPAT_on5263m5-layer = "sumo" - +BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" +LAYERSERIES_COMPAT_on5263m5-layer = "thud warrior" diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index ba8ce1067..1c217913e 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -3,10 +3,14 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/inspur.inc + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" FLASH_SIZE = "32768" -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" |