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/witherspoon-tacoma.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/witherspoon-tacoma.conf')
| -rw-r--r-- | meta-ibm/conf/machine/witherspoon-tacoma.conf | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf index 4d94d9e9d..6948853c5 100644 --- a/meta-ibm/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf @@ -1,8 +1,7 @@ KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb" -UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig" UBOOT_DEVICETREE = "ast2600-tacoma" - -IMAGE_FSTYPES += "ext4 mmc-ext4-tar" +SPL_BINARY = "spl/u-boot-spl.bin" OBMC_POWER_SUPPLY_INSTANCES = "0 1" @@ -11,6 +10,8 @@ require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc +require conf/distro/include/openpower-virtual-pnor.inc +require conf/distro/include/phosphor-mmc.inc SERIAL_CONSOLES = "115200;ttyS4" @@ -27,4 +28,11 @@ 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" +# The eMMC on Tacoma is just 1GB smaller than Rainier. The template file +# meta-aspeed/wic/emmc-aspeed.wks.in builds an image for the size of Rainier as +# the default. To be able to re-use that template for Tacoma, the size of the +# last partition (hostfw) was made configurable. The default size of the hostfw +# partition is 5GB, therefore setting it to 4GB for Tacoma. +WKS_HOSTFW_SIZE = "4G" + +IMAGE_FEATURES_remove = "obmc-ikvm" |