diff options
| author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-23 04:40:54 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 19:39:42 +0300 |
| commit | 194ff4f1f5d44b12e9cb06ddafa6adb20174a13c (patch) | |
| tree | 823835cd29daf8901a31ac14c7e6534abf199be3 /meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf | |
| parent | 4feb727cd6b77a68bdaca63e121b378d814f5eaf (diff) | |
| download | openbmc-194ff4f1f5d44b12e9cb06ddafa6adb20174a13c.tar.xz | |
[Subtree] Bring openbmc machines to top level
The new subtree model brings the subtrees up from the openbmc-machines
layer.
Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf')
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf deleted file mode 100644 index 1ccd1cf5a..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ /dev/null @@ -1,33 +0,0 @@ -KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" -KERNEL_FEATURES_append = " phosphor-wdt-on-panic" - -UBOOT_MACHINE = "ast_g5_ncsi_config" - -OBMC_POWER_SUPPLY_INSTANCES = "0 1" - -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' - -require conf/machine/include/ast2500.inc -require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/ibm.inc -require conf/machine/include/p9.inc - -PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml" -PHOSPHOR_MRW_REV = "6ca015dbd3e1e9d5206f9ec13ec9db2d8965e181" - -# Inhibit phosphor-hwmon-config-mrw -VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" - -# Pick up the Witherspoon-specific IPMI configuration -VIRTUAL-RUNTIME_ipmi-config = "witherspoon-ipmi-config" - -# Inhibit phosphor-fan-presence-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ - "phosphor-fan-presence-config-native" - -# Inhibit phosphor-fan-control-fan-config-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ - "phosphor-fan-control-fan-config-native" - -PREFERRED_RPROVIDER_virtual/phosphor-ipmi-config = "witherspoon-ipmi-config" |