meta-ibm: Update p10bmc.conf (#221)

Change-Id: Ied6ddad5f56d0ddfabd4c2b2f9c510c99e622172
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

meta-ibm/conf/machine/p10bmc.conf

@@ -1,6 +1,8 @@
 DISTRO_NAME = "IBM eBMC (OpenBMC for IBM Enterprise Systems)"
 
-KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb aspeed-bmc-ibm-rainier-4u.dtb aspeed-bmc-ibm-everest.dtb"
+KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb aspeed-bmc-ibm-rainier-4u.dtb \
+                     aspeed-bmc-ibm-rainier-1s4u.dtb aspeed-bmc-ibm-rainier-p1.dtb \
+                     aspeed-bmc-ibm-rainier-4u-p1.dtb aspeed-bmc-ibm-everest.dtb"
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-rainier"
 SPL_BINARY = "spl/u-boot-spl.bin"
@@ -10,12 +12,13 @@ OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3"
 require conf/machine/include/ast2600.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
-include conf/machine/include/ibm-power10-cpu.inc
 require conf/distro/include/openpower-virtual-pnor.inc
 require conf/distro/include/openpower-hostfw-over-pldm.inc
 require conf/distro/include/phosphor-mmc.inc
 require conf/distro/include/ibm-mpreboot.inc
 require conf/distro/include/ibm-yaml.inc
+require conf/machine/include/p10.inc
+
 DISTRO_FEATURES += "ibm-service-account-policy"
 OBMC_MACHINE_FEATURES += 'phal'
 
@@ -49,8 +52,8 @@ UBOOT_FIT_HASH_ALG = "sha512"
 UBOOT_FIT_SIGN_ALG = "rsa4096"
 UBOOT_FIT_SIGN_NUMBITS = "4096"
 
-UBOOT_SIGN_KEYNAME = "rsa_oem_fitimage_key"
-SPL_SIGN_KEYNAME = "rsa_oem_fitimage_key"
+UBOOT_SIGN_KEYNAME ?= "rsa_oem_fitimage_key"
+SPL_SIGN_KEYNAME ?= "rsa_oem_fitimage_key"
 
 UBOOT_SIGN_KEYDIR = "${WORKDIR}"
 SPL_SIGN_KEYDIR = "${WORKDIR}"