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

Update sonic-linux-kernel to use 6.1.38

Browse Source 
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2023-08-21 10:50:24 -07:00 committed by Ying Xie
parent 3bf2c54768
commit 0909c671c6
32 changed files with 106 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
installer/default_platform.conf
View File

@ -604,13 +604,13 @@ menuentry '$demo_grub_entry' {
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
insmod part_msdos
insmod ext2
$GRUB_CFG_LINUX_CMD /$image_dir/boot/vmlinuz-5.10.0-23-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
$GRUB_CFG_LINUX_CMD /$image_dir/boot/vmlinuz-6.1.0-11-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
net.ifnames=0 biosdevname=0 \
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
systemd.unified_cgroup_hierarchy=0 \
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
$GRUB_CFG_INITRD_CMD /$image_dir/boot/initrd.img-5.10.0-23-2-amd64
$GRUB_CFG_INITRD_CMD /$image_dir/boot/initrd.img-6.1.0-11-2-amd64
}
EOF

2
platform/barefoot/bfn-modules/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: bfn-modules
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for bfn asic for mmap

2
platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn-montara
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

4
platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn-newport-as9516
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
Package: sonic-platform-modules-bfn-newport-as9516bf
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp

2
platform/barefoot/sonic-platform-modules-bfn/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2
platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: platform-modules-wnc-osw1800
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

22
platform/broadcom/sai-modules.mk
View File

@ -9,13 +9,15 @@ $(BRCM_OPENNSL_KERNEL)_BUILD_ENV += PKG_NAME=$(BRCM_OPENNSL_KERNEL)
$(BRCM_OPENNSL_KERNEL)_MACHINE = broadcom
SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)
# SAI bcm modules for DNX family ASIC
BRCM_DNX_OPENNSL_KERNEL_VERSION = 7.1.0.0
BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx
$(BRCM_DNX_OPENNSL_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
$(BRCM_DNX_OPENNSL_KERNEL)_BUILD_ENV += PKG_NAME=$(BRCM_DNX_OPENNSL_KERNEL)
$(BRCM_DNX_OPENNSL_KERNEL)_MACHINE = broadcom-dnx
$(BRCM_DNX_OPENNSL_KERNEL)_AFTER = $(BRCM_OPENNSL_KERNEL)
SONIC_DPKG_DEBS += $(BRCM_DNX_OPENNSL_KERNEL)
# TODO: disable DNX for now, since it's in a separate repo
#
## SAI bcm modules for DNX family ASIC
#BRCM_DNX_OPENNSL_KERNEL_VERSION = 7.1.0.0
#
#BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb
#$(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx
#$(BRCM_DNX_OPENNSL_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
#$(BRCM_DNX_OPENNSL_KERNEL)_BUILD_ENV += PKG_NAME=$(BRCM_DNX_OPENNSL_KERNEL)
#$(BRCM_DNX_OPENNSL_KERNEL)_MACHINE = broadcom-dnx
#$(BRCM_DNX_OPENNSL_KERNEL)_AFTER = $(BRCM_OPENNSL_KERNEL)
#SONIC_DPKG_DEBS += $(BRCM_DNX_OPENNSL_KERNEL)

2
platform/broadcom/saibcm-modules-dnx

@ -1 +1 @@
Subproject commit 3826c36cb23f3ec8fba63d73ea677ec74cc67609
Subproject commit 504485cebcb6c1ffe0ba6ea19155c88be46ac51a

2
platform/broadcom/saibcm-modules/debian/control
View File

@ -10,5 +10,5 @@ Standards-Version: 3.9.3
Package: opennsl-modules
Architecture: amd64
Section: main
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for broadcom SAI

2
platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
View File

@ -1 +1 @@
lib/modules/5.10.0-23-2-amd64/extra
lib/modules/6.1.0-11-2-amd64/extra

14
platform/broadcom/saibcm-modules/debian/opennsl-modules.install
View File

@ -1,8 +1,8 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/5.10.0-23-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-23-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-23-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-23-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/6.1.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/6.1.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/6.1.0-11-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/6.1.0-11-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system
sdklt/build/bde/linux_ngbde.ko lib/modules/5.10.0-23-2-amd64/extra
sdklt/build/knet/linux_ngknet.ko lib/modules/5.10.0-23-2-amd64/extra
sdklt/build/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-23-2-amd64/extra
sdklt/build/bde/linux_ngbde.ko lib/modules/6.1.0-11-2-amd64/extra
sdklt/build/knet/linux_ngknet.ko lib/modules/6.1.0-11-2-amd64/extra
sdklt/build/knetcb/linux_ngknetcb.ko lib/modules/6.1.0-11-2-amd64/extra

4
platform/broadcom/saibcm-modules/debian/rules
View File

@ -34,8 +34,8 @@ sname:=opennsl
PACKAGE=opennsl-modules
# modifieable for experiments or debugging m-a
MA_DIR ?= /usr/share/modass
KVERSION ?= 5.10.0-23-2-amd64
KERNVERSION ?= 5.10.0-23-2
KVERSION ?= 6.1.0-11-2-amd64
KERNVERSION ?= 6.1.0-11-2
# load generic variable handling
-include $(MA_DIR)/include/generic.make

6
platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c
View File

@ -1430,7 +1430,7 @@ ngknet_set_mac_address(struct net_device *ndev, void *addr)
}
netdev_info(ndev, "Setting new MAC address\n");
memcpy(ndev->dev_addr, ((struct sockaddr *)addr)->sa_data, ndev->addr_len);
eth_hw_addr_set(ndev, ((struct sockaddr *)addr)->sa_data);
return 0;
}
@ -1702,7 +1702,7 @@ ngknet_ndev_init(ngknet_netif_t *netif, struct net_device **nd)
ngknet_dev_mac[5]++;
ma = ngknet_dev_mac;
}
memcpy(ndev->dev_addr, ma, ETH_ALEN);
eth_hw_addr_set(ndev, ma);
/* Initialize the device features */
ndev->hw_features = NETIF_F_RXCSUM |
@ -1916,7 +1916,7 @@ ngknet_dev_probe(int dn, ngknet_netif_t *netif)
priv_hdl[hdl->unit][hdl->chan].hdl = hdl;
hdl->priv = &priv_hdl[hdl->unit][hdl->chan];
netif_napi_add(ndev, (struct napi_struct *)hdl->priv,
ngknet_poll, pdev->ctrl.budget);
ngknet_poll);
if (pdev->flags & PDMA_GROUP_INTR) {
break;
}

8
platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
View File

@ -5670,7 +5670,7 @@ bkn_set_mac_address(struct net_device *dev, void *addr)
#endif
return -EINVAL;
}
memcpy(dev->dev_addr, ((struct sockaddr *)addr)->sa_data, dev->addr_len);
eth_hw_addr_set(dev, ((struct sockaddr *)addr)->sa_data);
return 0;
}
#endif
@ -6969,7 +6969,7 @@ bkn_init_ndev(u8 *mac, char *name)
#endif
/* Set the device MAC address */
memcpy(dev->dev_addr, mac, 6);
eth_hw_addr_set(dev, mac);
/* Device information -- not available right now */
dev->irq = 0;
@ -8511,7 +8511,7 @@ bkn_knet_hw_init(kcom_msg_hw_init_t *kmsg, int len)
/* Ensure 32-bit PCI DMA is mapped properly on 64-bit platforms */
dev_type = kernel_bde->get_dev_type(sinfo->dev_no);
if (dev_type & BDE_PCI_DEV_TYPE && sinfo->cmic_type != 'x') {
if (pci_set_dma_mask(sinfo->pdev, 0xffffffff)) {
if (dma_set_mask_and_coherent(&sinfo->pdev->dev, 0xffffffff)) {
cfg_api_unlock(sinfo, &flags);
gprintk("No suitable DMA available for SKBs\n");
kmsg->hdr.status = KCOM_E_RESOURCE;
@ -9688,7 +9688,7 @@ bkn_knet_dev_init(int d)
}
if (use_napi) {
netif_napi_add(dev, &sinfo->napi, bkn_poll, napi_weight);
netif_napi_add(dev, &sinfo->napi, bkn_poll);
}
return 0;
}

2
platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/ksal.c
View File

@ -46,7 +46,7 @@
#endif
#include <linux/time.h>
#ifdef MAX_USER_RT_PRIO
#if defined(MAX_USER_RT_PRIO) || defined(MAX_RT_PRIO)
/* Assume 2.6 scheduler */
#define SAL_YIELD(task) \
yield()

8
platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
View File

@ -7,20 +7,20 @@ Standards-Version: 3.9.3
Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: sonic-platform-alphanetworks-snh60b0-640f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: sonic-platform-alphanetworks-snj60d0-320f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: sonic-platform-alphanetworks-bes2348t
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

10
platform/broadcom/sonic-platform-modules-cel/debian/control
View File

@ -7,26 +7,26 @@ Standards-Version: 3.9.3
Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-seastone2
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp
Package: platform-modules-silverstone
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp.
Package: platform-modules-belgite
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp

28
platform/broadcom/sonic-platform-modules-dell/debian/control
View File

@ -7,70 +7,70 @@ Standards-Version: 3.9.3
Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s5212f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s5224f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s5232f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s5248f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-n3248te
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9332f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9432f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-n3248pxe
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-e3224f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s5296f
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

8
platform/centec-arm64/sonic-platform-modules-e530/debian/control
View File

@ -7,20 +7,20 @@ Standards-Version: 3.9.3
Package: platform-modules-e530-48t4x-p
Architecture: arm64
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-e530-24x2c
Architecture: arm64
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-e530-48s4x
Architecture: arm64
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-e530-24x2q
Architecture: arm64
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2
platform/centec-arm64/sonic-platform-modules-fs/debian/control
View File

@ -7,5 +7,5 @@ Standards-Version: 3.9.3
Package: platform-modules-s5800-48t4s
Architecture: arm64
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

4
platform/centec-arm64/sonic_fit.its
View File

@ -12,7 +12,7 @@
images {
kernel_ctc {
description = "ARM64 Kernel";
data = /incbin/("./vmlinuz-5.10.0-23-2-arm64");
data = /incbin/("./vmlinuz-6.1.0-11-2-arm64");
type = "kernel";
arch = "arm64";
os = "linux";
@ -25,7 +25,7 @@
};
initramfs {
description = "initramfs";
data = /incbin/("./initrd.img-5.10.0-23-2-arm64");
data = /incbin/("./initrd.img-6.1.0-11-2-arm64");
type = "ramdisk";
arch = "arm64";
os = "linux";

2
platform/centec-arm64/tsingma-bsp/debian/control
View File

@ -7,5 +7,5 @@ Standards-Version: 3.9.3
Package: tsingma-bsp
Architecture: arm64
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Depends: linux-image-6.1.0-11-2-arm64-unsigned
Description: kernel modules for tsingma bsp

28
platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install
View File

@ -1,17 +1,17 @@
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctcmac/ctcmac.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctc-phy/mars.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/pwm-ctc/pwm-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctc_wdt/ctc_wdt.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctcmac/ctcmac.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctcmac/ctc5236_mdio.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctc-phy/mars.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/i2c-ctc/i2c-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/gpio-ctc/gpio-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ehci-ctc/ehci-ctc.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/6.1.0-11-2-arm64/kernel/extra
src/ctc-dts/e530-ctc5236.dtb /boot/
src/config/fw_env.config /etc/
src/config/tsingma-bsp.service /lib/systemd/system

4
platform/centec/sonic-platform-modules-e582/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: platform-modules-e582-48x2q4z
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-e582-48x6q
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2
platform/centec/sonic-platform-modules-embedway/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: platform-modules-embedway-es6220
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

6
platform/centec/sonic-platform-modules-v682/debian/control
View File

@ -7,15 +7,15 @@ Standards-Version: 3.9.3
Package: platform-modules-v682-48y8c-d
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-v682-48y8c
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-v682-48x8c
Architecture: amd64
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Depends: linux-image-6.1.0-11-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2
platform/marvell-arm64/platform.conf
View File

@ -9,7 +9,7 @@ VAR_LOG=512
UBOOT_FW_DEFAULT=1
kernel_addr=0x1100000
kernel_version=5.10.0-23-2-arm64
kernel_version=6.1.0-11-2-arm64
kernel_fname="/boot/vmlinuz-$kernel_version"
initrd_fname="/boot/initrd.img-$kernel_version"
fit_fname="/boot/sonic_arm64.fit"

4
platform/marvell-arm64/sonic-platform-nokia/7215/scripts/nokia-7215-init.sh
View File

@ -5,8 +5,8 @@
# Load required kernel-mode drivers
load_kernel_drivers() {
echo "Loading Kernel Drivers"
sudo insmod /lib/modules/5.10.0-23-2-arm64/kernel/extra/nokia_7215_ixs_a1_cpld.ko
sudo insmod /lib/modules/5.10.0-23-2-arm64/kernel/extra/ac5_thermal_sensor.ko
sudo insmod /lib/modules/6.1.0-11-2-arm64/kernel/extra/nokia_7215_ixs_a1_cpld.ko
sudo insmod /lib/modules/6.1.0-11-2-arm64/kernel/extra/ac5_thermal_sensor.ko
}
nokia_7215_profile()

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

@ -7,7 +7,7 @@
images {
kernel_ac5x {
description = "Linux Kernel for AC5x";
data = /incbin/("/boot/vmlinuz-5.10.0-23-2-arm64");
data = /incbin/("/boot/vmlinuz-6.1.0-11-2-arm64");
type = "kernel";
arch = "arm64";
os = "linux";
@ -31,7 +31,7 @@
};
fdt_7215_a1 {
description = "Flattened Device Tree blob for 7215_IXS_A1";
data = /incbin/("/usr/lib/linux-image-5.10.0-23-2-arm64/marvell/7215-ixs-a1.dtb");
data = /incbin/("/usr/lib/linux-image-6.1.0-11-2-arm64/marvell/7215-ixs-a1.dtb");
type = "flat_dt";
arch = "arm64";
compression = "none";
@ -42,7 +42,7 @@
};
ramdisk_ac5x {
description = "ramdisk for AC5x";
data = /incbin/("/boot/initrd.img-5.10.0-23-2-arm64");
data = /incbin/("/boot/initrd.img-6.1.0-11-2-arm64");
type = "ramdisk";
arch = "arm64";
os = "linux";
@ -55,7 +55,7 @@
};
kernel_1 {
description = "Linux Kernel";
data = /incbin/("/boot/vmlinuz-5.10.0-23-2-arm64");
data = /incbin/("/boot/vmlinuz-6.1.0-11-2-arm64");
type = "kernel";
arch = "arm64";
os = "linux";
@ -68,7 +68,7 @@
};
ramdisk_1 {
description = "ramdisk";
data = /incbin/("/boot/initrd.img-5.10.0-23-2-arm64");
data = /incbin/("/boot/initrd.img-6.1.0-11-2-arm64");
type = "ramdisk";
arch = "arm64";
os = "linux";

4
platform/marvell-armhf/platform.conf
View File

@ -10,8 +10,8 @@ fdt_addr=0x2800000
fdt_high=0x28fffff
initrd_addr=0x2900000
kernel_fname="/boot/vmlinuz-5.10.0-23-2-armmp"
initrd_fname="/boot/initrd.img-5.10.0-23-2-armmp"
kernel_fname="/boot/vmlinuz-6.1.0-11-2-armmp"
initrd_fname="/boot/initrd.img-6.1.0-11-2-armmp"
fdt_fname="/boot/armada-385-ET6448M_4G_Nand.dtb"
if [ "$install_env" = "onie" ]; then

6
rules/linux-kernel.mk
View File

@ -1,9 +1,9 @@
# linux kernel package
KVERSION_SHORT = 5.10.0-23-2
KVERSION_SHORT = 6.1.0-11-2
KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
KERNEL_VERSION = 5.10.179
KERNEL_SUBVERSION = 3
KERNEL_VERSION = 6.1.38
KERNEL_SUBVERSION = 4
ifeq ($(CONFIGURED_ARCH), armhf)
# Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version
KVERSION = $(KVERSION_SHORT)-armmp

2
src/sonic-linux-kernel

@ -1 +1 @@
Subproject commit c79efd7f1cff0d409b313f174df1905dc0e5a84b
Subproject commit b2601c7b1a10f42488d0f21c6c133f5c60c2387d