[code sync] Merge code from sonic-net/sonic-buildimage:master to master

.azure-pipelines/azure-pipelines-build.yml

@@ -103,12 +103,6 @@ jobs:
             syncd_rpc_image: yes
             platform_rpc: mlnx
 
-        - name: nephos
-          variables:
-            dbg_image: yes
-            docker_syncd_rpc_image: yes
-            platform_rpc: nephos
-
         - name: pensando
           pool: sonicso1ES-arm64
           variables:
@@ -243,4 +237,3 @@ jobs:
           BuildDropPath: '$(System.DefaultWorkingDirectory)/target/'
           ManifestDirPath: 'target/'
           BuildComponentPath: $(System.DefaultWorkingDirectory)/src/
-

.github/CODEOWNERS

@@ -80,7 +80,6 @@
 /platform/mellanox/                               @sonic-net/sonic-mellanox-maintainer
 /device/nvidia-bluefield/                         @sonic-net/sonic-mellanox-maintainer
 /platform/nvidia-bluefield/                       @sonic-net/sonic-mellanox-maintainer
-/platform/nephos/                                 @sonic-net/sonic-nephos-maintainer
 /device/nexthop/                                  @sonic-net/sonic-nexthop-maintainer
 /platform/aspeed/sonic-platform-modules-nexthop/  @sonic-net/sonic-nexthop-maintainer
 /platform/broadcom/sonic-platform-modules/nexthop/ @sonic-net/sonic-nexthop-maintainer

.github/ISSUE_TEMPLATE/01-bug.yml

@@ -34,7 +34,6 @@ body:
         - innovium
         - marvell
         - mellanox
-        - nephos
       default: 0
     validations:
       required: true

.github/ISSUE_TEMPLATE/02-enhancement.yml

@@ -23,7 +23,6 @@ body:
         - innovium
         - marvell
         - mellanox
-        - nephos
       default: 0
     validations:
       required: true

.github/ISSUE_TEMPLATE/04-regression.yml

@@ -28,7 +28,6 @@ body:
         - innovium
         - marvell
         - mellanox
-        - nephos
       default: 0
     validations:
       required: true

Makefile.cache

@@ -82,7 +82,7 @@
 SONIC_CACHE_RECIPE_VER := 2
 # Git object hash of slave.mk when SONIC_CACHE_RECIPE_VER was last set/bumped.
 # Used by the guard below to detect unreviewed slave.mk changes.
-SONIC_CACHE_RECIPE_VER_BASELINE := 6e464d03ee39252d2ce3a7186e0a9cf30626dc9a
+SONIC_CACHE_RECIPE_VER_BASELINE := f04dd95738b99a2e525d462457718a826ace1bd3
 
 # Guard: warn if slave.mk changed since SONIC_CACHE_RECIPE_VER was last reviewed.
 # This catches the case where someone modifies slave.mk build recipes without

Makefile.work

@@ -738,6 +738,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            SONIC_INCLUDE_SYSTEM_BMP=$(INCLUDE_SYSTEM_BMP) \
                            SONIC_INCLUDE_SYSTEM_EVENTD=$(INCLUDE_SYSTEM_EVENTD) \
                            SONIC_INCLUDE_SYSTEM_OTEL=$(INCLUDE_SYSTEM_OTEL) \
+                           INCLUDE_HFT=$(INCLUDE_HFT) \
                            INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
                            INCLUDE_DHCP_SERVER=$(INCLUDE_DHCP_SERVER) \
                            INCLUDE_MACSEC=$(INCLUDE_MACSEC) \

README.md

@@ -220,7 +220,6 @@ The supported ASIC vendors are:
 * PLATFORM=marvell-teralynx
 * PLATFORM=mellanox
 * PLATFORM=centec
-* PLATFORM=nephos
 * PLATFORM=nvidia-bluefield
 * PLATFORM=vs
 
@@ -400,8 +399,6 @@ reproducibility notes, and known limitations.
     and Cavium switch ASIC (gzip tar archive)
   * docker-syncd-mlnx.gz: docker image for the daemon to sync database
     and Mellanox switch ASIC (gzip tar archive)
-  * docker-syncd-nephos.gz: docker image for the daemon to sync database
-    and Nephos switch ASIC (gzip tar archive)
   * docker-syncd-mrvl-teralynx.gz: docker image for the daemon to sync database
     and Marvell-Teralynx switch ASIC (gzip tar archive)
   * docker-syncd-mrvl-prestera.gz: docker image for the daemon to sync database