commit 4641bff5ac73e0ba3b91b9375096fe8f123ddc68
author Santosh Puranik <santosh.puranik@in.ibm.com> Mon Nov 30 20:26:44 2020 +0530
committer Santosh Puranik <santosh.puranik@in.ibm.com> Fri Dec 11 17:14:55 2020 +0000
tree 48b0b6f617a0b4f7fe40d10f998f01ba2ef3fabd
parent 280197e3317d1136b4feedd992cf7f797c1934a7

Fix u-boot env var name for Rainier 2U

Change the value of the fitconfig u-boot environment
variable to 'conf@aspeed-bmc-ibm-rainier.dtb'.
This is to match the value used by u-boot to switch to the right
device tree for Rainier 2U.

This also adds Everest to the list of supported systems.

Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Change-Id: Ie52bffb1e50c0fd7d081038732e3c5676a69de03

const.hpp

diff --git a/const.hpp b/const.hpp
index e72abff..75fc63f 100644
--- a/const.hpp
+++ b/const.hpp
@@ -49,6 +49,7 @@
 static constexpr auto INVALID_NODE_NUMBER = -1;
 static constexpr auto RAINIER_2U = "50001001";
 static constexpr auto RAINIER_4U = "50001000";
+static constexpr auto EVEREST = "50003000";
 
 constexpr uint8_t KW_VPD_START_TAG = 0x82;
 constexpr uint8_t KW_VPD_END_TAG = 0x78;

ibm_vpd_app.cpp

diff --git a/ibm_vpd_app.cpp b/ibm_vpd_app.cpp
index 1c0b17e..83e2cd2 100644
--- a/ibm_vpd_app.cpp
+++ b/ibm_vpd_app.cpp
@@ -36,8 +36,9 @@
 using namespace phosphor::logging;
 
 static const deviceTreeMap deviceTreeSystemTypeMap = {
-    {RAINIER_2U, "conf@aspeed-bmc-ibm-rainier-2u.dtb"},
-    {RAINIER_4U, "conf@aspeed-bmc-ibm-rainier-4u.dtb"}};
+    {RAINIER_2U, "conf@aspeed-bmc-ibm-rainier.dtb"},
+    {RAINIER_4U, "conf@aspeed-bmc-ibm-rainier-4u.dtb"},
+    {EVEREST, "conf@aspeed-bmc-ibm-everest.dtb"}};
 
 /**
  * @brief Expands location codes
@@ -538,11 +539,14 @@
         {
             target = INVENTORY_JSON_4U;
         }
-
         else if (imValStr == RAINIER_2U) // 2U
         {
             target = INVENTORY_JSON_2U;
         }
+        else if (imValStr == EVEREST)
+        {
+            target = INVENTORY_JSON_EVEREST;
+        }
 
         // Create the directory for hosting the symlink
         fs::create_directories(VPD_FILES_PATH);

meson.build

diff --git a/meson.build b/meson.build
index aa68922..1b7e271 100644
--- a/meson.build
+++ b/meson.build
@@ -38,7 +38,8 @@
                        'INVENTORY_MANAGER_CACHE' : '"'+get_option('INVENTORY_MANAGER_CACHE')+'"',
                        'INVENTORY_JSON_SYM_LINK': '"'+get_option('INVENTORY_JSON_SYM_LINK')+'"',
                        'INVENTORY_JSON_2U': '"'+get_option('INVENTORY_JSON_2U')+'"',
-                       'INVENTORY_JSON_4U': '"'+get_option('INVENTORY_JSON_4U')+'"'
+                       'INVENTORY_JSON_4U': '"'+get_option('INVENTORY_JSON_4U')+'"',
+                       'INVENTORY_JSON_EVEREST': '"'+get_option('INVENTORY_JSON_EVEREST')+'"'
                        }
   )
 

meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index a06c63a..46adce4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -19,3 +19,4 @@
 option('INVENTORY_JSON_SYM_LINK',type: 'string', value: '/var/lib/vpd/vpd_inventory.json',  description: 'Symbolic link to vpd inventory json.')
 option('INVENTORY_JSON_2U',type: 'string', value: '/usr/share/vpd/50001001.json',  description: 'Inventory JSON for 2U system.')
 option('INVENTORY_JSON_4U',type: 'string', value: '/usr/share/vpd/50001000.json',  description: 'Inventory JSON for 4U system.')
+option('INVENTORY_JSON_EVEREST',type: 'string', value: '/usr/share/vpd/50003000.json',  description: 'Inventory JSON for Everest system.')