[Tomahawk] Use legacy-th instead of legacy for Tomahawk image

device/arista/x86_64-arista_7060_cx32s/platform_asic

@@ -1 +1 @@
-broadcom-legacy
+broadcom-legacy-th

platform/broadcom/docker-syncd-brcm-legacy-th.mk

@@ -0,0 +1,52 @@
+# docker image for brcm-legacy-th syncd
+
+DOCKER_SYNCD_LEGACY_TH_BASE = docker-syncd-brcm-legacy-th.gz
+DOCKER_SYNCD_LEGACY_TH_BASE_DBG = docker-syncd-brcm-legacy-th-$(DBG_IMAGE_MARK).gz
+DOCKER_SYNCD_LEGACY_TH_PLATFORM_CODE = brcm-legacy-th
+
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_PATH = $(PLATFORM_PATH)/docker-syncd-$(DOCKER_SYNCD_LEGACY_TH_PLATFORM_CODE)
+
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BOOKWORM)
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_DBG_DEPENDS += $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_DEPENDS)
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BOOKWORM)_DBG_IMAGE_PACKAGES)
+
+SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_LEGACY_TH_BASE)
+ifneq ($(ENABLE_SYNCD_RPC),y)
+SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_LEGACY_TH_BASE)
+endif
+
+SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_LEGACY_TH_BASE_DBG)
+ifneq ($(ENABLE_SYNCD_RPC),y)
+SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SYNCD_LEGACY_TH_BASE_DBG)
+endif
+
+
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_DEPENDS += $(SYNCD)
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_DEPENDS += $(BRCM_LEGACY_TH_SAI)
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_DEPENDS += $(SSWSYNCD)
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_FILES += $(RDB-CLI)
+
+ifeq ($(INSTALL_DEBUG_TOOLS), y)
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
+                                $(LIBSWSSCOMMON_DBG) \
+                                $(LIBSAIMETADATA_DBG) \
+                                $(LIBSAIREDIS_DBG)
+endif
+
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_VERSION = 1.0.0
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_PACKAGE_NAME = syncd-legacy-th
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_MACHINE = broadcom-legacy-th
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_AFTER = $(DOCKER_SYNCD_DNX_BASE)
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_CONTAINER_NAME = syncd
+
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_RUN_OPT += --privileged -t
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
+$(DOCKER_SYNCD_LEGACY_TH_BASE)_BASE_IMAGE_FILES += bcm_common:/usr/bin/bcm_common
+
+SONIC_BOOKWORM_DOCKERS += $(DOCKER_SYNCD_LEGACY_TH_BASE)
+SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_SYNCD_LEGACY_TH_BASE_DBG)

platform/broadcom/docker-syncd-brcm-legacy/Dockerfile.j2 → platform/broadcom/docker-syncd-brcm-legacy-th/Dockerfile.j2

@@ -10,12 +10,12 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update
 
-{% if docker_syncd_brcm_legacy_debs.strip() -%}
+{% if docker_syncd_brcm_legacy_th_debs.strip() -%}
 # Copy locally-built Debian package dependencies
-{{ copy_files("debs/", docker_syncd_brcm_legacy_debs.split(' '), "/debs/") }}
+{{ copy_files("debs/", docker_syncd_brcm_legacy_th_debs.split(' '), "/debs/") }}
 
 # Install locally-built Debian packages and implicitly install their dependencies
-{{ install_debian_packages(docker_syncd_brcm_legacy_debs.split(' ')) }}
+{{ install_debian_packages(docker_syncd_brcm_legacy_th_debs.split(' ')) }}
 {%- endif %}
 
 ## TODO: add kmod into Depends

platform/broadcom/one-aboot.mk

@@ -2,14 +2,14 @@
 
 SONIC_ONE_ABOOT_IMAGE = sonic-aboot-broadcom.swi
 $(SONIC_ONE_ABOOT_IMAGE)_MACHINE = broadcom
-$(SONIC_ONE_ABOOT_IMAGE)_DEPENDENT_MACHINE = broadcom-dnx broadcom-legacy
+$(SONIC_ONE_ABOOT_IMAGE)_DEPENDENT_MACHINE = broadcom-dnx broadcom-legacy-th
 $(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
 ifeq ($(INCLUDE_GBSYNCD), y)
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(PHY_CREDO)
 endif
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(FLASHROM)
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
-$(SONIC_ONE_ABOOT_IMAGE)_LAZY_BUILD_INSTALLS = $(BRCM_OPENNSL_KERNEL) $(BRCM_DNX_OPENNSL_KERNEL) $(BRCM_LEGACY_OPENNSL_KERNEL)
+$(SONIC_ONE_ABOOT_IMAGE)_LAZY_BUILD_INSTALLS = $(BRCM_OPENNSL_KERNEL) $(BRCM_DNX_OPENNSL_KERNEL) $(BRCM_LEGACY_TH_OPENNSL_KERNEL)
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_PYTHON3) \
                                      $(ARISTA_PLATFORM_MODULE_DRIVERS) \
                                      $(ARISTA_PLATFORM_MODULE_LIBS) \

platform/broadcom/one-image.mk

@@ -2,7 +2,7 @@
 
 SONIC_ONE_IMAGE = sonic-broadcom.bin
 $(SONIC_ONE_IMAGE)_MACHINE = broadcom
-$(SONIC_ONE_IMAGE)_DEPENDENT_MACHINE = broadcom-dnx broadcom-legacy
+$(SONIC_ONE_IMAGE)_DEPENDENT_MACHINE = broadcom-dnx broadcom-legacy-th
 $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
 $(SONIC_ONE_IMAGE)_INSTALLS += $(PDDF_PLATFORM_MODULE)
 $(SONIC_ONE_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)

platform/broadcom/rules.mk

@@ -1,7 +1,7 @@
 include $(PLATFORM_PATH)/sai-modules.mk
 include $(PLATFORM_PATH)/sai-xgs.mk
 include $(PLATFORM_PATH)/sai-dnx.mk
-include $(PLATFORM_PATH)/sai-legacy.mk
+include $(PLATFORM_PATH)/sai-legacy-th.mk
 include $(PLATFORM_PATH)/sswsyncd.mk
 # TODO(trixie): re-enable modules after updating for Trixie
 include $(PLATFORM_PATH)/platform-modules-nokia.mk
@@ -27,7 +27,7 @@ include $(PLATFORM_PATH)/platform-modules-ufispace.mk
 include $(PLATFORM_PATH)/docker-syncd-brcm.mk
 include $(PLATFORM_PATH)/docker-syncd-brcm-rpc.mk
 include $(PLATFORM_PATH)/docker-saiserver-brcm.mk
-include $(PLATFORM_PATH)/docker-syncd-brcm-legacy.mk
+include $(PLATFORM_PATH)/docker-syncd-brcm-legacy-th.mk
 ifeq ($(INCLUDE_PDE), y)
 include $(PLATFORM_PATH)/docker-pde.mk
 include $(PLATFORM_PATH)/sonic-pde-tests.mk

platform/broadcom/sai-legacy-th.mk

@@ -0,0 +1,15 @@
+# Broadcom LEGACY-TH SAI definitions
+LIBSAIBCM_LEGACY_TH_VERSION = 13.2.1.100
+LIBSAIBCM_LEGACY_TH_BRANCH_NAME = SAI_13.2.1_compat_OCP1.17.1
+
+LIBSAIBCM_LEGACY_TH_URL_PREFIX = "https://packages.trafficmanager.net/public/sai/sai-broadcom/$(LIBSAIBCM_LEGACY_TH_BRANCH_NAME)/$(LIBSAIBCM_LEGACY_TH_VERSION)/xgs"
+
+# SAI module for LEGACY-TH Asic family
+BRCM_LEGACY_TH_SAI = libsaibcm_$(LIBSAIBCM_LEGACY_TH_VERSION)_amd64.deb
+$(BRCM_LEGACY_TH_SAI)_URL = "$(LIBSAIBCM_LEGACY_TH_URL_PREFIX)/$(BRCM_LEGACY_TH_SAI)"
+
+# Package registration
+SONIC_ONLINE_DEBS += $(BRCM_LEGACY_TH_SAI)
+
+# Version handling
+$(BRCM_LEGACY_TH_SAI)_SKIP_VERSION=y

platform/broadcom/sai-modules.mk

@@ -19,13 +19,13 @@ $(BRCM_DNX_OPENNSL_KERNEL)_MACHINE = broadcom-dnx
 $(BRCM_DNX_OPENNSL_KERNEL)_AFTER = $(BRCM_OPENNSL_KERNEL)
 SONIC_DPKG_DEBS += $(BRCM_DNX_OPENNSL_KERNEL)
 
-# SAI bcm modules for Legacy family ASIC
-BRCM_LEGACY_OPENNSL_KERNEL_VERSION = 13.2.1.0
+# SAI bcm modules for Legacy-TH family ASIC
+BRCM_LEGACY_TH_OPENNSL_KERNEL_VERSION = 13.2.1.0
 
-BRCM_LEGACY_OPENNSL_KERNEL = opennsl-modules-legacy_$(BRCM_LEGACY_OPENNSL_KERNEL_VERSION)_amd64.deb
-$(BRCM_LEGACY_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-legacy
-$(BRCM_LEGACY_OPENNSL_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
-$(BRCM_LEGACY_OPENNSL_KERNEL)_BUILD_ENV += PKG_NAME=$(BRCM_LEGACY_OPENNSL_KERNEL)
-$(BRCM_LEGACY_OPENNSL_KERNEL)_MACHINE = broadcom-legacy
-$(BRCM_LEGACY_OPENNSL_KERNEL)_AFTER = $(BRCM_DNX_OPENNSL_KERNEL)
-SONIC_DPKG_DEBS += $(BRCM_LEGACY_OPENNSL_KERNEL)
+BRCM_LEGACY_TH_OPENNSL_KERNEL = opennsl-modules-legacy-th_$(BRCM_LEGACY_TH_OPENNSL_KERNEL_VERSION)_amd64.deb
+$(BRCM_LEGACY_TH_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-legacy-th
+$(BRCM_LEGACY_TH_OPENNSL_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
+$(BRCM_LEGACY_TH_OPENNSL_KERNEL)_BUILD_ENV += PKG_NAME=$(BRCM_LEGACY_TH_OPENNSL_KERNEL)
+$(BRCM_LEGACY_TH_OPENNSL_KERNEL)_MACHINE = broadcom-legacy-th
+$(BRCM_LEGACY_TH_OPENNSL_KERNEL)_AFTER = $(BRCM_DNX_OPENNSL_KERNEL)
+SONIC_DPKG_DEBS += $(BRCM_LEGACY_TH_OPENNSL_KERNEL)