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

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

Browse Source 
This patch enables compiling of Marvell platform
module and fixes sonic-platform-nokia compilation
issues for bookworm.
This commit is contained in:
Keshav Gupta 2023-11-03 05:34:01 +05:30 committed by Saikrishna Arcot
parent 48b7b6e65b
commit a75b5d3d56
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_debian.sh
View File

@ -760,8 +760,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

2
platform/marvell-arm64/mrvl-prestera

@ -1 +1 @@
Subproject commit a5e93cbd8d90c767891e9ad56447b1047cfa558a
Subproject commit 8f9bcdaf58406c71a9038aea834fc8255de59848

5
platform/marvell-arm64/rules.mk
View File

@ -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) \

4
platform/marvell-arm64/sonic-platform-nokia/7215/modules/nokia_7215_ixs_a1_cpld.c
View File

@ -591,12 +591,12 @@ exit:
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[] = {

2
platform/marvell-arm64/sonic_fit.its
View File

@ -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";