summaryrefslogtreecommitdiff
path: root/meta-ampere/meta-jade/conf
diff options
context:
space:
mode:
authordheerajpdsk <p.dheeraj.srujan.kumar@intel.com>2022-05-06 02:48:05 +0300
committerGitHub <noreply@github.com>2022-05-06 02:48:05 +0300
commitca8d06bc610af08c2d3efc487aa9519989b743e6 (patch)
treec557da2136640a8ce48439f19fe5f7071faffeca /meta-ampere/meta-jade/conf
parent7cf0c1cd0ce835d1833509b7b911e8a97380278b (diff)
parent18f97faa411078b95d042d207f5fff32bc8ece1d (diff)
downloadopenbmc-ca8d06bc610af08c2d3efc487aa9519989b743e6.tar.xz
Merge pull request #80 from Intel-BMC/updateHEAD1-0.91intel
Update
Diffstat (limited to 'meta-ampere/meta-jade/conf')
-rw-r--r--meta-ampere/meta-jade/conf/bblayers.conf.sample12
-rw-r--r--meta-ampere/meta-jade/conf/machine/mtjade.conf4
2 files changed, 1 insertions, 15 deletions
diff --git a/meta-ampere/meta-jade/conf/bblayers.conf.sample b/meta-ampere/meta-jade/conf/bblayers.conf.sample
index 6e0893eb3..6427c8b1b 100644
--- a/meta-ampere/meta-jade/conf/bblayers.conf.sample
+++ b/meta-ampere/meta-jade/conf/bblayers.conf.sample
@@ -17,15 +17,3 @@ BBLAYERS ?= " \
##OEROOT##/meta-ampere \
##OEROOT##/meta-ampere/meta-jade \
"
-BBLAYERS_NON_REMOVABLE ?= " \
- ##OEROOT##/meta \
- ##OEROOT##/meta-openembedded/meta-oe \
- ##OEROOT##/meta-openembedded/meta-networking \
- ##OEROOT##/meta-openembedded/meta-perl \
- ##OEROOT##/meta-openembedded/meta-python \
- ##OEROOT##/meta-security \
- ##OEROOT##/meta-phosphor \
- ##OEROOT##/meta-aspeed \
- ##OEROOT##/meta-ampere \
- ##OEROOT##/meta-ampere/meta-jade \
- "
diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf
index 633efa012..40bd0f81e 100644
--- a/meta-ampere/meta-jade/conf/machine/mtjade.conf
+++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf
@@ -14,8 +14,6 @@ FLASH_KERNEL_OFFSET = "1024"
FLASH_ROFS_OFFSET = "10240"
FLASH_RWFS_OFFSET = "43008"
-OBMC_POWER_SUPPLY_INSTANCES = "0 1"
-
MACHINE_FEATURES += "\
obmc-phosphor-chassis-mgmt \
obmc-phosphor-flash-mgmt \
@@ -32,9 +30,9 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\
ampere-flash-utils \
ampere-mac-update \
mtjade-gpio-config \
- mtd-utils \
ampere-platform-init \
ampere-ipmi-oem \
+ phosphor-nvme \
"
PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps"