X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=366afe8245a457224bbc80de740413355f16c61d;hb=5ba459232086d0551af1fc45f92577e4b3c90b9c;hp=a0281ce010f5a723227892b871d711ba25b6c294;hpb=0f77e38a1b79e4ac432df6f1712e1565f07f97ff;p=kernel%2Fraspberrypi.git

diff --git a/Makefile b/Makefile
index a0281ce..366afe8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,13 @@
 # src/kernel/Makefile
 #
 
-TARGET = arm-crux-linux-gnueabi
+TARGET = arm-crux-linux-gnueabihf
 
 PWD = $(shell pwd)
 WORK = $(PWD)/work
 CROSSTOOLS = $(PWD)/../../toolchain/crosstools
 
-KERNEL_VERSION = 3.1.9-raspberrypi_20120309
+KERNEL_VERSION = 3.6.1-raspberrypi_20130305
 
 .PHONY: all clean image modules map config
 
@@ -18,11 +18,16 @@ clean: image-clean modules-clean map-clean
 
 distclean: clean image-distclean modules-distclean map-distclean
 
-$(WORK)/linux-$(KERNEL_VERSION).tar.bz2:
-	wget -P $(WORK) http://crux-arm.nu/files/distfiles/raspberrypi/linux-$(KERNEL_VERSION).tar.bz2
+$(WORK)/linux-$(KERNEL_VERSION).tar.xz:
+	wget -P $(WORK) http://crux-arm.nu/files/distfiles/raspberrypi/linux-$(KERNEL_VERSION).tar.xz
+	wget --no-check-certificate -P $(WORK) https://raw.github.com/raspberrypi/tools/master/mkimage/imagetool-uncompressed.py
+	wget --no-check-certificate -P $(WORK) https://github.com/raspberrypi/tools/raw/master/mkimage/first32k.bin
+	wget --no-check-certificate -P $(WORK) https://github.com/raspberrypi/tools/raw/master/mkimage/boot-uncompressed.txt
+	wget --no-check-certificate -P $(WORK) https://github.com/raspberrypi/tools/raw/master/mkimage/args-uncompressed.txt
 
-$(WORK)/linux-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION).tar.bz2 $(PWD)/config-$(KERNEL_VERSION)
-	tar -C $(WORK) -xvjf $(WORK)/linux-$(KERNEL_VERSION).tar.bz2
+$(WORK)/linux-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION).tar.xz $(PWD)/config-$(KERNEL_VERSION)
+	tar -C $(WORK) -xvf $(WORK)/linux-$(KERNEL_VERSION).tar.xz
+	sed -e 's|LINUX_COMPILE_BY=.*|LINUX_COMPILE_BY=devel|' -e 's|LINUX_COMPILE_HOST=.*|LINUX_COMPILE_HOST=crux-arm.nu|' -i $(WORK)/linux-$(KERNEL_VERSION)/scripts/mkcompile_h
 	cp -v $(PWD)/config-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION)/.config
 	touch $(WORK)/linux-$(KERNEL_VERSION)
 
@@ -35,13 +40,18 @@ $(WORK)/zImage-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION)
 	ln -sf zImage-$(KERNEL_VERSION) $(WORK)/zImage
 	touch $(WORK)/zImage-$(KERNEL_VERSION)
 
-image: $(WORK)/zImage-$(KERNEL_VERSION)
+$(WORK)/kernel.img: $(WORK)/zImage-$(KERNEL_VERSION)
+	cd $(WORK)/ && \
+		python imagetool-uncompressed.py zImage-$(KERNEL_VERSION)
+
+image: $(WORK)/kernel.img
 
 image-clean:
-	rm -vf $(WORK)/zImage-$(KERNEL_VERSION)
+	rm -vf $(WORK)/zImage-$(KERNEL_VERSION) $(WORK)/kernel.img
 
 image-distclean: image-clean
-	rm -vrf $(WORK)/linux-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION).tar.bz2
+	rm -vrf $(WORK)/linux-$(KERNEL_VERSION) $(WORK)/linux-$(KERNEL_VERSION).tar.xz
+	rm -vf $(WORK)/imagetool-uncompressed.py $(WORK)/first32k.bin $(WORK)/boot-uncompressed.txt $(WORK)/args-uncompressed.txt
 
 $(WORK)/modules-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION)
 	cd $(WORK)/linux-$(KERNEL_VERSION) && \
@@ -52,10 +62,15 @@ $(WORK)/modules-$(KERNEL_VERSION): $(WORK)/linux-$(KERNEL_VERSION)
 	rm -f $(WORK)/modules-$(KERNEL_VERSION)/lib/modules/$(KERNEL_VERSION)/{source,build}
 	touch $(WORK)/modules-$(KERNEL_VERSION)
 
-modules: $(WORK)/modules-$(KERNEL_VERSION)
+$(WORK)/modules-$(KERNEL_VERSION).tar.xz: $(WORK)/modules-$(KERNEL_VERSION)
+	cd $(WORK)/modules-$(KERNEL_VERSION) && \
+		tar cvJf $(WORK)/modules-$(KERNEL_VERSION).tar.xz *
+	touch $(WORK)/modules-$(KERNEL_VERSION).tar.xz
+
+modules: $(WORK)/modules-$(KERNEL_VERSION).tar.xz
 
 modules-clean:
-	rm -vrf $(WORK)/modules-$(KERNEL_VERSION)
+	rm -vrf $(WORK)/modules-$(KERNEL_VERSION) $(WORK)/modules-$(KERNEL_VERSION).tar.xz
 
 modules-distclean: modules-clean