From 999c9e7a9698ccaca6b1834f608f9dd822d70d58 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 25 Mar 2021 16:35:45 +0000 Subject: ibm: kernel: Replace rainier with p10bmc The IBM rainier system is being replaced with the generic p10bmc name. Since the rainier.conf file will be renamed p10bmc.conf, add the device tree files for all p10 systems that will be supported with the p10bmc name (rainier, everest). Change-Id: I10983b913d8a2ae98ed4d327131b864f2df96a0c Signed-off-by: Adriana Kobylak --- meta-ibm/conf/machine/rainier.conf | 2 +- meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg | 12 ++++++++++++ meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg | 12 ------------ meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg delete mode 100644 meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf index 19df5be83..f7f08dd08 100644 --- a/meta-ibm/conf/machine/rainier.conf +++ b/meta-ibm/conf/machine/rainier.conf @@ -1,4 +1,4 @@ -KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" +KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb aspeed-bmc-ibm-rainier-4u.dtb aspeed-bmc-ibm-everest.dtb" UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig" UBOOT_DEVICETREE = "ast2600-rainier" SPL_BINARY = "spl/u-boot-spl.bin" diff --git a/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg new file mode 100644 index 000000000..f3c581eac --- /dev/null +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg @@ -0,0 +1,12 @@ +CONFIG_SENSORS_IIO_HWMON=y +CONFIG_SENSORS_TMP401=y +CONFIG_SENSORS_TMP421=y +CONFIG_SENSORS_MAX31785=y +CONFIG_SENSORS_UCD9000=y +CONFIG_RTC_DRV_RV8803=y +CONFIG_IIO=y +CONFIG_BMP280=y +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_PMSG=y +CONFIG_PSTORE_RAM=y diff --git a/meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg deleted file mode 100644 index f3c581eac..000000000 --- a/meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_SENSORS_IIO_HWMON=y -CONFIG_SENSORS_TMP401=y -CONFIG_SENSORS_TMP421=y -CONFIG_SENSORS_MAX31785=y -CONFIG_SENSORS_UCD9000=y -CONFIG_RTC_DRV_RV8803=y -CONFIG_IIO=y -CONFIG_BMP280=y -CONFIG_PSTORE=y -CONFIG_PSTORE_CONSOLE=y -CONFIG_PSTORE_PMSG=y -CONFIG_PSTORE_RAM=y diff --git a/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend index dfd3afded..5ba22e3a7 100644 --- a/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_ibm-ac-server = " file://witherspoon.cfg" -SRC_URI_append_rainier = " file://rainier.cfg" +SRC_URI_append_p10bmc = " file://p10bmc.cfg" SRC_URI_append_mihawk = " file://mihawk.cfg" -- cgit v1.2.3