Skip to content

Commit 000c787

Browse files
igorpecovnikigorpecovnik
committed
mvebu: bump EDGE kernel to 6.12 and disable Active State Power Management
1 parent 9555f7e commit 000c787

13 files changed

+3
-1
lines changed

‎config/kernel/linux-mvebu-current.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ CONFIG_NFC_S3FWRN5_I2C=m
613613
CONFIG_NFC_S3FWRN82_UART=m
614614
CONFIG_NFC_ST95HF=m
615615
CONFIG_PCI=y
616+
# CONFIG_PCIEASPM is not set
616617
CONFIG_PCI_MVEBU=y
617618
CONFIG_CXL_BUS=m
618619
CONFIG_RAPIDIO=m

‎config/kernel/linux-mvebu-edge.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ CONFIG_NFC_S3FWRN5_I2C=m
611611
CONFIG_NFC_S3FWRN82_UART=m
612612
CONFIG_NFC_ST95HF=m
613613
CONFIG_PCI=y
614+
# CONFIG_PCIEASPM is not set
614615
CONFIG_PCI_MVEBU=y
615616
CONFIG_CXL_BUS=m
616617
CONFIG_RAPIDIO=m

‎config/sources/families/mvebu.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ case $BRANCH in
3131

3232
edge)
3333

34-
declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
34+
declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
3535
;;
3636

3737
esac

‎patch/kernel/archive/mvebu-6.10/09-pci-link-retraining.patch.disabled renamed to ‎patch/kernel/archive/mvebu-6.12/09-pci-link-retraining.patch.disabled

File renamed without changes.

‎patch/kernel/archive/mvebu-6.10/91-01-libata-add-ledtrig-support.patch.disabled renamed to ‎patch/kernel/archive/mvebu-6.12/91-01-libata-add-ledtrig-support.patch.disabled

File renamed without changes.

‎patch/kernel/archive/mvebu-6.10/91-02-Enable-ATA-port-LED-trigger.patch.disabled renamed to ‎patch/kernel/archive/mvebu-6.12/91-02-Enable-ATA-port-LED-trigger.patch.disabled

File renamed without changes.

‎patch/kernel/archive/mvebu-6.10/92-mvebu-gpio-add_wake_on_gpio_support.patch renamed to ‎patch/kernel/archive/mvebu-6.12/92-mvebu-gpio-add_wake_on_gpio_support.patch

File renamed without changes.

‎patch/kernel/archive/mvebu-6.10/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch.disabled renamed to ‎patch/kernel/archive/mvebu-6.12/92-mvebu-gpio-remove-hardcoded-timer-assignment.patch.disabled

File renamed without changes.

‎patch/kernel/archive/mvebu-6.10/94-helios4-dts-add-wake-on-lan-support.patch renamed to ‎patch/kernel/archive/mvebu-6.12/94-helios4-dts-add-wake-on-lan-support.patch

File renamed without changes.

‎patch/kernel/archive/mvebu-6.10/compile-dtb-with-symbol-support.patch renamed to ‎patch/kernel/archive/mvebu-6.12/compile-dtb-with-symbol-support.patch.disabled

File renamed without changes.

0 commit comments

Comments
 (0)