X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=eae1be3047e4c96b42b32a315532fc2a8b748a0e;hb=7928605d97455eae56de1ba3c8b08b3afec99466;hp=f664b46377d1cd0f76bd50a096cf0fa4796ca183;hpb=cacea90b434f55f9584128e18bab6d3370a4b4dc;p=kernel%2Fefikamx.git

diff --git a/Makefile b/Makefile
index f664b46..eae1be3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@
 
 TARGET = arm-crux-linux-gnueabi
 
-TOPDIR = $(shell pwd)
+PWD = $(shell pwd)
 WORK = $(PWD)/work
-CROSSTOOLS = $(TOPDIR)/../../toolchain/crosstools
+CROSSTOOLS = $(PWD)/../../toolchain/crosstools
 
-KERNEL_VERSION = 2.6.31.14.22-efikamx_20110510
+KERNEL_VERSION = 2.6.31.14.27-efikamx_20111026
 
 .PHONY: all clean image modules map config
 
@@ -17,34 +17,33 @@ all: image modules map
 clean: image-clean modules-clean map-clean
 
 distclean: clean image-distclean modules-distclean map-distclean
-	rm -vrf $(WORK)/linux-$(KERNEL_VERSION)
-
-$(WORK)/mkimage: 
-	wget -P $(WORK) http://crux-arm.nu/files/devices/efikamx/mkimage
-	chmod u+x $(WORK)/mkimage
 
 $(WORK)/linux-$(KERNEL_VERSION).tar.bz2:
 	wget -P $(WORK) http://crux-arm.nu/files/distfiles/efikamx/linux-$(KERNEL_VERSION).tar.bz2
 
-$(WORK)/linux-$(KERNEL_VERSION): $(TOPDIR)/config-$(KERNEL_VERSION) $(WORK)/mkimage $(WORK)/linux-$(KERNEL_VERSION).tar.bz2
+$(WORK)/linux-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION).tar.bz2 $(PWD)/config-$(KERNEL_VERSION)
 	tar -C $(WORK) -xvjf $(WORK)/linux-$(KERNEL_VERSION).tar.bz2
-	cp -v $(TOPDIR)/config-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION)/.config
+	cd $(WORK) && \
+		patch -p1 -i $(WORK)/Makefile_arm_unaligned.diff
+	cp -v $(PWD)/config-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION)/.config
 	touch $(WORK)/linux-$(KERNEL_VERSION)
 
-$(WORK)/uImage-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION)
+$(WORK)/zImage-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION)
 	cd $(WORK)/linux-$(KERNEL_VERSION) && \
-		export PATH=$(CROSSTOOLS)/bin:$(WORK):$$PATH && \
+		export PATH=$(CROSSTOOLS)/bin:$$PATH && \
 		export LD_LIBRARY_PATH=$(CROSSTOOLS)/lib:$$LD_LIBRARY_PATH && \
-		make uImage ARCH=arm CROSS_COMPILE=$(TARGET)- 
-	cp -v $(WORK)/linux-$(KERNEL_VERSION)/arch/arm/boot/uImage $(WORK)/uImage-$(KERNEL_VERSION)
-	touch $(WORK)/uImage-$(KERNEL_VERSION)
+		make zImage ARCH=arm CROSS_COMPILE=$(TARGET)-
+	cp -v $(WORK)/linux-$(KERNEL_VERSION)/arch/arm/boot/zImage $(WORK)/zImage-$(KERNEL_VERSION)
+	ln -sf zImage-$(KERNEL_VERSION) $(WORK)/zImage
+	touch $(WORK)/zImage-$(KERNEL_VERSION)
 
-image: $(WORK)/uImage-$(KERNEL_VERSION)
+image: $(WORK)/zImage-$(KERNEL_VERSION)
 
 image-clean:
-	rm -vf $(WORK)/uImage-$(KERNEL_VERSION)
+	rm -vf $(WORK)/zImage-$(KERNEL_VERSION)
 
 image-distclean: image-clean
+	rm -vrf $(WORK)/linux-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION).tar.bz2
 
 $(WORK)/modules-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION)
 	cd $(WORK)/linux-$(KERNEL_VERSION) && \