witherspoon: Update image location for software manager

Update witherspoon to store new software bmc images in the
bmc and alternate chip, use the plus sign (+) as separator
since that one doesn't conflict with the build substitution
function and shell scripting.
Set the default location for bmc images to the bmc chip now
that the listed issues have been resolved.

Change-Id: I7cfe9977bde580f571418d5ea450e58b562d2799
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend b/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend
index 954aaf3..336697b 100644
--- a/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend
+++ b/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend
@@ -1,6 +1,3 @@
-BMC_RW_MTD = "pnor"
-# TODO Use the primary and alternate BMC chips to store the read-only
-# and kernel images once these issues are closed openbmc/openbmc#1942
-# and openbmc/openbmc#1791
-#BMC_RO_MTD = "alt"
-#BMC_KERNEL_MTD = "bmc"
+BMC_RW_MTD = "bmc"
+BMC_RO_MTD = "alt-bmc+bmc"
+BMC_KERNEL_MTD = "bmc"