matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[devices]: Move Arista bfn platforms under platform/barefoot (#1894)

Browse Source 
The work on Arista 7170 was originally submitted under platform/p4.
Since the platform/barefoot was recently introduced, this is where
this platform support needs to go.

Signed-off-by: Samuel Angebault <staphylo@arista.com>
This commit is contained in:
Samuel Angebault 2018-07-31 22:11:57 -07:00 committed by lguohan
parent d389c09335
commit 2522565e15
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -78,5 +78,5 @@
path = platform/broadcom/sonic-platform-modules-mitac path = platform/broadcom/sonic-platform-modules-mitac
url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
[submodule "platform/p4/sonic-platform-modules-arista"] [submodule "platform/p4/sonic-platform-modules-arista"]
path = platform/p4/sonic-platform-modules-arista path = platform/barefoot/sonic-platform-modules-arista
url = https://github.com/aristanetworks/sonic url = https://github.com/aristanetworks/sonic

13
platform/barefoot/one-aboot.mk Normal file
View File

@ -0,0 +1,13 @@
# sonic one aboot installer
SONIC_ONE_ABOOT_IMAGE = sonic-aboot-barefoot.swi
$(SONIC_ONE_ABOOT_IMAGE)_MACHINE = barefoot
$(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(BFN_PLATFORM_MODULE)
$(SONIC_ONE_ABOOT_IMAGE)_LAZY_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) \
$(ARISTA_PLATFORM_MODULE_PYTHON2) \
$(ARISTA_PLATFORM_MODULE_PYTHON3) \
$(ARISTA_PLATFORM_MODULE)
$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
SONIC_INSTALLERS += $(SONIC_ONE_ABOOT_IMAGE)

0
platform/p4/platform-modules-arista.mk → platform/barefoot/platform-modules-arista.mk
View File

5
platform/barefoot/rules.mk
View File

@ -1,3 +1,4 @@
include $(PLATFORM_PATH)/platform-modules-arista.mk
include $(PLATFORM_PATH)/platform-modules-bfn.mk include $(PLATFORM_PATH)/platform-modules-bfn.mk
include $(PLATFORM_PATH)/platform-modules-bfn-montara.mk include $(PLATFORM_PATH)/platform-modules-bfn-montara.mk
include $(PLATFORM_PATH)/platform-modules-wnc-osw1800.mk include $(PLATFORM_PATH)/platform-modules-wnc-osw1800.mk
@ -6,6 +7,7 @@ include $(PLATFORM_PATH)/bfn-sai.mk
include $(PLATFORM_PATH)/docker-syncd-bfn.mk include $(PLATFORM_PATH)/docker-syncd-bfn.mk
include $(PLATFORM_PATH)/docker-syncd-bfn-rpc.mk include $(PLATFORM_PATH)/docker-syncd-bfn-rpc.mk
include $(PLATFORM_PATH)/docker-orchagent-bfn.mk include $(PLATFORM_PATH)/docker-orchagent-bfn.mk
include $(PLATFORM_PATH)/one-aboot.mk
include $(PLATFORM_PATH)/one-image.mk include $(PLATFORM_PATH)/one-image.mk
include $(PLATFORM_PATH)/libsaithrift-dev.mk include $(PLATFORM_PATH)/libsaithrift-dev.mk
include $(PLATFORM_PATH)/python-saithrift.mk include $(PLATFORM_PATH)/python-saithrift.mk
@ -13,7 +15,8 @@ include $(PLATFORM_PATH)/docker-ptf-bfn.mk
include $(PLATFORM_PATH)/bfn-platform.mk include $(PLATFORM_PATH)/bfn-platform.mk
include $(PLATFORM_PATH)/bfn-platform-wnc.mk include $(PLATFORM_PATH)/bfn-platform-wnc.mk
include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk
SONIC_ALL += $(SONIC_ONE_IMAGE) \
SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \
$(DOCKER_FPM) $(DOCKER_FPM)
# Inject sai into sairedis # Inject sai into sairedis

0
platform/p4/sonic-platform-modules-arista → platform/barefoot/sonic-platform-modules-arista
View File

12
platform/p4/one-aboot.mk
View File

@ -1,12 +0,0 @@
# sonic broadcom one image installer
SONIC_ONE_ABOOT_IMAGE = sonic-aboot-p4.swi
$(SONIC_ONE_ABOOT_IMAGE)_MACHINE = p4
$(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) $(ARISTA_PLATFORM_MODULE_PYTHON2) $(ARISTA_PLATFORM_MODULE_PYTHON3) $(ARISTA_PLATFORM_MODULE)
# FIXME: this is a temporary workaround for testing the platform driver
$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += docker-platform-monitor.gz
# $(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
SONIC_INSTALLERS += $(SONIC_ONE_ABOOT_IMAGE)

2
platform/p4/rules.mk
View File

@ -1,6 +1,4 @@
# include $(PLATFORM_PATH)/p4-softswitch.mk # include $(PLATFORM_PATH)/p4-softswitch.mk
include $(PLATFORM_PATH)/platform-modules-arista.mk
include $(PLATFORM_PATH)/one-aboot.mk
include $(PLATFORM_PATH)/tenjin.mk include $(PLATFORM_PATH)/tenjin.mk
include $(PLATFORM_PATH)/p4-hlir.mk include $(PLATFORM_PATH)/p4-hlir.mk
include $(PLATFORM_PATH)/p4c-bm.mk include $(PLATFORM_PATH)/p4c-bm.mk