hacks for uImage and GPH compatible modules

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index b3432bb..e571547 100644 (file)
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -69,9 +69,9 @@ quiet_cmd_uimage = UIMAGE  $@
 #                 -C gzip -a $(ZRELADDR) -e $(ZRELADDR) \
 #                 -n 'Linux-$(KERNELRELEASE)' -d $< $@
 
-#$(obj)/uImage:        $(obj)/zImage FORCE
-#      $(call if_changed,uimage)
-#      @echo '  Image $@ is ready'
+$(obj)/uImage: $(obj)/zImage FORCE
+       $(call if_changed,uimage)
+       @echo '  Image $@ is ready'
 
 #$(obj)/Image.gz:        $(obj)/Image FORCE
 #      $(call if_changed,gzip)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 82e4993..dba4087 100644 (file)
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -8,6 +8,7 @@ usage() {
 
 cd "${1:-.}" || usage
 
+exit 0
 # Check for git and a git repo.
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
        # Do we have an untagged version?