summaryrefslogtreecommitdiff
path: root/meta-ibm/meta-witherspoon
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2020-04-20 16:54:14 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-04-21 19:46:05 +0300
commitd4c9d993000c08d252a5305a1ec41cbb055f20ff (patch)
tree896ff6370f39b94d5be06debd0be6bbcd5ead712 /meta-ibm/meta-witherspoon
parentb8721554e99726fb92669ae713049ec627aa0aac (diff)
downloadopenbmc-d4c9d993000c08d252a5305a1ec41cbb055f20ff.tar.xz
Revert "rainier and tacoma: Build u-boot spl"
This reverts commit f2f334e6221b659934a8e72f5ca1aa8c9b8ae173. The u-boot openbmc spl defconfig is still in review: https://patchwork.ozlabs.org/project/openbmc/patch/1586370073-71433-1-git-send-email-anoo@linux.ibm.com/ (From meta-ibm rev: 5bea35bdaa05c736796bd1d0f22f0c7eaee9b484) Change-Id: I134d9044595c1e129d8b545ac4e4429a8a4d9f2b Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon')
-rw-r--r--meta-ibm/meta-witherspoon/conf/machine/rainier.conf3
-rw-r--r--meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf3
2 files changed, 2 insertions, 4 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
index 4ce298e43e..1f8c21e73a 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf
@@ -1,7 +1,6 @@
KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb"
-UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
+UBOOT_MACHINE = "ast2600_openbmc_defconfig"
UBOOT_DEVICETREE = "ast2600-rainier"
-SPL_BINARY = "spl/u-boot-spl.bin"
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 c367e4c736..4d94d9e9de 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf
@@ -1,7 +1,6 @@
KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb"
-UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
+UBOOT_MACHINE = "ast2600_openbmc_defconfig"
UBOOT_DEVICETREE = "ast2600-tacoma"
-SPL_BINARY = "spl/u-boot-spl.bin"
IMAGE_FSTYPES += "ext4 mmc-ext4-tar"