Merge pull request #15 from kamalkrbh/master

Merge 1.5.1

ReadMe.md

@@ -6,6 +6,8 @@ To get the files required by installer refer [Required Software](#required-softw
 Default input while execution i.e. when user just presses enter without any input appears in square braces i.e. '[n]' or '[do_nothing]'
 
 ## Required Software
+Following SWs will be required to set up APSN switches, Instead of collecting below SWs from different places please refer 'All in one package' section at APSN Support portal.
+
 |SW|Details|Where to get it|
 |---|---|---|
 |bf-reference-bsp-<Release>-<APSN switch model>_<APSN ver>.zip|APSN Switches Platform package & Patch|APSN Support Portal|
@@ -14,8 +16,12 @@ Default input while execution i.e. when user just presses enter without any inpu
 |bf-reference-bsp-<Release>|Intel's Standard BSP for Tofino|Intel's Support Portal|
 
 ## Release Compatibility 
+Instead of collecting below SWs from different places please refer 'All in one package' section at APSN Support portal.
+'All in one package' contains Below mentioned SWs (except SDE and OS) with compatible releases (as said in below table) and ready to use config.  
+
 |Device|AOT|SAL|APSN BSP|SDE|Ref-BSP|OS (Recommended)|Kernel|
 |---|---|---|---|---|---|---|---|
+|BF2556X_1T<br>BF6064X_T|v1.5.1|sal_1.3.1|bf-reference-bsp-9.4.0-BF2556_1.0.2.zip<br>bf-reference-bsp-9.4.0-BF6064_1.0.1.zip|BF_SDE_9.4.0|bf-reference-bsp-9.4.0|Ubuntu Server 18.04.4 LTS|5.4.x
 |BF2556X_1T<br>BF6064X_T|v1.5.0|sal_1.3.0|bf-reference-bsp-9.4.0-BF2556_1.0.2.zip<br>bf-reference-bsp-9.4.0-BF6064_1.0.1.zip|BF_SDE_9.4.0|bf-reference-bsp-9.4.0|Ubuntu Server 18.04.4 LTS|5.4.x
 |BF2556X_1T<br>BF6064X_T|v1.4.2|sal_1.2.0|bf-reference-bsp-9.4.0-BF2556_1.0.1.zip<br>bf-reference-bsp-9.4.0-BF6064_1.0.1.zip|BF_SDE_9.4.0|bf-reference-bsp-9.4.0|Ubuntu Server 18.04.4 LTS|5.4.x
 |BF2556X_1T<br>BF6064X_T|v1.4.1|sal_1.1.1|bf-reference-bsp-9.3.0-BF2556_1c5723d.zip<br>bf-reference-bsp-9.3.0-BF6064_f536cae.zip|BF_SDE_9.3.0|bf-reference-bsp-9.3.0|Ubuntu Server 18.04.4 LTS|5.4.x

sal.py

@@ -191,11 +191,12 @@ def run_sal():
         exit(0)
     sal_home=get_env_var(constants.sal_home_env_var_name)
     sal_executable = sal_home + '/build/salRefApp'
-    sal_run_cmd = 'sudo -E LD_LIBRARY_PATH={0}:{1}:{2}:{3} {4}'.format(
+    sal_run_cmd = 'sudo -E LD_LIBRARY_PATH={0}:{1}:{2}:{3}:{4} {5}'.format(
         sal_home + '/build',
         sal_home + '/lib',
         get_env_var(constants.tp_install_env_var_name) + '/lib',
-        get_env_var(constants.sal_home_env_var_name) + '/install/lib', sal_executable)
+        get_env_var(constants.sal_home_env_var_name) + '/install/lib',
+        get_env_var(constants.sde_install_env_var_name) + '/lib', sal_executable)
     print('Running SAL with command: {}'.format(sal_run_cmd))
     execute_cmd(sal_run_cmd)
     return True