From aa5bf640db7b7fca245c1669eeb02198a50cb5c1 Mon Sep 17 00:00:00 2001 From: kram Date: Thu, 2 Nov 2017 17:00:19 -0700 Subject: [PATCH] initial barefoot checkin october 2017 --- saidiscovery/Makefile.am | 2 +- saisdkdump/Makefile.am | 2 +- syncd/Makefile.am | 2 +- syncd/scripts/syncd_init_common.sh | 10 ++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am index 451c2bbb0..8c57ef570 100644 --- a/saidiscovery/Makefile.am +++ b/saidiscovery/Makefile.am @@ -11,7 +11,7 @@ endif if SAIVS SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs else -SAILIB=-lsai +SAILIB=-L/opt/bfn/install/lib -lswitchsai -lswitchapi -lbf_switchd_lib -ltofinopdfixed_thrift -ldriver -lbfutils -lbfsys -lbfutils -L/opt/bfn/install/lib/tofinopd/switch -lpd -lpdcli -lpdthrift endif saidiscovery_SOURCES = saidiscovery.cpp diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am index a7bc6d07d..304f2c394 100644 --- a/saisdkdump/Makefile.am +++ b/saisdkdump/Makefile.am @@ -11,7 +11,7 @@ endif if SAIVS SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs else -SAILIB=-lsai +SAILIB=-L/opt/bfn/install/lib -lswitchsai -lswitchapi -lbf_switchd_lib -ltofinopdfixed_thrift -ldriver -lbfutils -lbfsys -lbfutils -L/opt/bfn/install/lib/tofinopd/switch -lpd -lpdcli -lpdthrift endif saisdkdump_SOURCES = saisdkdump.cpp diff --git a/syncd/Makefile.am b/syncd/Makefile.am index de59b3619..c48d3d13d 100644 --- a/syncd/Makefile.am +++ b/syncd/Makefile.am @@ -11,7 +11,7 @@ endif if SAIVS SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs else -SAILIB=-lsai +SAILIB=-L/opt/bfn/install/lib -lswitchsai -lswitchapi -lbf_switchd_lib -ltofinopdfixed_thrift -ldriver -lbfutils -lbfsys -lbfutils -L/opt/bfn/install/lib/tofinopd/switch -lpd -lpdcli -lpdthrift endif syncd_SOURCES = \ diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh index f31d201eb..bcfc20077 100755 --- a/syncd/scripts/syncd_init_common.sh +++ b/syncd/scripts/syncd_init_common.sh @@ -103,6 +103,14 @@ config_syncd_marvell() [ -e /dev/net/tun ] || ( mkdir -p /dev/net && mknod /dev/net/tun c 10 200 ) } +config_syncd_barefoot() +{ + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch + . /opt/bfn/install/bin/dma_setup.sh + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch + export LD_PRELOAD=libswitchapi.so:libswitchsai.so:libpd.so:libpdcli.so:libdriver.so:libbfsys.so +} + config_syncd() { if [ "$SONIC_ASIC_TYPE" == "broadcom" ]; then @@ -115,6 +123,8 @@ config_syncd() config_syncd_centec elif [ "$SONIC_ASIC_TYPE" == "marvell" ]; then config_syncd_marvell + elif [ "$SONIC_ASIC_TYPE" == "barefoot" ]; then + config_syncd_barefoot else echo "Unknown ASIC type $SONIC_ASIC_TYPE" exit 1