diff options
Diffstat (limited to 'meta-inspur/meta-fp5280g2/conf')
4 files changed, 5 insertions, 3 deletions
diff --git a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample index d8aa6bebc..9f5c27cd4 100644 --- a/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample +++ b/meta-inspur/meta-fp5280g2/conf/bblayers.conf.sample @@ -12,6 +12,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ @@ -25,6 +26,7 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ diff --git a/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf index de0682cf6..95edf37d9 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/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf index 63ebcb857..18e651877 100644 --- a/meta-inspur/meta-fp5280g2/conf/layer.conf +++ b/meta-inspur/meta-fp5280g2/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "fp5280g2-layer" BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fp5280g2-layer = "dunfell gatesgarth" +LAYERSERIES_COMPAT_fp5280g2-layer = "gatesgarth hardknott" diff --git a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf index 193336888..86663753e 100644 --- a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf +++ b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf @@ -7,9 +7,10 @@ OBMC_POWER_SUPPLY_INSTANCES = "0 1" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "fp5280g2-openpower-fru-vpd-layout-native" PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "fp5280g2-openpower-fru-inventory-native" -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "fp5280g2-led-manager-config-native" require conf/machine/include/ast2500.inc 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 |