Moonstone add shared platform configuration code

sonic-net · Jun 28, 2024 · 98c5589 · 98c5589
1 parent 132c28a
commit 98c5589
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/platform/broadcom/one-image.mk b/platform/broadcom/one-image.mk
@@ -55,6 +55,7 @@ $(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELL_S6000_PLATFORM_MODULE) \
                                $(CEL_HALIBURTON_PLATFORM_MODULE) \
                                $(CEL_SEASTONE2_PLATFORM_MODULE) \
                                $(CEL_BELGITE_PLATFORM_MODULE) \
+							   $(CEL_MOONSTONE_PLATFORM_MODULE) \
                                $(DELTA_AG9032V1_PLATFORM_MODULE) \
                                $(DELTA_AG9064_PLATFORM_MODULE) \
                                $(DELTA_AG5648_PLATFORM_MODULE) \

diff --git a/platform/broadcom/platform-modules-cel.mk b/platform/broadcom/platform-modules-cel.mk
@@ -5,12 +5,14 @@ CEL_HALIBURTON_PLATFORM_MODULE_VERSION = 0.9
 CEL_SEASTONE2_PLATFORM_MODULE_VERSION = 0.9
 CEL_SILVERSTONE_PLATFORM_MODULE_VERSION = 0.9
 CEL_BELGITE_PLATFORM_MODULE_VERSION = 0.9
+CEL_MOONSTONE_PLATFORM_MODULE_VERSION = 0.9
 
 export CEL_DX010_PLATFORM_MODULE_VERSION
 export CEL_HALIBURTON_PLATFORM_MODULE_VERSION
 export CEL_SEASTONE2_PLATFORM_MODULE_VERSION
 export CEL_SILVERSTONE_PLATFORM_MODULE_VERSION
 export CEL_BELGITE_PLATFORM_MODULE_VERSION
+export CEL_MOONSTONE_PLATFORM_MODULE_VERSION
 
 CEL_DX010_PLATFORM_MODULE = platform-modules-dx010_$(CEL_DX010_PLATFORM_MODULE_VERSION)_amd64.deb
 $(CEL_DX010_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-cel
@@ -33,3 +35,7 @@ $(eval $(call add_extra_package,$(CEL_DX010_PLATFORM_MODULE),$(CEL_SILVERSTONE_P
 CEL_BELGITE_PLATFORM_MODULE = platform-modules-belgite_$(CEL_BELGITE_PLATFORM_MODULE_VERSION)_amd64.deb
 $(CEL_BELGITE_PLATFORM_MODULE)_PLATFORM = x86_64-cel_belgite-r0
 $(eval $(call add_extra_package,$(CEL_DX010_PLATFORM_MODULE),$(CEL_BELGITE_PLATFORM_MODULE)))
+
+CEL_MOONSTONE_PLATFORM_MODULE = platform-modules-moonstone_$(CEL_MOONSTONE_PLATFORM_MODULE_VERSION)_amd64.deb
+$(CEL_MOONSTONE_PLATFORM_MODULE)_PLATFORM = x86_64-cel_moonstone-r0
+$(eval $(call add_extra_package,$(CEL_DX010_PLATFORM_MODULE),$(CEL_MOONSTONE_PLATFORM_MODULE)))
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/compat b/platform/broadcom/sonic-platform-modules-cel/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/control b/platform/broadcom/sonic-platform-modules-cel/debian/control
@@ -30,3 +30,8 @@ Package: platform-modules-belgite
 Architecture: amd64
 Depends: linux-image-6.1.0-11-2-amd64-unsigned
 Description: kernel modules for platform devices such as led, sfp
+
+Package: platform-modules-moonstone
+Architecture: amd64
+Depends: linux-image-6.1.0-11-2-amd64-unsigned
+Description: kernel modules for platform devices such as led, sfp
diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/rules b/platform/broadcom/sonic-platform-modules-cel/debian/rules
@@ -6,7 +6,7 @@ export KBUILD_EXTRA_SYMBOLS := /sonic/platform/pddf/i2c/Module.symvers.PDDF
 KVERSION   ?= $(shell uname -r)
 KERNEL_SRC :=  /lib/modules/$(KVERSION)
 MOD_SRC_DIR:= $(shell pwd)
-MODULE_DIRS:= dx010 haliburton silverstone seastone2 belgite
+MODULE_DIRS:= dx010 haliburton silverstone seastone2 belgite moonstone
 
 %:
 	dh $@
@@ -19,15 +19,13 @@ override_dh_auto_build:
 			python3 -m build --wheel --no-isolation --outdir $(MOD_SRC_DIR)/$${mod}/modules; \
 			continue; \
 		fi; \
-                if [ $$mod = "belgite" ]; then \
-                       cd $(MOD_SRC_DIR); \
-                       if [ -d $(MOD_SRC_DIR)/$${mod}/pddf ]; then \
-                           cd $(MOD_SRC_DIR)/$${mod}/pddf; \
-                           python3 -m build --wheel --no-isolation --outdir $(MOD_SRC_DIR)/$${mod}/pddf; \
-                           echo "Finished making pddf whl package for $$mod"; \
-                       fi; \
-                       continue; \
-                fi; \
+	    cd $(MOD_SRC_DIR); \
+	    if [ -d $(MOD_SRC_DIR)/$${mod}/pddf ]; then \
+		    cd $(MOD_SRC_DIR)/$${mod}/pddf; \
+		    python3 -m build --wheel --no-isolation --outdir $(MOD_SRC_DIR)/$${mod}/pddf; \
+		    echo "Finished making pddf whl package for $$mod"; \
+			continue; \
+	    fi; \
 		cd $(MOD_SRC_DIR)/$${mod}; \
 		python3 -m build --wheel --no-isolation --outdir $(MOD_SRC_DIR)/$${mod}/modules; \
 	done)