Commit:     453ec9c1c3808b051347edbbf637f997add7b85b
Parent:     0fb19dcb64ec4bd9934eee26ce66417fe028ffd8
Author:     Thomas Betker <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 30 18:22:10 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 13:18:59 2008 +0900

    sh: Fix up uImage target entry point.
    This patch changes the uImage target so that it generates a wrapped
    compressed vmlinux, rather than a wrapped zImage. The previous version
    matched the ARM, this version matches the PPC. However I would question
    how useful a self decompressing image is with a boot loader which does
    decompression, so I think this is more useful. I also feel it matches
    the descrition in the help text ("Compressed kernel image") better.
    Signed-off-by: Thomas Betker <[EMAIL PROTECTED]>
    Signed-off-by: Stuart Menefy <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
 arch/sh/boot/Makefile |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile
index 1b0f5be..4b3a6f1 100644
--- a/arch/sh/boot/Makefile
+++ b/arch/sh/boot/Makefile
@@ -35,17 +35,27 @@ $(obj)/compressed/vmlinux: FORCE
 KERNEL_LOAD    := $(shell /bin/bash -c 'printf "0x%8x" \
                     $$[$(CONFIG_PAGE_OFFSET)  + \
                        $(CONFIG_MEMORY_START) + \
-                       $(CONFIG_ZERO_PAGE_OFFSET)+0x1000]')
+                       $(CONFIG_ZERO_PAGE_OFFSET)]')
+KERNEL_ENTRY   := $(shell /bin/bash -c 'printf "0x%8x" \
+                    $$[$(KERNEL_LOAD)+0x1000]')
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \
-                  -C none -a $(KERNEL_LOAD) -e $(KERNEL_LOAD) \
+                  -C none -a $(KERNEL_LOAD) -e $(KERNEL_ENTRY) \
                   -n 'Linux-$(KERNELRELEASE)' -d $< $@
-$(obj)/uImage: $(obj)/zImage FORCE
+$(obj)/uImage: $(obj)/vmlinux.bin.gz FORCE
        $(call if_changed,uimage)
        @echo '  Image $@ is ready'
+$(obj)/vmlinux.bin: vmlinux FORCE
+       $(call if_changed,objcopy)
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
+       $(call if_changed,gzip)
 OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec
 $(obj)/vmlinux.srec: $(obj)/compressed/vmlinux
        $(call if_changed,objcopy)
@@ -54,4 +64,5 @@ OBJCOPYFLAGS_uImage.srec := -I binary -O srec
 $(obj)/uImage.srec: $(obj)/uImage
        $(call if_changed,objcopy)
-clean-files    += uImage uImage.srec vmlinux.srec
+clean-files    += uImage uImage.srec vmlinux.srec \
+                  vmlinux.bin vmlinux.bin.gz
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to