[build] support CENTEC SAI 1.0 on 201712 branch and update e582-48x6q board #1269
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
support sai1.0
lguohan
reviewed
Dec 27, 2017
| @@ -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="" | |||
| if [ "$HWSKU" == "Force10-S6000" ]; then | |||
There was a problem hiding this comment.
please change this to elif
lguohan
reviewed
Dec 27, 2017
| @@ -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) | |||
There was a problem hiding this comment.
no need to comment this line.
There was a problem hiding this comment.
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.
lguohan
reviewed
Dec 27, 2017
| @@ -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) | |||
There was a problem hiding this comment.
why comment out DOCKER_PTF_CENTEC and DOCKER_SYNCD_CENTEC_RPC?
There was a problem hiding this comment.
DOCKER_PTF_CENTEC and DOCKER_SYNCD_CENTEC_RPC depend on LIBSAITHRIFT_DEV_CENTEC
added 3 commits
December 28, 2017 09:45
add elif
no comment on LIBSAITHRIFT_DEV_CENTEC
|
currently all BCM, MNX, NEPHOS, P4 comment "SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_XXX)" . it seems they all have the same iuuse from libsaithrift-dev.mk. |
lguohan
approved these changes
Jan 3, 2018
lguohan
reviewed
Jan 3, 2018
| @@ -29,7 +29,9 @@ HWSKU=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['hwsku']"` | |||
|
|
|||
| SWSSCONFIG_ARGS="00-copp.config.json ipinip.json ports.json switch.json " | |||
|
|
|||
| if [ "$HWSKU" == "Force10-S6000" ]; then | |||
| if [ "$HWSKU" == "E582-48x6q" ]; then | |||
| SWSSCONFIG_ARGS="" | |||
There was a problem hiding this comment.
on centec platform, I assume you need to apply copp.config.json, ipinip.json, ports.json as well as switch.json.
lguohan
requested changes
Jan 3, 2018
lguohan
approved these changes
Jan 8, 2018
lguohan
pushed a commit
that referenced
this pull request
Jul 24, 2018
…1796) * Initial commit * Add Ingrasys S9180-32X platform dirver. Signed-off-by: Wade He <[email protected]> * Add bfn.service for init barefoot. Signed-off-by: Wade He <[email protected]> * [Barefoot Beta] Add some functions and fixed some bugs. 1. Update sensors.conf. 2. Fixed IO expander init. 3. Fixed PSU EEPROM. 4. Fixed MB EEPROM. 5. Add fancontrol and fan init. 6. Add SYS LED control (sys, fan, fan tray). 7. 2.5V compute and setup max and min. 8. Fixed typo MB eeprom delete address. 9. Remove coretemp to BMC. 10. Add active CPLD. 11. Modify SFP+ GPIO slave address. 12. Modify tmp75 Near Port 32 slave address. Signed-off-by: Wade He <[email protected]> * Add bfn script in /etc/init.d/ Signed-off-by: Wade He <[email protected]> * Add bfn service in debian Signed-off-by: Wade He <[email protected]> * Fixed CPLD switch LED behavior. Signed-off-by: Wade He <[email protected]> * [Barefoot Beta] Fixed sensors and hwmon order. 1. Fixed ignore sensors Vbat. 2. Reorg hwmon order. Signed-off-by: Wade He <[email protected]> * Fixed PSU1 and PSU2 EEPROM order. Signed-off-by: Wade He <[email protected]> * initial barefoot checkin october 2017 * update refpoint * update refpoints * update refpoints to bf-master * update refpoint * update refpoint to tested version * change to platform from asic * update refpoint for swss * revert core creation setting * update refpoints * add telnet for debug shell * update refpoints 11/17/17 * missed change in file on previous merge * [CPLD] Fixed blink LED issue. * Fixed blink LED mask set error. Signed-off-by: Wade He <[email protected]> * Update bf_kdrv.c for 6.0.2.39 * Update bf kernel driver * Add bf_fun kernel module. * Update bf_tun for fixed build error * merge with Azure master (12/12/17) * update swss refpoint * update refpoint of swss * library dependency for stack unroll * update refpoint to bf-master * [DHCP relay]: Fix circuit ID and remote ID bugs (#1248) * [DHCP relay]: Fix circuit ID and remote ID bugs * Set circuit_id_len after setting circuit_id_len to ip->name * [Platform] Add Psuutil and update sensors.conf for S9100-32X, S8810-32Q and S9200-64X (#1272) * Add I2C CPLD kernel module for psuutil. * Support psuutil script. * Add voltage min and max threshold. * Update sensors.conf for tmp75. Signed-off-by: Wade He <[email protected]> * Allow multi platform support - infra (more changes to follow) * update relative path to include platform for clarity * [Platform] Add Ingrasys S9130-32X and S9230-64X with Nephos Switch ASIC for "branch 201712" (#1274) - What I did Add switch ASIC vendor: Nephos Add Nephos platforms: Ingrasys S9130-32X, Ingrasys S9230-64X - How I did it Add platform/nephos files Add platform/nephos/sonic-platform-modules-ingrasys submodule Add device/ingrasys/x86_64-ingrasys_s9130_32x-r0 files Add device/ingrasys/x86_64-ingrasys_s9230_64x-r0 files Add SONiC to support Nephos platform Update Head of submodule src/sonic-sairedis to "3b817bb" - How to verify it To build SONiC installer image and docker images, run the following commands: make configure PLATFORM=nephos make target/sonic-nephos.bin Check system and network feature is worked as well - Description for the changelog Add switch ASIC vendor and platforms for Nephos - A picture of a cute animal (not mandatory but encouraged) Signed-off-by: Sam Yang <[email protected]> * change source of files to github (from dropbox), update sairedis refpoint * update refpoint of sairedis * [centec] support CENTEC SAI 1.0 on 201712 branch and update e582-48x6q board (#1269) * [marvel]: Marvell's updates for SONiC.201712 & SAI v1.0 (#1287) * update sairedis (fast-boot refpoint) * fix syncd rpc make files * update refpoint to handle Makefile change (no functional change) * [Marvell]: Add support for SLM5401-54x device (#1307) * Marvell's updates for SONiC.201712 & SAI v1.0 * [Platform] Add Marvell's SLM5401-54x for branch 201712 * [Broadcom]: Update Boradcom SAI package to 3.0.3.3-3 (#1312) (#1321) - update Arista 7050-QX32S config.bcm file - update Accton th-as771*-32x100G.config.bcm files * update refpoint for Makefile chnage in sairedis * update refpoint - sairedis * update sairedis to older refpoint till we debug clean build * export asic platform for build * update refpoint for makefiles * [PLATFORM] Centec update E582 driver fan/epprom/sensor (#1332) * Upload wnc-osw1800 * Modify for Barefoot suggest * Revert bfn-platform.mk * Update bfn-platform-wnc.mk Update parameter name * Update parameter name * initial support for WNC platform * change switch name to "switch" * Delete bf modules for rel_7_0 * Add Ingrasys S9180 platform Signed-off-by: Wade He <[email protected]> * Modify bfnsdk for Ingrasys S9180 platform Signed-off-by: Wade He <[email protected]> * Resolved the conflict. * Resolved the conflict. * Update submodule path and url. * Delete unused file. * Update PSU GPIO and EEPROM for psuutil. * Add psuutil in S9180-32X Signed-off-by: Wade He <[email protected]> * update refpoint * update refpoint * change contact email, update refpoint * cleanup and update kernel modules * updates based on review * update refpoint * update refpoint * fix typo in config script to check for platforms * remove stale file * resolve conflicts * cleanup diffs with Azure repo and update SDK debs * update refpoints to Azure * address review comments * revert refpoint of swss-common * porting the build fix from master * porting build fix from master * Minor Fix * Minor fix * Temp to sde deb packages url * Update sonic - sairedis,swss & swss-common refpoints * Update git modules url path to bfn repo * updated paths for swss, swss-common & sairedis * Update refpoint for sonic-swss to local bfn repo * Update URL for downloading sde debian packages * porting fix links of debian git server from master * porting fix links of debian git server from master * [Ingrasys] Add platform support for S9280-64X with Barefoot ASIC * Update ref points for swss, swss-common and sairedis repos * Add sonic platform scripts for bfn montara/maverick * Call sh scripts instead of calling py scripts * Address upstream PR Comments (#10) * Update bf-master with azure/master * Undo changes to some files * Revert "Address upstream PR Comments (#10)" This reverts commit a7fddb8. * Address upstream comments (#11) * Remove all non bfn specific changes from upstream PR * Revert "Address upstream comments (#11)" This reverts commit 5591321. * Undo non bfn changes * Little more cleanup * Add back code removed in merge * export CONFIGURED_PLATFORM * Update sairedis and swss refpoints * Address Upstream PR comment * change deb pkg dependency from 3.16.0-4-amd64 to 3.16.0-5-amd64 * Set default tx queue len for usb0 interface to 64 * Update sairedis refpoint * Update swss ref point * Add bfn buffer cfg files for montara/maverick as per new design * Update buffer cfg templates for bfn montara * add non zero size to buffer profile * add macro to generate port lists * Update buffer cfg templates for bfn mavericks * add non zero size for buffer profiles * add port generation macro * Add missing psmisc package * BGP docker seems to be missing killall utility being used by fast-reboot script. This is causing non graceful termination of BGP sessions. Adding psmisc to resolve this issue. * Update swss ref point * Update swss ref point * Update sairedis refpoint * Update sairedis refpoint * Update sairedis refpoint * Update sairedis refpoint * Update refpoint for sairedis and swss * sairedis to azure master * swss to latest bfn bf-master * Update gitmodules Update url for sairedis to azure master * Correct typo in bfn platform script * Update swss and sairedis ref points * Update swss ref point * Address Review comments * Update swws path in gitmodules to azure master * update swss refpoint * update base docker j2 file -remove psmisc package (could be a concern, would cause fast reboot to not work correctly will fix in another PR) * Fix sairedis refpoint broken in by previous merge * Remove psmisc from docker base image * This will break fast reboot as killall is required for killing bgp process and initiating graceful termination of BGP session. Will fix this in a seperate PR. Need this for SONIC upstreaming * Address upstream comments * Remove bmc interface from interface jinja template and sample output interfaces file * Add bmc interface at boot time to network interfaces for bfn bmc based platforms * Remove autogen ingrasys debian files * Revert "Remove autogen ingrasys debian files" * Buffer and qos config template fix for bfn platforms (#21) SWI-1509 Buffer and qos config template fix for bfn platforms * Fix qos config files for montara & mavericks (#22) * Reference only ppg 3,4 in qos files as no profiles are attached to 0,1 in buffer configs * Fix vs test (#23)
jleveque
added a commit
that referenced
this pull request
Dec 3, 2020
* src/sonic-utilities 6fabbed...3749f5e (7): > [config vlan] Stop, reset-failed, then start dhcp_relay service (#1269) > [show] Break some groups out into their own modules (#1259) > Convert the output of 'arp -n' from bytes to str. (#1279) > Fixing python porting errors in fdbshow, natshow and nbrshow (#1280) > [pfcwd] Use floor division in Python3 (#1277) > Modify fast-reboot script to use teamd service script (#1251) > Add `show reboot-cause history` cli (#1210)
raphaelt-nvidia
pushed a commit
to raphaelt-nvidia/sonic-buildimage
that referenced
this pull request
Jan 14, 2021
…eate (sonic-net#1269) * SAI 3.7 Supports multiple ASIC instances. This change is needed for orchagent to accept the instance ID which is fills in HARDWARE_INFO and passes to switch create. * Update the usage help string with the new option [-i INST_ID]
santhosh-kt
pushed a commit
to santhosh-kt/sonic-buildimage
that referenced
this pull request
Feb 25, 2021
* src/sonic-utilities 6fabbed...3749f5e (7): > [config vlan] Stop, reset-failed, then start dhcp_relay service (sonic-net#1269) > [show] Break some groups out into their own modules (sonic-net#1259) > Convert the output of 'arp -n' from bytes to str. (sonic-net#1279) > Fixing python porting errors in fdbshow, natshow and nbrshow (sonic-net#1280) > [pfcwd] Use floor division in Python3 (sonic-net#1277) > Modify fast-reboot script to use teamd service script (sonic-net#1251) > Add `show reboot-cause history` cli (sonic-net#1210)
stepanblyschak
pushed a commit
to stepanblyschak/sonic-buildimage
that referenced
this pull request
May 10, 2021
…c-net#1269) **- What I did** When adding or deleting an DHCP relay destination address to a VLAN, previously, the service was simply restarted. However, we have set a start limit on services in SONiC, such that if a service is restarted X times within Y time, the service will enter a failed state and cannot be started until the failed state is cleared (currently 3 times within 20 minutes). However, if someone attempts to perform more than 3 add or delete operations within 20 minutes, it would trigger this failure condition. This change prevents this form occurring. **- How I did it** Rather than simply calling `systemctl restart dhcp_relay` after adding or deleting a DHCP relay destination IP address, we now call: ``` systemctl stop dhcp_relay systemctl reset-failed dhcp_relay systemctl start dhcp_relay ```
theasianpianist
pushed a commit
to theasianpianist/sonic-buildimage
that referenced
this pull request
Feb 5, 2022
…eate (sonic-net#1269) * SAI 3.7 Supports multiple ASIC instances. This change is needed for orchagent to accept the instance ID which is fills in HARDWARE_INFO and passes to switch create. * Update the usage help string with the new option [-i INST_ID]
saiarcot895
added a commit
to saiarcot895/sonic-buildimage
that referenced
this pull request
Aug 7, 2023
This submodule update needs to be manually done due to build changes done in the sairedis submodule. Specifically, Debian build profiles are now being used instead of dpkg build targets, and dbgsym packages are being used instead of dbg packages. Because of this, there needs to be changes on the sonic-buildimage side for this. This is a reland of sonic-net#15720, which was reverted in sonic-net#15995 due to the RPC package build failing. That failure has since been fixed, and the PR pipeline has been updated to build the RPC package so that this is checked at the PR stage. This submodule update brings in the following changes: ``` 4dbdb21 Fix RPC package build failure due to shell syntax issue (sonic-net#1268) 588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (sonic-net#1269) ce8f642 [vs] Use boost join to concatenate switch types in config (sonic-net#1266) d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (sonic-net#1259) e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (sonic-net#1262) c08f9a2 [CI]: Fix collect log error in azp template. (sonic-net#1260) eed856c [CodeQL]: Fix syncd compilation in azp template. (sonic-net#1261) a3f1f1a Reland 'Make changes to building and packaging sairedis (sonic-net#1116)' (sonic-net#1194) ``` Signed-off-by: Saikrishna Arcot <[email protected]>
yxieca
pushed a commit
that referenced
this pull request
Aug 11, 2023
* Update sairedis submodule This submodule update needs to be manually done due to build changes done in the sairedis submodule. Specifically, Debian build profiles are now being used instead of dpkg build targets, and dbgsym packages are being used instead of dbg packages. Because of this, there needs to be changes on the sonic-buildimage side for this. This is a reland of #15720, which was reverted in #15995 due to the RPC package build failing. That failure has since been fixed, and the PR pipeline has been updated to build the RPC package so that this is checked at the PR stage. This submodule update brings in the following changes: ``` 4dbdb21 Fix RPC package build failure due to shell syntax issue (#1268) 588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (#1269) ce8f642 [vs] Use boost join to concatenate switch types in config (#1266) d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (#1259) e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (#1262) c08f9a2 [CI]: Fix collect log error in azp template. (#1260) eed856c [CodeQL]: Fix syncd compilation in azp template. (#1261) a3f1f1a Reland 'Make changes to building and packaging sairedis (#1116)' (#1194) ``` Signed-off-by: Saikrishna Arcot <[email protected]> * Update sairedis submodule with the fix for the RPC package build Signed-off-by: Saikrishna Arcot <[email protected]> --------- Signed-off-by: Saikrishna Arcot <[email protected]>
mssonicbld
added a commit
that referenced
this pull request
Aug 12, 2023
…tically (#16004) #### Why I did it src/sonic-sairedis ``` * eb24302 - (HEAD -> master, origin/master, origin/HEAD) Build both the regular and RPC version when the RPC profile is enabled (#1273) (28 hours ago) [Saikrishna Arcot] * 9e855c2 - [FEC] Adding support for vs testing for SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_OVERRIDE (#1271) (2 days ago) [Sudharsan Dhamal Gopalarathnam] * 4dbdb21 - Fix RPC package build failure due to shell syntax issue (#1268) (10 days ago) [Saikrishna Arcot] * 588d596 - Make sure new binaries replace existing binaries in docker-sonic-vs (#1269) (11 days ago) [Saikrishna Arcot] * ce8f642 - [vs] Use boost join to concatenate switch types in config (#1266) (3 weeks ago) [Kamil Cudnik] * d6055a2 - [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (#1259) (4 weeks ago) [prabhataravind] * e1cdb4d - [CodeQL]: Use dependencies with relevant versions in azp template. (#1262) (5 weeks ago) [Nazarii Hnydyn] * c08f9a2 - [CI]: Fix collect log error in azp template. (#1260) (5 weeks ago) [Nazarii Hnydyn] * eed856c - [CodeQL]: Fix syncd compilation in azp template. (#1261) (5 weeks ago) [Nazarii Hnydyn] * a3f1f1a - Reland 'Make changes to building and packaging sairedis (#1116)' (#1194) (6 weeks ago) [Saikrishna Arcot] ``` #### How I did it #### How to verify it #### Description for the changelog
sonic-otn
pushed a commit
to sonic-otn/sonic-buildimage
that referenced
this pull request
Sep 20, 2023
* Update sairedis submodule This submodule update needs to be manually done due to build changes done in the sairedis submodule. Specifically, Debian build profiles are now being used instead of dpkg build targets, and dbgsym packages are being used instead of dbg packages. Because of this, there needs to be changes on the sonic-buildimage side for this. This is a reland of sonic-net#15720, which was reverted in sonic-net#15995 due to the RPC package build failing. That failure has since been fixed, and the PR pipeline has been updated to build the RPC package so that this is checked at the PR stage. This submodule update brings in the following changes: ``` 4dbdb21 Fix RPC package build failure due to shell syntax issue (sonic-net#1268) 588d596 Make sure new binaries replace existing binaries in docker-sonic-vs (sonic-net#1269) ce8f642 [vs] Use boost join to concatenate switch types in config (sonic-net#1266) d6055a2 [vslib]: Temporaily map DPU switch type to NVDA_MBF2H536C (sonic-net#1259) e1cdb4d [CodeQL]: Use dependencies with relevant versions in azp template. (sonic-net#1262) c08f9a2 [CI]: Fix collect log error in azp template. (sonic-net#1260) eed856c [CodeQL]: Fix syncd compilation in azp template. (sonic-net#1261) a3f1f1a Reland 'Make changes to building and packaging sairedis (sonic-net#1116)' (sonic-net#1194) ``` Signed-off-by: Saikrishna Arcot <[email protected]> * Update sairedis submodule with the fix for the RPC package build Signed-off-by: Saikrishna Arcot <[email protected]> --------- Signed-off-by: Saikrishna Arcot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: chenyq [email protected]