diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-ibm/conf/machine/rainier.conf | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/conf/machine/rainier.conf')
-rw-r--r-- | meta-ibm/conf/machine/rainier.conf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-ibm/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf index 1f8c21e73..9c1a7a46d 100644 --- a/meta-ibm/conf/machine/rainier.conf +++ b/meta-ibm/conf/machine/rainier.conf @@ -1,12 +1,16 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" -UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig" UBOOT_DEVICETREE = "ast2600-rainier" +SPL_BINARY = "spl/u-boot-spl.bin" 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/phosphor-mmc.inc SERIAL_CONSOLES = "115200;ttyS4" @@ -23,5 +27,6 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ "phosphor-fan-presence-config" -FLASH_SIZE = "131072" SKIP_BROKEN_MRW = "1" + +IMAGE_FEATURES_remove = "obmc-ikvm" |