Skip to content

Commit 645e134

Browse files
iavigorpecovnik
authored andcommitted
mvebu: helios4 edge → 6.18 LTS, restore orphaned patches
Commit 2f852e6 bumped mvebu edge KERNEL_MAJOR_MINOR from 6.12 to 6.15 but did not rename patch/kernel/archive/mvebu-6.12/, so KERNELPATCHDIR pointed to a non-existent directory and all helios4-specific kernel patches (GPIO wake, Wake-on-LAN, atheros regd, DMA, SPI-flash) were silently skipped. 6.15 is not an LTS kernel; 6.18 is. Bump only helios4 to 6.18 (LTS, EOL 2028-12), keeping the rest of the mvebu family at 6.15 until their maintainers verify the upgrade on their own boards. Rename the archive directory to mvebu-6.18 so the patches apply again, verified by a full kernel build against 6.18.23.
1 parent dc91ec0 commit 645e134

11 files changed

Lines changed: 5 additions & 1 deletion

config/sources/families/mvebu.conf

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

3232
edge)
3333

34-
declare -g KERNEL_MAJOR_MINOR="6.15" # Major and minor versions of this kernel.
34+
if [[ $BOARD == helios4 ]]; then
35+
declare -g KERNEL_MAJOR_MINOR="6.18" # helios4: 6.18 LTS, restore orphaned mvebu patches
36+
else
37+
declare -g KERNEL_MAJOR_MINOR="6.15" # Major and minor versions of this kernel.
38+
fi
3539
;;
3640

3741
esac

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

patch/kernel/archive/mvebu-6.12/dts-disable-spi-flash-on-a388-microsom.patch renamed to patch/kernel/archive/mvebu-6.18/dts-disable-spi-flash-on-a388-microsom.patch

File renamed without changes.

patch/kernel/archive/mvebu-6.12/general-increasing_DMA_block_memory_allocation_to_2048.patch renamed to patch/kernel/archive/mvebu-6.18/general-increasing_DMA_block_memory_allocation_to_2048.patch

File renamed without changes.

0 commit comments

Comments
 (0)