diff options
Diffstat (limited to 'meta-quanta')
8 files changed, 12 insertions, 5 deletions
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf index a64d93e6c..c461069ed 100644 --- a/meta-quanta/conf/layer.conf +++ b/meta-quanta/conf/layer.conf @@ -8,3 +8,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "quanta-layer" BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_quanta-layer = "hardknott honister" +LAYERDEPENDS_quanta-layer = "phosphor-layer" diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf index 9f41e0501..cd2ca1d32 100644 --- a/meta-quanta/meta-gbs/conf/layer.conf +++ b/meta-quanta/meta-gbs/conf/layer.conf @@ -8,3 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gbs-layer" BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_gbs-layer = "hardknott honister" +LAYERDEPENDS_gbs-layer = "core phosphor-layer google-layer quanta-layer" diff --git a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg index 0fca8252f..324af83c0 100644 --- a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg +++ b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg @@ -119,3 +119,8 @@ CONFIG_MTD_M25P80=y CONFIG_MUX_MMIO=y CONFIG_NPCM7XX_LPC_BPC=y CONFIG_MTD_PARTITIONED_MASTER=y + +# Enable hmac api for UUID +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_USER_API_HASH=y diff --git a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend index 9860495ea..505390146 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -28,8 +28,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-hwmon" OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-inventory-manager" # Required for obmc-bmcweb OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " bmcweb" -OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-bmcweb-cert-config" -OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-nslcd-authority-cert-config" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-certificate-manager" OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-user-manager" # Required for LEDs. Part of obmc-leds OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-manager}" diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index 7591e0953..372fb65da 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -8,3 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_gsj-layer = "hardknott honister" +LAYERDEPENDS_gsj-layer = "core phosphor-layer google-layer quanta-layer" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index c5089e804..ce58a91c3 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -11,7 +11,7 @@ require conf/machine/include/obmc-bsp-common.inc IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" IMAGE_FSTYPES += " mtd-ubi-tar" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index 7fadd1aba..a90e77bf6 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -16,7 +16,7 @@ IGPS_MACHINE = "RunBMC" IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf index 2bcaeaaa1..935bd99ca 100644 --- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf +++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf @@ -11,7 +11,7 @@ UBOOT_LOADADDRESS = "0x40008000" FLASH_SIZE = "32768" # If we included the openpower.inc we'd get these from that. -#OBMC_MACHINE_FEATURES += "\ +#MACHINE_FEATURES += "\ # obmc-phosphor-fan-mgmt \ # obmc-phosphor-chassis-mgmt \ # obmc-phosphor-flash-mgmt \ |