X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=kernel-bfs-2.6.28%2Fdebian%2Frules;h=9af8175414eb9f74dd8d0f6078cf409b7df7dea3;hb=48c0bc00f022508af6612666de8b12fa0170aa51;hp=728bfa831aca00b333d0f51e1d9ae29a8ca07397;hpb=c9526710c133b34d622d3989c90cfceaf2b29f96;p=kernel-bfs

diff --git a/kernel-bfs-2.6.28/debian/rules b/kernel-bfs-2.6.28/debian/rules
index 728bfa8..9af8175 100644
--- a/kernel-bfs-2.6.28/debian/rules
+++ b/kernel-bfs-2.6.28/debian/rules
@@ -4,7 +4,7 @@
 WEEK := $(shell date +%Y%W)
 RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10bfs\2/')
-EXTRAVERSION := EXTRAVERSION=-bfs3
+EXTRAVERSION := EXTRAVERSION=-bfs4
 
 PACKAGE := kernel
 FLASHER_PACKAGE := kernel-bfs-flasher
@@ -49,12 +49,17 @@ configure-stamp:
 	QUILT_PATCHES=debian/patches quilt push -a -q || test $$? = 2
 	cp debian/$(DEFCONFIG) arch/arm/configs/
 
+	uudecode debian/u-boot.bin.gz.b64 -o - | gunzip -dc > debian/u-boot.bin
+	dd if=debian/u-boot.bin of=debian/u-boot.pad bs=262144 count=1 conv=sync
 	cd $(KSRC) && $(MAKE) $(EXTRAVERSION) $(DEFCONFIG)
 	touch $@
 
 kernel-stamp: configure-stamp
 	echo "compile $(PRODUCT) kernel"
 	cd $(KSRC) && $(MAKE) $(NJOBS) $(EXTRAVERSION) zImage
+	mkimage  -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n kernel-bfs -d $(BUILDTMP)/arch/arm/boot/zImage $(BUILDTMP)/arch/arm/boot/uImage
+	#cat /usr/lib/u-boot/u-boot.bin.0x38000/u-boot.bin.0x38000 $(BUILDTMP)/arch/arm/boot/uImage > debian/uImage
+	cat debian/u-boot.pad $(BUILDTMP)/arch/arm/boot/uImage > debian/uImage
 	touch $@
 
 modules-stamp: configure-stamp
@@ -73,7 +78,7 @@ modules-extra: configure-stamp
 
 headers: kernel-stamp modules-stamp
 
-clean:
+clean-gen:
 	dh_testdir
 	dh_testroot
 
@@ -86,6 +91,9 @@ clean:
 	rm -rf debian/tmp-*
 	rm -rf debian/build
 	rm -f *-stamp
+	-rm debian/u-boot.bin debian/u-boot.pad debian/uImage
+
+clean: clean-gen
 	QUILT_PATCHES=debian/patches quilt pop -a -q -R || test $$? = 2
 	-rm arch/arm/configs/$(DEFCONFIG)
 	-rm -rf .pc
@@ -99,7 +107,8 @@ install-kernel:
 
 	install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
 	fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
-			-k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
+			-k debian/uImage -v $(RELEASE)
+	#		-k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
 	chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
 
 install-bootimg: