diff options
Diffstat (limited to 'meta-ibm/conf')
-rw-r--r-- | meta-ibm/conf/conf-notes.txt | 2 | ||||
-rw-r--r-- | meta-ibm/conf/distro/include/ibm-distrovars.inc | 1 | ||||
-rw-r--r-- | meta-ibm/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ibm/conf/local.conf.sample | 1 | ||||
-rw-r--r-- | meta-ibm/conf/machine/mihawk.conf | 1 | ||||
-rw-r--r-- | meta-ibm/conf/machine/rainier.conf | 9 | ||||
-rw-r--r-- | meta-ibm/conf/machine/witherspoon-128.conf | 14 | ||||
-rw-r--r-- | meta-ibm/conf/machine/witherspoon-tacoma.conf | 16 | ||||
-rw-r--r-- | meta-ibm/conf/machine/witherspoon.conf | 1 |
9 files changed, 21 insertions, 26 deletions
diff --git a/meta-ibm/conf/conf-notes.txt b/meta-ibm/conf/conf-notes.txt index 112353d6f..1716a40cd 100644 --- a/meta-ibm/conf/conf-notes.txt +++ b/meta-ibm/conf/conf-notes.txt @@ -8,5 +8,3 @@ witherspoon: DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image witherspoon-tacoma: DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image -witherspoon-128: -DISTRO=openbmc-witherspoon MACHINE=witherspoon-128 bitbake obmc-phosphor-image diff --git a/meta-ibm/conf/distro/include/ibm-distrovars.inc b/meta-ibm/conf/distro/include/ibm-distrovars.inc new file mode 100644 index 000000000..dde13f233 --- /dev/null +++ b/meta-ibm/conf/distro/include/ibm-distrovars.inc @@ -0,0 +1 @@ +OBMC_ORG_YAML_SUBDIRS += " com/ibm" diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index 482b56aa0..8662448e1 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ibm-layer = "warrior zeus dunfell" +LAYERSERIES_COMPAT_ibm-layer = "dunfell gatesgarth" diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample index 94e76f3db..4b70cade4 100644 --- a/meta-ibm/conf/local.conf.sample +++ b/meta-ibm/conf/local.conf.sample @@ -1,6 +1,5 @@ #MACHINE ?= "mihawk" #MACHINE ?= "swift" -#MACHINE ?= "witherspoon-128" #MACHINE ?= "rainier" MACHINE ??= "witherspoon" DISTRO ?= "openbmc-witherspoon" diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf index e5485c3be..efcf7717d 100644 --- a/meta-ibm/conf/machine/mihawk.conf +++ b/meta-ibm/conf/machine/mihawk.conf @@ -1,6 +1,5 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" -KERNEL_FEATURES_append = " phosphor-wdt-on-panic" UBOOT_MACHINE = "ast_g5_ncsi_config" 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" diff --git a/meta-ibm/conf/machine/witherspoon-128.conf b/meta-ibm/conf/machine/witherspoon-128.conf deleted file mode 100644 index d21b9b22b..000000000 --- a/meta-ibm/conf/machine/witherspoon-128.conf +++ /dev/null @@ -1,14 +0,0 @@ -MACHINEOVERRIDES =. "witherspoon:" -require conf/machine/witherspoon.conf - -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" - -MRW_XML = "witherspoon.xml" - -# 128MB flash size -FLASH_SIZE = "131072" - -# 32MB read-write filesystem -FLASH_UBI_RWFS_SIZE ?= "32768" -FLASH_UBI_RWFS_TXT_SIZE ?= "32MiB" -BMC_RW_SIZE = "0x2000000" 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" diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf index 340d7f751..acceb478b 100644 --- a/meta-ibm/conf/machine/witherspoon.conf +++ b/meta-ibm/conf/machine/witherspoon.conf @@ -1,6 +1,5 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" -KERNEL_FEATURES_append = " phosphor-wdt-on-panic" UBOOT_MACHINE = "ast_g5_ncsi_config" |