diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-04 22:10:14 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-04 22:10:14 +0300 |
| commit | 794d26fa53ad7e8cb54a3a5773436b1d8e813f35 (patch) | |
| tree | 92940f7842138b00efea3b42140093a3bf39b81b /meta-facebook/meta-yosemitev2 | |
| parent | 235618c7396902842906bc3a8c90a3320aeeaeba (diff) | |
| parent | a6da583e088a2e9462d5330555a704402eff74a9 (diff) | |
| download | openbmc-794d26fa53ad7e8cb54a3a5773436b1d8e813f35.tar.xz | |
Merge tag 'wht-0.53' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-facebook/meta-yosemitev2')
| -rw-r--r-- | meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf | 2 | ||||
| -rw-r--r-- | meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index 45538ab4e..d37fc56dd 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -6,6 +6,8 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc +SERIAL_CONSOLES = "57600;ttyS4" + OBMC_MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ diff --git a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg index 7ea8dc31a..c093eafc2 100644 --- a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg +++ b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg @@ -1,6 +1,3 @@ -CONFIG_SENSORS_TMP421=y -CONFIG_SENSORS_MAX31785=y -CONFIG_RTC_DRV_RV8803=y -CONFIG_TCG_TPM=y -CONFIG_TCG_TIS_I2C_INFINEON=y CONFIG_NCSI_OEM_CMD_GET_MAC=y +CONFIG_I2C_SLAVE=y +CONFIG_IPMB_DEVICE_INTERFACE=y |