Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for platforms based on Barefoot Networks' device #304

Merged
merged 17 commits into from
Mar 14, 2018
Merged

Support for platforms based on Barefoot Networks' device #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aa5bf64
initial barefoot checkin october 2017
Nov 3, 2017
c48a7a2
Merge branch 'master' of https://github.com/Azure/sonic-sairedis into…
Nov 3, 2017
29ab3de
Revert "Merge branch 'master' of https://github.com/Azure/sonic-saire…
Nov 3, 2017
e0366e0
missed integration diffs
Nov 4, 2017
30c8f89
Merge remote-tracking branch 'azure/master' into bf-master
Nov 13, 2017
67d998b
Merge remote-tracking branch 'azure/master' into bf-master
Nov 18, 2017
17ef711
Merge remote-tracking branch 'azure/master' into bf-master
Nov 21, 2017
ce80282
Merge remote-tracking branch 'azure/master' into bf-master
Dec 11, 2017
05048cf
handle platform specific lins in different directory (@runtime)
Jan 5, 2018
450ed3b
force order of library path to look for platform dir before lib dir
Jan 5, 2018
2da73f8
enable fast-boot for barefoot platforms
Jan 11, 2018
d6b0ca3
allow Makefile to build for other platforms - restore it original for…
Jan 18, 2018
adfdb86
allow clean build
Jan 19, 2018
043ac32
Revert "allow clean build"
Jan 22, 2018
8d6d487
Revert "allow Makefile to build for other platforms - restore it orig…
Jan 22, 2018
fb55ef7
makefile cleanup towards upstream
Jan 23, 2018
bff6e2c
Merge branch '201712' into bf-master
Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions saidiscovery/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the libsai should be the only library that application link to. I will approve this for now, but you folks need to fix this.

else
SAILIB=-lsai
endif
endif

saidiscovery_SOURCES = saidiscovery.cpp

Expand Down
5 changes: 5 additions & 0 deletions saisdkdump/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions syncd/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
11 changes: 10 additions & 1 deletion syncd/scripts/syncd_init_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down