From e843d994d049d4b1b17da707232e6934592d624d Mon Sep 17 00:00:00 2001
From: rajendra-dendukuri
 <47423477+rajendra-dendukuri@users.noreply.github.com>
Date: Fri, 10 Apr 2020 12:25:52 -0400
Subject: [PATCH] [brcm-th-svk]: Fix errors in BCM956960K switch (#4390)

Fix Broadcom TH SVK boot up crash
---
 .../broadcom/x86_64-bcm_xlr-r0/BCM956960K/sai.profile  |  2 +-
 .../{config_th_32x100.bcm => th_32x100.config.bcm}     |  0
 device/broadcom/x86_64-bcm_xlr-r0/plugins/eeprom.py    | 10 +++++++---
 .../utils/brcm-xlr-gts-create-eeprom-file.py           |  4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)
 rename device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/{config_th_32x100.bcm => th_32x100.config.bcm} (100%)

diff --git a/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/sai.profile b/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/sai.profile
index 80aa570ddf..e80e0d4c89 100644
--- a/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/sai.profile
+++ b/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/sai.profile
@@ -1 +1 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/config_th_32x100.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th_32x100.config.bcm
diff --git a/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/config_th_32x100.bcm b/device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm
similarity index 100%
rename from device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/config_th_32x100.bcm
rename to device/broadcom/x86_64-bcm_xlr-r0/BCM956960K/th_32x100.config.bcm
diff --git a/device/broadcom/x86_64-bcm_xlr-r0/plugins/eeprom.py b/device/broadcom/x86_64-bcm_xlr-r0/plugins/eeprom.py
index ce122d6ffa..25ea4849f7 100644
--- a/device/broadcom/x86_64-bcm_xlr-r0/plugins/eeprom.py
+++ b/device/broadcom/x86_64-bcm_xlr-r0/plugins/eeprom.py
@@ -8,10 +8,12 @@
 # - the eeprom format definition
 # - specific encoder/decoder if there is special need
 #
-# Note: the file /etc/sys_eeprom.bin is generated by the script
-#       brcm-xlr-gts-create-eeprom-file.py
+# Note: the file /usr/share/sonic/platform/sys_eeprom.bin is generated
+#       by the script brcm-xlr-gts-create-eeprom-file.py
 #############################################################################
 
+import os
+
 try:
     from sonic_eeprom import eeprom_tlvinfo
 except ImportError, e:
@@ -21,7 +23,9 @@ except ImportError, e:
 class board(eeprom_tlvinfo.TlvInfoDecoder):
 
     def __init__(self, name, path, cpld_root, ro):
-        self.eeprom_path = "/etc/sys_eeprom.bin"
+        self.eeprom_path = "/usr/share/sonic/platform/sys_eeprom.bin"
+        if os.path.isfile(self.eeprom_path) is False:
+             self.eeprom_path = "/usr/share/sonic/device/x86_64-bcm_xlr-r0/sys_eeprom.bin"
         super(board, self).__init__(self.eeprom_path, 0, '', False, True)
 
     def serial_number_str(self, e):
diff --git a/platform/broadcom/sonic-platform-modules-brcm-xlr-gts/utils/brcm-xlr-gts-create-eeprom-file.py b/platform/broadcom/sonic-platform-modules-brcm-xlr-gts/utils/brcm-xlr-gts-create-eeprom-file.py
index 71a99471a9..d8e7ec0ee1 100755
--- a/platform/broadcom/sonic-platform-modules-brcm-xlr-gts/utils/brcm-xlr-gts-create-eeprom-file.py
+++ b/platform/broadcom/sonic-platform-modules-brcm-xlr-gts/utils/brcm-xlr-gts-create-eeprom-file.py
@@ -93,13 +93,13 @@ def main():
     tlvinfo_header.totallen = len(tlvinfo_data.dump())+4;
 
     try:
-        f = open('/etc/sys_eeprom.bin', 'w+')
+        f = open('/usr/share/sonic/device/x86_64-bcm_xlr-r0/sys_eeprom.bin', 'w+')
         f.write(tlvinfo_header.dump())
         f.write(tlvinfo_data.dump())
         f.write(crc(tlvinfo_header.dump(), tlvinfo_data.dump()))
         f.close()
     except:
-        print('Unable to write file /etc/sys_eeprom.bin')
+        print('Unable to write file /usr/share/sonic/device/x86_64-bcm_xlr-r0/sys_eeprom.bin')
 
 if __name__== "__main__":
     main()