Skip to content

Commit 2522565

Browse files
Staphylolguohan
authored andcommitted
[devices]: Move Arista bfn platforms under platform/barefoot (#1894)
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 <[email protected]>
1 parent d389c09 commit 2522565

File tree

7 files changed

+18
-16
lines changed

7 files changed

+18
-16
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@
7878
path = platform/broadcom/sonic-platform-modules-mitac
7979
url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
8080
[submodule "platform/p4/sonic-platform-modules-arista"]
81-
path = platform/p4/sonic-platform-modules-arista
81+
path = platform/barefoot/sonic-platform-modules-arista
8282
url = https://github.com/aristanetworks/sonic

platform/barefoot/one-aboot.mk

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# sonic one aboot installer
2+
3+
SONIC_ONE_ABOOT_IMAGE = sonic-aboot-barefoot.swi
4+
$(SONIC_ONE_ABOOT_IMAGE)_MACHINE = barefoot
5+
$(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
6+
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(BFN_PLATFORM_MODULE)
7+
$(SONIC_ONE_ABOOT_IMAGE)_LAZY_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
8+
$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) \
9+
$(ARISTA_PLATFORM_MODULE_PYTHON2) \
10+
$(ARISTA_PLATFORM_MODULE_PYTHON3) \
11+
$(ARISTA_PLATFORM_MODULE)
12+
$(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
13+
SONIC_INSTALLERS += $(SONIC_ONE_ABOOT_IMAGE)

platform/barefoot/rules.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
include $(PLATFORM_PATH)/platform-modules-arista.mk
12
include $(PLATFORM_PATH)/platform-modules-bfn.mk
23
include $(PLATFORM_PATH)/platform-modules-bfn-montara.mk
34
include $(PLATFORM_PATH)/platform-modules-wnc-osw1800.mk
@@ -6,14 +7,16 @@ include $(PLATFORM_PATH)/bfn-sai.mk
67
include $(PLATFORM_PATH)/docker-syncd-bfn.mk
78
include $(PLATFORM_PATH)/docker-syncd-bfn-rpc.mk
89
include $(PLATFORM_PATH)/docker-orchagent-bfn.mk
10+
include $(PLATFORM_PATH)/one-aboot.mk
911
include $(PLATFORM_PATH)/one-image.mk
1012
include $(PLATFORM_PATH)/libsaithrift-dev.mk
1113
include $(PLATFORM_PATH)/python-saithrift.mk
1214
include $(PLATFORM_PATH)/docker-ptf-bfn.mk
1315
include $(PLATFORM_PATH)/bfn-platform.mk
1416
include $(PLATFORM_PATH)/bfn-platform-wnc.mk
1517
include $(PLATFORM_PATH)/bfn-platform-ingrasys.mk
16-
SONIC_ALL += $(SONIC_ONE_IMAGE) \
18+
19+
SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT) \
1720
$(DOCKER_FPM)
1821

1922
# Inject sai into sairedis

platform/p4/one-aboot.mk

Lines changed: 0 additions & 12 deletions
This file was deleted.

platform/p4/rules.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# include $(PLATFORM_PATH)/p4-softswitch.mk
2-
include $(PLATFORM_PATH)/platform-modules-arista.mk
3-
include $(PLATFORM_PATH)/one-aboot.mk
42
include $(PLATFORM_PATH)/tenjin.mk
53
include $(PLATFORM_PATH)/p4-hlir.mk
64
include $(PLATFORM_PATH)/p4c-bm.mk

0 commit comments

Comments
 (0)