kernel: update to 5.10.55

[ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index 40bd2acfc61192928fdfff0a8af84e74e4380f67..c8a1560c747519f7bc95c1a960a71f51c5341351 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 5.10.10
-ARM_PATCHES = 4.14.212-ipfire0
+VER         = 5.10.55
+ARM_PATCHES = 5.10.55-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -48,7 +48,7 @@ ifeq "$(BUILD_ARCH)" "aarch64"
        KERNEL_TARGET = Image
 endif
 
-ifeq "$(BUILD_ARCH)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "armv6l"
        KERNEL_ARCH  = arm
        KERNEL_TARGET = zImage
 endif
@@ -58,6 +58,7 @@ VERSUFIX=ipfire$(KCFG)
 ifeq "$(TOOLCHAIN)" "1"
        TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)-tools
        HEADERS_PREFIX = $(TOOLS_DIR)
+       EXTRAMAKE = CROSS_COMPILE=$(CROSSTARGET)-
 else
        TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX)
        HEADERS_PREFIX = /usr
@@ -66,9 +67,6 @@ endif
 ifeq "$(KCFG)" ""
 LASTKERNEL=1
 endif
-ifeq "$(KCFG)" "-multi"
-LASTKERNEL=1
-endif
 
 ###############################################################################
 # Top-level Rules
@@ -79,8 +77,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 14fa12a252795d140a7475c861123620
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 2b0e8e3ebe9827b2bfed7397b043dbc5
+$(DL_FILE)_MD5                                 = 10d3f47caac28cf126e6d98ad977b2bb
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 8344fdeb190912cf32482dc6d51fba31
 
 install : $(TARGET)
 
@@ -125,6 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14_ath_user_regd.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
 
+       # Fix apu1 led detection with newer bios versions
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.10.16-apu1-led-new-bios.patch
+
        # Fix igb and e1000e crash
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.1-igb-e1000e_fix_lock_at_update_stats.patch
 
@@ -137,19 +138,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # fix Boot with enabled usercopy hardening
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.9-crypto_testmgr_allocate_buffers_with____GFP_COMP.patch
 
-ifeq "$(KCFG)" "-multi"
+       # fix gcc plugins with gcc11
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-5.10.45-fix_gcc_plugins_with_gcc11.patch
+
+ifeq "$(BUILD_ARCH)" "armv6l"
        # Apply Arm-multiarch kernel patches.
-#      cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
+       cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
 endif
 ifeq "$(BUILD_ARCH)" "aarch64"
        # Apply Arm-multiarch kernel patches.
-#      cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
+       cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1
 endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
 ifeq "$(KCFG)" "-headers"
        # Install the header files
-       cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) headers
+       cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) $(EXTRAMAKE) headers
        -mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include
        cd $(DIR_APP) && find usr/include -name '.*' -delete
        cd $(DIR_APP) && rm usr/include/Makefile