From: Victor Martinez <pitillo@ono.com>
Date: Sun, 5 Aug 2012 19:18:13 +0000 (+0000)
Subject: Updated to 20120803 and fixed kernel.img file creation.
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=2839ccbf89d63c6089c8fc8f7cfd2d2fed4e1fd2;p=kernel%2Fraspberrypi.git

Updated to 20120803 and fixed kernel.img file creation.
---

diff --git a/Makefile b/Makefile
index a0281ce..a5fb7ae 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ PWD = $(shell pwd)
 WORK = $(PWD)/work
 CROSSTOOLS = $(PWD)/../../toolchain/crosstools
 
-KERNEL_VERSION = 3.1.9-raspberrypi_20120309
+KERNEL_VERSION = 3.1.9-raspberrypi_20120803
 
 .PHONY: all clean image modules map config
 
@@ -18,6 +18,9 @@ clean: image-clean modules-clean map-clean
 
 distclean: clean image-distclean modules-distclean map-distclean
 
+$(WORK)/tools-$(KERNEL_VERSION).tar.bz2:
+	wget -P $(WORK) http://crux-arm.nu/files/distfiles/raspberrypi/tools-$(KERNEL_VERSION).tar.bz2
+
 $(WORK)/linux-$(KERNEL_VERSION).tar.bz2:
 	wget -P $(WORK) http://crux-arm.nu/files/distfiles/raspberrypi/linux-$(KERNEL_VERSION).tar.bz2
 
@@ -35,13 +38,22 @@ $(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)
+	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
+	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 -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) && \
diff --git a/config-3.1.9-raspberrypi_20120309 b/config-3.1.9-raspberrypi_20120803
similarity index 100%
rename from config-3.1.9-raspberrypi_20120309
rename to config-3.1.9-raspberrypi_20120803