diff options
| author | Charles Boyer <Charles.Boyer@fii-usa.com> | 2022-04-28 22:25:56 +0300 |
|---|---|---|
| committer | Vivekanand Veeracholan <vveerach@google.com> | 2022-07-13 01:18:11 +0300 |
| commit | 1fa5e6090bb22e7320716bfd65255e2edab960a1 (patch) | |
| tree | 81827c381e4722ab68efc16cc36063b8ffceaa5e /meta-fii/meta-mori/conf | |
| parent | 61298cff8d4df10e749715e7fe7d312ea0fd3db7 (diff) | |
| download | openbmc-1fa5e6090bb22e7320716bfd65255e2edab960a1.tar.xz | |
meta-fii: meta-mori: Update conf files
Summary of Changes:
- Add BBLAYERS for security, phosphor, nuvoton, google, and mori
- Remove BBLAYERS_NON_REMOVABLE
- Add LAYERDEPENDS for mori-layer
- Add mori u-boot device tree
- Use obmc-phosphor-image appends instead of packagegroups
Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com>
Change-Id: I7f3ae13678f36581df5abaf7ba95220a0859843d
Diffstat (limited to 'meta-fii/meta-mori/conf')
| -rw-r--r-- | meta-fii/meta-mori/conf/bblayers.conf.sample | 1 | ||||
| -rw-r--r-- | meta-fii/meta-mori/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta-fii/meta-mori/conf/machine/mori.conf | 38 |
3 files changed, 35 insertions, 5 deletions
diff --git a/meta-fii/meta-mori/conf/bblayers.conf.sample b/meta-fii/meta-mori/conf/bblayers.conf.sample index f0f913c1bf..6d45954705 100644 --- a/meta-fii/meta-mori/conf/bblayers.conf.sample +++ b/meta-fii/meta-mori/conf/bblayers.conf.sample @@ -10,6 +10,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-oe \ ##OEROOT##/meta-openembedded/meta-networking \ ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-nuvoton \ ##OEROOT##/meta-google \ diff --git a/meta-fii/meta-mori/conf/layer.conf b/meta-fii/meta-mori/conf/layer.conf index 238b5a99db..35a15302ea 100644 --- a/meta-fii/meta-mori/conf/layer.conf +++ b/meta-fii/meta-mori/conf/layer.conf @@ -8,3 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "mori-layer" BBFILE_PATTERN_mori-layer = "^${LAYERDIR}/" LAYERSERIES_COMPAT_mori-layer = "honister kirkstone" +LAYERDEPENDS_mori-layer = "core phosphor-layer google-layer fii-layer" diff --git a/meta-fii/meta-mori/conf/machine/mori.conf b/meta-fii/meta-mori/conf/machine/mori.conf index b4ae271f1a..920579032b 100644 --- a/meta-fii/meta-mori/conf/machine/mori.conf +++ b/meta-fii/meta-mori/conf/machine/mori.conf @@ -10,6 +10,7 @@ FLASH_ROFS_OFFSET:flash-65536 = "7168" FLASH_RWFS_OFFSET:flash-65536 = "62400" UBOOT_MACHINE = "PolegSVB_config" +UBOOT_DEVICETREE = "nuvoton-npcm730-mori" IGPS_MACHINE = "EB" GBMC_MAC_EEPROM_OF_NAME = "bmcfru" @@ -20,9 +21,36 @@ IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" SERIAL_CONSOLES = "115200;ttyS0" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" +PREFERRED_PROVIDER_virtual/bmc-update = "mori-bmc-update" +PREFERRED_PROVIDER_virtual/bios-update = "mori-bios-update" +PREFERRED_PROVIDER_virtual/cpld-update = "mori-cpld-update" + +# Remove unneeded binaries from image +IMAGE_FEATURES:remove = "obmc-bmcweb" +IMAGE_FEATURES:remove = "obmc-console" +IMAGE_FEATURES:remove = "obmc-devtools" +IMAGE_FEATURES:remove = "obmc-fan-control" +IMAGE_FEATURES:remove = "obmc-fan-mgmt" +IMAGE_FEATURES:remove = "obmc-flash-mgmt" +IMAGE_FEATURES:remove = "obmc-fru-ipmi" +IMAGE_FEATURES:remove = "obmc-health-monitor" +IMAGE_FEATURES:remove = "obmc-host-ctl" +IMAGE_FEATURES:remove = "obmc-host-ipmi" +IMAGE_FEATURES:remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-inventory" +IMAGE_FEATURES:remove = "obmc-leds" +IMAGE_FEATURES:remove = "obmc-logging-mgmt" +IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt" +IMAGE_FEATURES:remove = "obmc-rng" +IMAGE_FEATURES:remove = "obmc-net-ipmi" +IMAGE_FEATURES:remove = "obmc-sensors" +IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-telemetry" +IMAGE_FEATURES:remove = "obmc-debug-collector" IMAGE_FEATURES:remove = "obmc-system-mgmt" - -OBMC_MACHINE_FEATURES += " \ - obmc-host-ipmi \ - obmc-host-state-mgmt \ - " +IMAGE_FEATURES:remove = "obmc-settings-mgmt" +IMAGE_FEATURES:remove = "obmc-network-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" +OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras" |