From aa5bf640db7b7fca245c1669eeb02198a50cb5c1 Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Thu, 2 Nov 2017 17:00:19 -0700
Subject: [PATCH 01/11] 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

From 29ab3de71f1ec297fd0c79057a4fe5d34e4e62a5 Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Fri, 3 Nov 2017 13:10:20 -0700
Subject: [PATCH 02/11] Revert "Merge branch 'master' of
 https://github.com/Azure/sonic-sairedis into rel_6_0"

This reverts commit c48a7a20de2fb9e615535481f8727029440413bc, reversing
changes made to aa5bf640db7b7fca245c1669eeb02198a50cb5c1.
---
 syncd/scripts/syncd_init_common.sh | 2 ++
 vslib/src/sai_vs_hostintf.cpp      | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
index 1513f5345..bcfc20077 100755
--- a/syncd/scripts/syncd_init_common.sh
+++ b/syncd/scripts/syncd_init_common.sh
@@ -92,6 +92,8 @@ config_syncd_cavium()
     until [ $(redis-cli ping | grep -c PONG) -gt 0 ]; do
         sleep 1
     done
+
+    redis-cli FLUSHALL
 }
 
 config_syncd_marvell()
diff --git a/vslib/src/sai_vs_hostintf.cpp b/vslib/src/sai_vs_hostintf.cpp
index 6701c717a..6bdb70ef7 100644
--- a/vslib/src/sai_vs_hostintf.cpp
+++ b/vslib/src/sai_vs_hostintf.cpp
@@ -314,11 +314,7 @@ sai_status_t vs_create_hostif_int(
 
     if (g_vs_hostif_use_tap_device == false)
     {
-        return vs_generic_create(object_type,
-                hostif_id,
-                switch_id,
-                attr_count,
-                attr_list);
+        return SAI_STATUS_SUCCESS;
     }
 
     // validate SAI_HOSTIF_ATTR_TYPE

From e0366e03b884b155bc93751999ae08b961592026 Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Sat, 4 Nov 2017 14:12:37 -0700
Subject: [PATCH 03/11] missed integration diffs

---
 syncd/scripts/syncd_init_common.sh | 2 --
 vslib/src/sai_vs_hostintf.cpp      | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
index bcfc20077..1513f5345 100755
--- a/syncd/scripts/syncd_init_common.sh
+++ b/syncd/scripts/syncd_init_common.sh
@@ -92,8 +92,6 @@ config_syncd_cavium()
     until [ $(redis-cli ping | grep -c PONG) -gt 0 ]; do
         sleep 1
     done
-
-    redis-cli FLUSHALL
 }
 
 config_syncd_marvell()
diff --git a/vslib/src/sai_vs_hostintf.cpp b/vslib/src/sai_vs_hostintf.cpp
index 6bdb70ef7..6701c717a 100644
--- a/vslib/src/sai_vs_hostintf.cpp
+++ b/vslib/src/sai_vs_hostintf.cpp
@@ -314,7 +314,11 @@ sai_status_t vs_create_hostif_int(
 
     if (g_vs_hostif_use_tap_device == false)
     {
-        return SAI_STATUS_SUCCESS;
+        return vs_generic_create(object_type,
+                hostif_id,
+                switch_id,
+                attr_count,
+                attr_list);
     }
 
     // validate SAI_HOSTIF_ATTR_TYPE

From 05048cff147b2147c1f00d5aa4f60a877f4d6924 Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Fri, 5 Jan 2018 14:14:29 -0800
Subject: [PATCH 04/11] handle platform specific lins in different directory
 (@runtime)

---
 syncd/scripts/syncd_init_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
index 1513f5345..6e1e44255 100755
--- a/syncd/scripts/syncd_init_common.sh
+++ b/syncd/scripts/syncd_init_common.sh
@@ -103,9 +103,9 @@ config_syncd_marvell()
 
 config_syncd_barefoot()
 {
-     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch
+    export ONIE_PLATFORM=`grep platform /etc/machine.conf | awk 'BEGIN { FS = "=" } ; { print $2 }'`
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch:/opt/bfn/install/lib/platform/$ONIE_PLATFORM
      . /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
 }
 

From 450ed3bc3f360bf6fe9b66c1e8b34b19cbcc296a Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Fri, 5 Jan 2018 15:55:33 -0800
Subject: [PATCH 05/11] force order of library path to look for platform dir
 before lib dir

---
 syncd/scripts/syncd_init_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
index 6e1e44255..411827b2f 100755
--- a/syncd/scripts/syncd_init_common.sh
+++ b/syncd/scripts/syncd_init_common.sh
@@ -104,7 +104,7 @@ config_syncd_marvell()
 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:/opt/bfn/install/lib/tofinopd/switch:/opt/bfn/install/lib/platform/$ONIE_PLATFORM
+    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
 }

From 2da73f89ee857dc337d18cdc92ed2042623cbed2 Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Thu, 11 Jan 2018 14:27:21 -0800
Subject: [PATCH 06/11] enable fast-boot for barefoot platforms

---
 syncd/scripts/syncd_init_common.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
index 411827b2f..5a6b430f7 100755
--- a/syncd/scripts/syncd_init_common.sh
+++ b/syncd/scripts/syncd_init_common.sh
@@ -107,6 +107,10 @@ config_syncd_barefoot()
     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
+
+    if [ $FAST_REBOOT == "yes" ]; then
+        CMD_ARGS+=" -t fast"
+    fi
 }
 
 config_syncd()

From d6b0ca34fcf63d0b79c801cd95d7ee2fe58d21ac Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Wed, 17 Jan 2018 16:12:07 -0800
Subject: [PATCH 07/11] allow Makefile to build for other platforms - restore
 it original for non-bfn platforms

---
 saidiscovery/Makefile.am | 4 ++++
 saisdkdump/Makefile.am   | 4 ++++
 syncd/Makefile.am        | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
index 8c57ef570..15e46057f 100644
--- a/saidiscovery/Makefile.am
+++ b/saidiscovery/Makefile.am
@@ -11,7 +11,11 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+ifeq ($(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 304f2c394..1424a09c5 100644
--- a/saisdkdump/Makefile.am
+++ b/saisdkdump/Makefile.am
@@ -11,7 +11,11 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+ifeq ($(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
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
index 7cdba9f22..077af5944 100644
--- a/syncd/Makefile.am
+++ b/syncd/Makefile.am
@@ -11,7 +11,11 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+ifeq ($(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 = \

From adfdb8642fe0b5dbb4e19d13871172a03a8c883b Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Thu, 18 Jan 2018 20:45:33 -0800
Subject: [PATCH 08/11] allow clean build

---
 saidiscovery/Makefile.am | 2 ++
 saisdkdump/Makefile.am   | 2 ++
 syncd/Makefile.am        | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
index 15e46057f..c1ed6160d 100644
--- a/saidiscovery/Makefile.am
+++ b/saidiscovery/Makefile.am
@@ -11,12 +11,14 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+if PLATFORM
 ifeq ($(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
+endif
 
 saidiscovery_SOURCES = saidiscovery.cpp
 
diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
index 1424a09c5..80bc23100 100644
--- a/saisdkdump/Makefile.am
+++ b/saisdkdump/Makefile.am
@@ -11,12 +11,14 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+if PLATFORM
 ifeq ($(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
+endif
 
 saisdkdump_SOURCES = saisdkdump.cpp
 saisdkdump_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS)
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
index 077af5944..1acc532ca 100644
--- a/syncd/Makefile.am
+++ b/syncd/Makefile.am
@@ -11,12 +11,14 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+if PLATFORM
 ifeq ($(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
+endif
 
 syncd_SOURCES = \
 				main.cpp \

From 043ac32002560f4bd34c03f02ee9d708adb6c90f Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Mon, 22 Jan 2018 10:04:09 -0800
Subject: [PATCH 09/11] Revert "allow clean build"

This reverts commit adfdb8642fe0b5dbb4e19d13871172a03a8c883b.
---
 saidiscovery/Makefile.am | 2 --
 saisdkdump/Makefile.am   | 2 --
 syncd/Makefile.am        | 2 --
 3 files changed, 6 deletions(-)

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
index c1ed6160d..15e46057f 100644
--- a/saidiscovery/Makefile.am
+++ b/saidiscovery/Makefile.am
@@ -11,14 +11,12 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
-if PLATFORM
 ifeq ($(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
-endif
 
 saidiscovery_SOURCES = saidiscovery.cpp
 
diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
index 80bc23100..1424a09c5 100644
--- a/saisdkdump/Makefile.am
+++ b/saisdkdump/Makefile.am
@@ -11,14 +11,12 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
-if PLATFORM
 ifeq ($(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
-endif
 
 saisdkdump_SOURCES = saisdkdump.cpp
 saisdkdump_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS)
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
index 1acc532ca..077af5944 100644
--- a/syncd/Makefile.am
+++ b/syncd/Makefile.am
@@ -11,14 +11,12 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
-if PLATFORM
 ifeq ($(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
-endif
 
 syncd_SOURCES = \
 				main.cpp \

From 8d6d4871c32ceb453c5a97781b65b34711ea635d Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Mon, 22 Jan 2018 10:04:51 -0800
Subject: [PATCH 10/11] Revert "allow Makefile to build for other platforms -
 restore it original for non-bfn platforms"

This reverts commit d6b0ca34fcf63d0b79c801cd95d7ee2fe58d21ac.
---
 saidiscovery/Makefile.am | 4 ----
 saisdkdump/Makefile.am   | 4 ----
 syncd/Makefile.am        | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
index 15e46057f..8c57ef570 100644
--- a/saidiscovery/Makefile.am
+++ b/saidiscovery/Makefile.am
@@ -11,11 +11,7 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
-ifeq ($(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 1424a09c5..304f2c394 100644
--- a/saisdkdump/Makefile.am
+++ b/saisdkdump/Makefile.am
@@ -11,11 +11,7 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
-ifeq ($(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
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
index 077af5944..7cdba9f22 100644
--- a/syncd/Makefile.am
+++ b/syncd/Makefile.am
@@ -11,11 +11,7 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
-ifeq ($(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 = \

From fb55ef78e5ec624d54bebe5f60ccdea94e5940b0 Mon Sep 17 00:00:00 2001
From: kram <kram@barefootnetworks.com>
Date: Tue, 23 Jan 2018 11:31:46 -0800
Subject: [PATCH 11/11] makefile cleanup towards upstream

---
 configure.ac             | 2 ++
 saidiscovery/Makefile.am | 4 ++++
 saisdkdump/Makefile.am   | 5 +++++
 syncd/Makefile.am        | 4 ++++
 4 files changed, 15 insertions(+)

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 8c57ef570..04c49968b 100644
--- a/saidiscovery/Makefile.am
+++ b/saidiscovery/Makefile.am
@@ -11,7 +11,11 @@ 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 304f2c394..1ce8efca5 100644
--- a/saisdkdump/Makefile.am
+++ b/saisdkdump/Makefile.am
@@ -8,10 +8,15 @@ 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
diff --git a/syncd/Makefile.am b/syncd/Makefile.am
index 7cdba9f22..e9849eb63 100644
--- a/syncd/Makefile.am
+++ b/syncd/Makefile.am
@@ -11,7 +11,11 @@ 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 = \