diff --git a/configure.ac b/configure.ac index 08ad419cc..acbd8716a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,8 @@ AC_PROG_CXX AC_PROG_LIBTOOL AC_HEADER_STDC +AM_CONDITIONAL(sonic_asic_platform_barefoot, test x$CONFIGURED_PLATFORM = xbarefoot) + AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging], [case "${enableval}" in diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am index 451c2bbb0..04c49968b 100644 --- a/saidiscovery/Makefile.am +++ b/saidiscovery/Makefile.am @@ -11,8 +11,12 @@ endif if SAIVS SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs else +if sonic_asic_platform_barefoot +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 +else SAILIB=-lsai endif +endif saidiscovery_SOURCES = saidiscovery.cpp diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am index a7bc6d07d..1ce8efca5 100644 --- a/saisdkdump/Makefile.am +++ b/saisdkdump/Makefile.am @@ -8,11 +8,16 @@ else DBGFLAGS = -g endif + if SAIVS SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs else +if sonic_asic_platform_barefoot +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 +else SAILIB=-lsai endif +endif saisdkdump_SOURCES = saisdkdump.cpp saisdkdump_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS) diff --git a/syncd/Makefile.am b/syncd/Makefile.am index 6652e466f..e9849eb63 100644 --- a/syncd/Makefile.am +++ b/syncd/Makefile.am @@ -11,8 +11,12 @@ endif if SAIVS SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs else +if sonic_asic_platform_barefoot +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 +else SAILIB=-lsai endif +endif syncd_SOURCES = \ main.cpp \ diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh index c170c486a..70f7b27ce 100755 --- a/syncd/scripts/syncd_init_common.sh +++ b/syncd/scripts/syncd_init_common.sh @@ -101,10 +101,17 @@ config_syncd_marvell() [ -e /dev/net/tun ] || ( mkdir -p /dev/net && mknod /dev/net/tun c 10 200 ) } +config_syncd_barefoot() +{ + export ONIE_PLATFORM=`grep platform /etc/machine.conf | awk 'BEGIN { FS = "=" } ; { print $2 }'` + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib/platform/$ONIE_PLATFORM:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch + . /opt/bfn/install/bin/dma_setup.sh + export LD_PRELOAD=libswitchapi.so:libswitchsai.so:libpd.so:libpdcli.so:libdriver.so:libbfsys.so +} + config_syncd_nephos() { CMD_ARGS+=" -p $HWSKU_DIR/sai.profile" - if [ $FAST_REBOOT == "yes" ]; then CMD_ARGS+=" -t fast" fi @@ -122,6 +129,8 @@ config_syncd() config_syncd_centec elif [ "$SONIC_ASIC_TYPE" == "marvell" ]; then config_syncd_marvell + elif [ "$SONIC_ASIC_TYPE" == "barefoot" ]; then + config_syncd_barefoot elif [ "$SONIC_ASIC_TYPE" == "nephos" ]; then config_syncd_nephos else