summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2021-03-25 19:35:45 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-04-08 19:38:31 +0300
commit999c9e7a9698ccaca6b1834f608f9dd822d70d58 (patch)
tree5477b61870c7b920fa05f8a01b7141b9b534efbe
parentb6ff3eb92ef1b12e2562ad1e1f74371cf4d51e75 (diff)
downloadopenbmc-999c9e7a9698ccaca6b1834f608f9dd822d70d58.tar.xz
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 <anoo@us.ibm.com>
-rw-r--r--meta-ibm/conf/machine/rainier.conf2
-rw-r--r--meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg (renamed from meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg)0
-rw-r--r--meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend2
3 files changed, 2 insertions, 2 deletions
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/rainier.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg
index f3c581eac..f3c581eac 100644
--- a/meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg
+++ b/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg
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"