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

[oneimage] Add cavium packet driver (#469)

Browse Source 
* [oneimage] Add cavium packet driver

Signed-off-by: Nadiya.Stetskovych <Nadiya.Stetskovych@cavium.com>

* Rename cavm_platform_modules.mk and cavm_xpnet.mk to fit naming convetion

Signed-off-by: Nadiya.Stetskovych <Nadiya.Stetskovych@cavium.com>

* Allow dpkg -i for cavm_xpnet

Signed-off-by: Nadiya.Stetskovych <Nadiya.Stetskovych@cavium.com>
This commit is contained in:
Nadiya 2017-04-04 05:13:29 +03:00 committed by lguohan
parent 4ff0f865b6
commit 6f04867954
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/build_templates/sonic_debian_extension.j2
View File

@ -138,11 +138,11 @@ sudo chmod a+x $FILESYSTEM_ROOT/usr/sbin/policy-rc.d
{% if installer_debs.strip() -%} {% if installer_debs.strip() -%}
{% for deb in installer_debs.strip().split(' ') -%} {% for deb in installer_debs.strip().split(' ') -%}
if [ $sonic_asic_platform == "mellanox" ]; then {% if sonic_asic_platform == "mellanox" %}
sudo dpkg --extract {{deb}} $FILESYSTEM_ROOT sudo dpkg --extract {{deb}} $FILESYSTEM_ROOT
else {% else %}
sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
fi {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}

1
files/build_templates/swss.service.j2
View File

@ -22,7 +22,6 @@ ExecStartPre=/etc/init.d/sxdkernel start
ExecStartPre=/usr/bin/mst start ExecStartPre=/usr/bin/mst start
ExecStartPre=/etc/mlnx/msn2700 start ExecStartPre=/etc/mlnx/msn2700 start
{% elif sonic_asic_platform == 'cavium' %} {% elif sonic_asic_platform == 'cavium' %}
ExecStartPre=-/etc/init.d/xpnet.sh stop
ExecStartPre=/etc/init.d/xpnet.sh start ExecStartPre=/etc/init.d/xpnet.sh start
{% endif %} {% endif %}

0
platform/cavium/cavm_platform_modules.mk → platform/cavium/cavm-platform-modules.mk
View File

6
platform/cavium/cavm-xpnet.mk Normal file
View File

@ -0,0 +1,6 @@
CAVM_SAI_URL = https://github.com/XPliant/OpenXPS/raw/18cd5fb556b6262943c0af70375e2631ac3fe08d/SAI
CAVM_XPNET_DEB = xp80-Pcie-Endpoint.deb
$(CAVM_XPNET_DEB)_URL = $(CAVM_SAI_URL)/netdev/$(CAVM_XPNET_DEB)
SONIC_ONLINE_DEBS += $(CAVM_XPNET_DEB)

1
platform/cavium/one-image.mk
View File

@ -4,5 +4,6 @@ SONIC_ONE_IMAGE = sonic-cavium.bin
$(SONIC_ONE_IMAGE)_MACHINE = cavium $(SONIC_ONE_IMAGE)_MACHINE = cavium
$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
$(SONIC_ONE_IMAGE)_DEPENDS += $(CAVM_PLATFORM_DEB) $(SONIC_ONE_IMAGE)_DEPENDS += $(CAVM_PLATFORM_DEB)
$(SONIC_ONE_IMAGE)_DEPENDS += $(CAVM_XPNET_DEB)
$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES) $(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
SONIC_INSTALLERS += $(SONIC_ONE_IMAGE) SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)

3
platform/cavium/rules.mk
View File

@ -1,7 +1,8 @@
include $(PLATFORM_PATH)/cavm-sai.mk include $(PLATFORM_PATH)/cavm-sai.mk
include $(PLATFORM_PATH)/docker-syncd-cavm.mk include $(PLATFORM_PATH)/docker-syncd-cavm.mk
include $(PLATFORM_PATH)/docker-orchagent-cavm.mk include $(PLATFORM_PATH)/docker-orchagent-cavm.mk
include $(PLATFORM_PATH)/cavm_platform_modules.mk include $(PLATFORM_PATH)/cavm-platform-modules.mk
include $(PLATFORM_PATH)/cavm-xpnet.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