commit 6d1d01405a411f7f33da9cdb04fe549eef966cb6
author Jae Hyun Yoo <jae.hyun.yoo@intel.com> Wed Jul 25 10:07:43 2018 -0700
committer James Feist <james.feist@linux.intel.com> Tue Aug 07 11:20:50 2018 -0700
tree 6dd8769e9ac7374856dfcb3b2d9ba9e574b27e85
parent 5211e5f4a39284249c0c72d01f62e19de78394d4

Fix overlay creation logic to use reg value for node names

This commit fixes device tree overlay creation logic and templates
to use reg values for node names.

Change-Id: I0945ad204c74a52a96ac283884a699e125b703fe
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com>

src/Overlay.cpp

diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index f80994f..697456d 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -30,6 +30,7 @@
 constexpr const char *OUTPUT_DIR = "/tmp/overlays";
 constexpr const char *TEMPLATE_DIR = "/usr/share/overlay_templates";
 constexpr const char *TEMPLATE_CHAR = "$";
+constexpr const char *HEX_FORMAT_STR = "0x";
 constexpr const char *PLATFORM = "aspeed,ast2500";
 constexpr const char *I2C_DEVS_DIR = "/sys/class/i2c-dev";
 
@@ -173,6 +174,21 @@
                 keyPair.value().get<std::string>(), ILLEGAL_NAME_REGEX, "_");
             name = subsituteString;
         }
+        else if (keyPair.key() == "address")
+        {
+            if (keyPair.value().type() == nlohmann::json::value_t::string)
+            {
+                subsituteString = keyPair.value().get<std::string>();
+                subsituteString.erase(
+                    0, subsituteString.find_first_not_of(HEX_FORMAT_STR));
+            }
+            else
+            {
+                std::ostringstream hex;
+                hex << std::hex << keyPair.value().get<unsigned int>();
+                subsituteString = hex.str();
+            }
+        }
         else
         {
             subsituteString = jsonToString(keyPair.value());
@@ -289,4 +305,4 @@
     }
 
     return true;
-}
\ No newline at end of file
+}