[marvell-arm64]: Enable SDK module for bookworm (#16909)

This patch enables compiling of Marvell platform module and fixes sonic-platform-nokia compilation issues for bookworm.
sonic-net · Nov 3, 2023 · 26326fb · 26326fb
1 parent a072eff
commit 26326fb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -746,8 +746,7 @@ if [[ $TARGET_BOOTLOADER == uboot ]]; then
         sudo LANG=C chroot $FILESYSTEM_ROOT mv /boot/u${INITRD_FILE} /boot/$INITRD_FILE
     elif [[ $CONFIGURED_ARCH == arm64 ]]; then
         sudo cp -v $PLATFORM_DIR/${sonic_asic_platform}-${CONFIGURED_ARCH}/sonic_fit.its $FILESYSTEM_ROOT/boot/
-		# TODO: fix for bookworm, probably needs arm64 patches in sonic-linux-kernel to be updated
-        #sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
+        sudo LANG=C chroot $FILESYSTEM_ROOT mkimage -f /boot/sonic_fit.its /boot/sonic_${CONFIGURED_ARCH}.fit
     fi
 fi
 

diff --git a/platform/marvell-arm64/mrvl-prestera b/platform/marvell-arm64/mrvl-prestera
diff --git a/platform/marvell-arm64/rules.mk b/platform/marvell-arm64/rules.mk
@@ -5,9 +5,8 @@ include $(PLATFORM_PATH)/docker-syncd-mrvl-rpc.mk
 include $(PLATFORM_PATH)/docker-saiserver-mrvl.mk
 include $(PLATFORM_PATH)/libsaithrift-dev.mk
 include $(PLATFORM_PATH)/one-image.mk
-# TODO: update for bookworm
-#include $(PLATFORM_PATH)/mrvl-prestera.mk
-#include $(PLATFORM_PATH)/platform-nokia.mk
+include $(PLATFORM_PATH)/mrvl-prestera.mk
+include $(PLATFORM_PATH)/platform-nokia.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
              $(DOCKER_FPM) 	\

diff --git a/platform/marvell-arm64/sonic-platform-nokia/7215/modules/nokia_7215_ixs_a1_cpld.c b/platform/marvell-arm64/sonic-platform-nokia/7215/modules/nokia_7215_ixs_a1_cpld.c
@@ -591,12 +591,12 @@ static int nokia_7215_ixs_a1_cpld_probe(struct i2c_client *client,
     return status;
 }
 
-static int nokia_7215_ixs_a1_cpld_remove(struct i2c_client *client)
+static void nokia_7215_ixs_a1_cpld_remove(struct i2c_client *client)
 {
     struct cpld_data *data = i2c_get_clientdata(client);
     sysfs_remove_group(&client->dev.kobj, &nokia_7215_ixs_a1_cpld_group);
     kfree(data);
-    return 0;
+    return;
 }
 
 static const struct of_device_id nokia_7215_ixs_a1_cpld_of_ids[] = {

diff --git a/platform/marvell-arm64/sonic_fit.its b/platform/marvell-arm64/sonic_fit.its
@@ -20,7 +20,7 @@
         };
         fdt_ac5x {
             description = "Flattened Device Tree blob for AC5x";
-            data = /incbin/("/usr/lib/linux-image-5.10.0-23-2-arm64/marvell/ac5-98dx35xx-rd.dtb");
+            data = /incbin/("/usr/lib/linux-image-6.1.0-11-2-arm64/marvell/ac5-98dx35xx-rd.dtb");
             type = "flat_dt";
             arch = "arm64";
             compression = "none";

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel