X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Flinux;h=e7f48b637a6bae2f3b079d534c939691514b51cf;hb=1d12008db5c86f06c70600ea2ac9cc0721af6d9b;hp=f427f08b456ee1d44ee7862c9ff313776123e653;hpb=593948a8efaa9c53547b5c44e11ed1b1c69814be;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/linux b/lfs/linux
index f427f08b4..e7f48b637 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,9 +24,9 @@
 
 include Config
 
-VER           = 3.2.25
+VER           = 3.2.32
 
-RPI_PATCHES = linux-3.2-bootc-f23da7f
+RPI_PATCHES = linux-3.2.27-9245b4c
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.bz2
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 20
+PAK_VER    = 21
 DEPS	   = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -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				= b663da3da2dfba70a2a2d0c7f5999423
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= 5651c6411bb1cbdbfe4b2908c117aaf3
+$(DL_FILE)_MD5				= d2a4562d8c451e5ec43547e0d8babe57
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= c20baa8dc2527ce89a302862c3fc7f58
 
 install : $(TARGET)
 
@@ -120,12 +120,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Layer7-patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/netfilter_layer7_2.22_kernel3.0.patch
 
-	# Add some more LED triggers
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch
-
-	# Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
-
 	# Fix uevent PHYSDEVDRIVER
 #	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
@@ -152,8 +146,6 @@ 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
 endif
 
 ifeq "$(HEADERS)" "1"
@@ -188,16 +180,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)