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

[build] support CENTEC SAI 1.0 on 201712 branch and update e582-48x6q board #1269

Merged
merged 5 commits into from
Jan 8, 2018
Merged

[build] support CENTEC SAI 1.0 on 201712 branch and update e582-48x6q board #1269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
406d05c
support e582-48x2q4z
xuwj-arvin Dec 25, 2017
c08d4eb
update swssconfig.sh
Dec 28, 2017
69bc130
libsaithrift-dev.mk
Dec 28, 2017
7e00573
Update libsaithrift-dev.mk
Dec 28, 2017
ba5ca8b
update swssconfig.sh
xuwj-arvin Jan 8, 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
86 changes: 54 additions & 32 deletions device/centec/x86_64-centec_e582_48x6q-r0/E582-48x6q/port_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,55 @@
# name lanes
Ethernet0 1
Ethernet4 2
Ethernet8 3
Ethernet12 4
Ethernet16 5
Ethernet20 6
Ethernet24 7
Ethernet28 8
Ethernet32 9
Ethernet36 10
Ethernet40 11
Ethernet44 12
Ethernet48 13
Ethernet52 14
Ethernet56 15
Ethernet60 16
Ethernet64 17
Ethernet68 18
Ethernet72 19
Ethernet76 20
Ethernet80 21
Ethernet84 22
Ethernet88 23
Ethernet92 24
Ethernet96 25
Ethernet100 26
Ethernet104 27
Ethernet108 28
Ethernet112 29
Ethernet116 30
Ethernet120 31
Ethernet124 32
Ethernet1 1
Ethernet2 2
Ethernet3 3
Ethernet4 4
Ethernet5 5
Ethernet6 6
Ethernet7 7
Ethernet8 8
Ethernet9 9
Ethernet10 10
Ethernet11 11
Ethernet12 12
Ethernet13 13
Ethernet14 14
Ethernet15 15
Ethernet16 16
Ethernet17 17
Ethernet18 18
Ethernet19 19
Ethernet20 20
Ethernet21 21
Ethernet22 22
Ethernet23 23
Ethernet24 24
Ethernet25 25
Ethernet26 26
Ethernet27 27
Ethernet28 28
Ethernet29 29
Ethernet30 30
Ethernet31 31
Ethernet32 32
Ethernet33 33
Ethernet34 34
Ethernet35 35
Ethernet36 36
Ethernet37 37
Ethernet38 38
Ethernet39 39
Ethernet40 40
Ethernet41 41
Ethernet42 42
Ethernet43 43
Ethernet44 44
Ethernet45 45
Ethernet46 46
Ethernet47 47
Ethernet48 48
Ethernet49 49
Ethernet50 50
Ethernet51 51
Ethernet52 52
Ethernet53 53
Ethernet54 54
1 change: 1 addition & 0 deletions device/centec/x86_64-centec_e582_48x6q-r0/installer.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CONSOLE_SPEED=115200
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=no"
2 changes: 2 additions & 0 deletions dockers/docker-orchagent/swssconfig.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ HWSKU=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['hwsku']"`

SWSSCONFIG_ARGS="00-copp.config.json ipinip.json ports.json switch.json "

if [ "$HWSKU" == "E582-48x6q" ]; then
SWSSCONFIG_ARGS=""
Copy link
Collaborator

Choose a reason for hiding this comment

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

on centec platform, I assume you need to apply copp.config.json, ipinip.json, ports.json as well as switch.json.

Copy link
Author

Choose a reason for hiding this comment

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

yes, that's OK.

if [ "$HWSKU" == "Force10-S6000" ]; then
Copy link
Collaborator

Choose a reason for hiding this comment

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

please change this to elif

Copy link
Author

Choose a reason for hiding this comment

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

accept

SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
elif [ "$HWSKU" == "Force10-S6000-Q32" ]; then
Expand Down
2 changes: 1 addition & 1 deletion platform/centec/libsaithrift-dev.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ LIBSAITHRIFT_DEV_CENTEC = libsaithrift-dev_0.9.4_amd64.deb
$(LIBSAITHRIFT_DEV_CENTEC)_SRC_PATH = $(SRC_PATH)/SAI
$(LIBSAITHRIFT_DEV_CENTEC)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CENTEC_SAI)
$(LIBSAITHRIFT_DEV_CENTEC)_RDEPENDS += $(LIBTHRIFT) $(CENTEC_SAI)
SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CENTEC)
#SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CENTEC)
Copy link
Collaborator

Choose a reason for hiding this comment

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

no need to comment this line.

Copy link
Author

Choose a reason for hiding this comment

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

accept

Copy link
Author

Choose a reason for hiding this comment

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

my compile is failed caused by this line. the log said that there are no src/SAI derectory for pushd.
and referenced from BCM, Mellenox who can pass build on master, i comment it.

6 changes: 2 additions & 4 deletions platform/centec/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ include $(PLATFORM_PATH)/libsaithrift-dev.mk
include $(PLATFORM_PATH)/python-saithrift.mk
include $(PLATFORM_PATH)/docker-ptf-centec.mk

SONIC_ALL += $(SONIC_ONE_IMAGE) \
$(DOCKER_PTF_CENTEC) \
$(DOCKER_SYNCD_CENTEC_RPC)
Copy link
Collaborator

Choose a reason for hiding this comment

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

why comment out DOCKER_PTF_CENTEC and DOCKER_SYNCD_CENTEC_RPC?

Copy link
Author

Choose a reason for hiding this comment

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

DOCKER_PTF_CENTEC and DOCKER_SYNCD_CENTEC_RPC depend on LIBSAITHRIFT_DEV_CENTEC

SONIC_ALL += $(SONIC_ONE_IMAGE)

# Inject centec sai into sairedis
$(LIBSAIREDIS)_DEPENDS += $(CENTEC_SAI) $(LIBSAITHRIFT_DEV_CENTEC)
$(LIBSAIREDIS)_DEPENDS += $(CENTEC_SAI) #$(LIBSAITHRIFT_DEV_CENTEC)

# Runtime dependency on centec sai is set only for syncd
$(SYNCD)_RDEPENDS += $(CENTEC_SAI)
2 changes: 1 addition & 1 deletion platform/centec/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Centec SAI
CENTEC_SAI = libsai_1.0.0_amd64.deb
$(CENTEC_SAI)_URL = https://github.com/CentecNetworks/goldengate-sai/raw/master/lib/SONiC_0.9.4/libsai_1.0.0_amd64.deb
$(CENTEC_SAI)_URL = https://github.com/CentecNetworks/goldengate-sai/raw/master/lib/SONiC_1.0/libsai_1.0.0_amd64.deb

SONIC_ONLINE_DEBS += $(CENTEC_SAI)
2 changes: 1 addition & 1 deletion platform/centec/sdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CENTEC_SDK_KERNEL = centec-gg-sdk3.5-modules-3.16.0-4-amd64.deb
$(CENTEC_SDK_KERNEL)_URL = "https://github.com/CentecNetworks/goldengate-sai/raw/master/lib/centec-gg-sdk3.5-modules-3.16.0-4-amd64.deb"
$(CENTEC_SDK_KERNEL)_URL = "https://github.com/CentecNetworks/goldengate-sai/raw/master/lib/SONiC_1.0/centec-gg-sdk3.5-modules-3.16.0-4-amd64.deb"

SONIC_ONLINE_DEBS += $(CENTEC_SDK_KERNEL)