diff options
17 files changed, 17 insertions, 17 deletions
diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 2ac82cade..91ca5bb1b 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -11,7 +11,7 @@ SERIAL_CONSOLES = "115200;ttyS4" FLASH_SIZE = "32768" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-state-mgmt \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index a47ebef8a..633efa012 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -16,7 +16,7 @@ FLASH_RWFS_OFFSET = "43008" OBMC_POWER_SUPPLY_INSTANCES = "0 1" -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ obmc-chassis-state-mgmt \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index ba7a253e3..516e31683 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -10,7 +10,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/distro/include/phosphor-aspeednic-use-mac2.inc -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-ipmi \ diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index ebe79d1a4..8567f696c 100644 --- a/meta-facebook/conf/machine/include/facebook-withhost.inc +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -1,6 +1,6 @@ require conf/machine/include/facebook.inc -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-chassis-state-mgmt \ obmc-host-ipmi \ obmc-host-state-mgmt \ diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index d18a66bf5..43a0c2222 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 9f64c476b..e065f2086 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -22,7 +22,7 @@ IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot" SERIAL_CONSOLES = "115200;ttyS0" -OBMC_MACHINE_FEATURES += " \ +MACHINE_FEATURES += " \ obmc-host-ipmi \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 74b1a2c6d..281d2d544 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 1891129a4..b714f78d3 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -15,7 +15,7 @@ require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc DISTRO_FEATURES += "ibm-service-account-policy" -OBMC_MACHINE_FEATURES += 'phal' +MACHINE_FEATURES += 'phal' SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 738d103e5..623cd7910 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 02b0df685..9a9e9f574 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index 65d9a8aef..f6c48bfb0 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-openpower/conf/machine/include/p8.inc b/meta-openpower/conf/machine/include/p8.inc index af269c23e..eb262cbf7 100644 --- a/meta-openpower/conf/machine/include/p8.inc +++ b/meta-openpower/conf/machine/include/p8.inc @@ -1,2 +1,2 @@ include conf/machine/include/ibm-power8-cpu.inc -OBMC_MACHINE_FEATURES += 'i2c-occ' +MACHINE_FEATURES += 'i2c-occ' diff --git a/meta-openpower/conf/machine/include/p9.inc b/meta-openpower/conf/machine/include/p9.inc index 2da9fd144..5c1779322 100644 --- a/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openpower/conf/machine/include/p9.inc @@ -1,3 +1,3 @@ include conf/machine/include/ibm-power9-cpu.inc -OBMC_MACHINE_FEATURES += 'op-fsi p9-cfam-override' +MACHINE_FEATURES += 'op-fsi p9-cfam-override' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" 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 \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index bb26af880..d663f445a 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -1,4 +1,4 @@ -OBMC_MACHINE_FEATURES += "\ +MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-chassis-state-mgmt \ obmc-host-state-mgmt \ |