diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-04-06 23:33:31 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-04-06 23:33:31 +0300 |
| commit | ee6f67609223ac24c3e4f55ae7cc78c60a3fdb34 (patch) | |
| tree | bd1d54ebe254cd845372cf2dec425f077afb0e13 /meta-ibm/meta-witherspoon/conf | |
| parent | 38e3aafdebeed3bf185faba0e17d8ad0ca04b879 (diff) | |
| parent | 81e9ee0bf0a3cf373ed354fb1687b5ddebc6150c (diff) | |
| download | openbmc-ee6f67609223ac24c3e4f55ae7cc78c60a3fdb34.tar.xz | |
Merge tag 'wht-0.47' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/meta-witherspoon/conf')
| -rw-r--r-- | meta-ibm/meta-witherspoon/conf/local.conf.sample | 1 | ||||
| -rw-r--r-- | meta-ibm/meta-witherspoon/conf/machine/rainier.conf | 3 | ||||
| -rw-r--r-- | meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-ibm/meta-witherspoon/conf/local.conf.sample index d3a2303fc..94e76f3db 100644 --- a/meta-ibm/meta-witherspoon/conf/local.conf.sample +++ b/meta-ibm/meta-witherspoon/conf/local.conf.sample @@ -1,6 +1,7 @@ #MACHINE ?= "mihawk" #MACHINE ?= "swift" #MACHINE ?= "witherspoon-128" +#MACHINE ?= "rainier" MACHINE ??= "witherspoon" DISTRO ?= "openbmc-witherspoon" PACKAGE_CLASSES ?= "package_rpm" diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf index 78ffbbc82..1f8c21e73 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -1,5 +1,6 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" -UBOOT_MACHINE = "evb-ast2600_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_DEVICETREE = "ast2600-rainier" OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf index 2184847fd..765c0684a 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf @@ -1,5 +1,8 @@ KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb" -UBOOT_MACHINE = "evb-ast2600_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_DEVICETREE = "ast2600-tacoma" + +IMAGE_FSTYPES += "ext4" OBMC_POWER_SUPPLY_INSTANCES = "0 1" |