support new fitconfig u-boot syntax
The following commit changed the syntax of the fitconfig u-boot
environment variable:
https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta?id=cfc0e21b1066b5d5d0fc37fbc5d79f40f4576f1d
OpenBMC pulled this in via:
https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/41108
The summary is that the "@" symbol was repaced with a "-" symbol.
Because this is a u-boot environment variable which is persistent across
code updates, there is no good way to make this backwards or forwards
compatible with the poky change. It will be up to the system owner to
manage this issue if they are utilizing this fitconfig override feature.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ica16e333e5f9d731ccf8da0048f6d1d2c1cc3bf2
diff --git a/ibm_vpd_app.cpp b/ibm_vpd_app.cpp
index 0185739..b5ca5fd 100644
--- a/ibm_vpd_app.cpp
+++ b/ibm_vpd_app.cpp
@@ -38,10 +38,10 @@
using namespace phosphor::logging;
static const deviceTreeMap deviceTreeSystemTypeMap = {
- {RAINIER_2U, "conf@aspeed-bmc-ibm-rainier.dtb"},
- {RAINIER_4U, "conf@aspeed-bmc-ibm-rainier-4u.dtb"},
- {RAINIER_1S4U, "conf@aspeed-bmc-ibm-rainier-1s4u.dtb"},
- {EVEREST, "conf@aspeed-bmc-ibm-everest.dtb"}};
+ {RAINIER_2U, "conf-aspeed-bmc-ibm-rainier.dtb"},
+ {RAINIER_4U, "conf-aspeed-bmc-ibm-rainier-4u.dtb"},
+ {RAINIER_1S4U, "conf-aspeed-bmc-ibm-rainier-1s4u.dtb"},
+ {EVEREST, "conf-aspeed-bmc-ibm-everest.dtb"}};
/**
* @brief Returns the power state for chassis0