diff options
author | P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> | 2022-03-30 23:46:16 +0300 |
---|---|---|
committer | P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> | 2022-03-30 23:46:16 +0300 |
commit | 2af35ee50ce9918ee3626c59f2cff62cd3ab9568 (patch) | |
tree | bcc218f953c63222bff793a788b7922b9e39fb88 /meta-ampere/meta-jade/conf | |
parent | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (diff) | |
parent | 9248c75b142fa11243c20f4d200a04e4f6395b51 (diff) | |
download | openbmc-2af35ee50ce9918ee3626c59f2cff62cd3ab9568.tar.xz |
Merge tag '1-0.91' of github.com:intel-innersource/firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-ampere/meta-jade/conf')
-rw-r--r-- | meta-ampere/meta-jade/conf/bblayers.conf.sample | 12 | ||||
-rw-r--r-- | meta-ampere/meta-jade/conf/machine/mtjade.conf | 4 |
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" |