Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into kernel...

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

diff --git a/lfs/linux b/lfs/linux
index e84fd7aa9dbf398f22fb4381aaa05a0551441060..d51c6df608c06d0e229c0ee415e15b7968ee0866 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,9 +24,9 @@
 
 include Config
 
-VER           = 3.2.23
+VER           = 3.2.28
 
-RPI_PATCHES = linux-3.2-bootc-f23da7f
+RPI_PATCHES = linux-3.2.27-091073b
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.bz2
@@ -75,8 +75,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                             = $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz    = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                         = 1fc88918d247293d236d5dc169bf0b30
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 5651c6411bb1cbdbfe4b2908c117aaf3
+$(DL_FILE)_MD5                         = d387130f084f48fae7b2d1756f6c9257
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5        = 9daec752fba403a488818df6dd57a714
 
 install : $(TARGET)
 
@@ -114,9 +114,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Linux Intermediate Queueing Device
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-imq.patch
 
-       # Not report deprecated syscall 1.23 (for kudzu)
-#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
-
        # ipp2p 0.8.2-ipfire
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.0-ipp2p-0.8.2-ipfire.patch
 
@@ -135,7 +132,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(KCFG)" "-kirkwood"
        # Add dreamplug,guruplug and icy 62x0  support on ARM-kirkwood
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45-arm_kirkwood_setups.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.25-arm_kirkwood_setups.patch
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -155,8 +152,7 @@ endif
 ifeq "$(KCFG)" "-rpi"
        # Apply Raspberry Pi kernel patches.
        cd $(DIR_APP) && xzcat $(DIR_DL)/rpi-patches-$(RPI_PATCHES).patch.xz | patch -Np1
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-alsamixer.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2-bcm2835-limit_volume.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.27-rpi_fix_dwc_common_build.patch
 endif
 
 ifeq "$(HEADERS)" "1"
@@ -191,16 +187,11 @@ ifeq "$(KCFG)" "-rpi"
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
        cd /boot  && cat first32k.bin $(DIR_APP)/arch/arm/boot/Image > kernel.img
        cd $(DIR_APP) && cp -v /boot/kernel.img /boot/vmlinuz-$(VER)-$(VERSUFIX)
-else
-ifeq "$(KCFG)" "-versatile"
-       cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage
-       cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
 else
        cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
        cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
 endif
 endif
-endif
 endif
        cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX)
        cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX)