uImage support

diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index 9ecdbfa..f688160 100644 (file)
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -36,7 +36,7 @@ archmrproper:
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)
 
-vmlinux.srec vmlinux.bin zImage: vmlinux
+vmlinux.srec vmlinux.bin zImage uImage.bin: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 define archhelp

diff --git a/arch/h8300/boot/Makefile b/arch/h8300/boot/Makefile
index 0bb62e0..cd3767c 100644 (file)
--- a/arch/h8300/boot/Makefile
+++ b/arch/h8300/boot/Makefile
@@ -7,16 +7,21 @@ OBJCOPYFLAGS_vmlinux.srec := -Osrec
 OBJCOPYFLAGS_vmlinux.bin  := -Obinary
 OBJCOPYFLAGS_zImage := -O binary -R .note -R .comment -R .stab -R .stabstr -S
 
+UIMAGE_LOADADDR = $(CONFIG_RAMBASE)
+UIMAGE_ENTRYADDR = $(shell /bin/bash -c 'printf "0x%08x" \
+       $$[$(CONFIG_RAMBASE) + 0x40]')
+
 $(obj)/vmlinux.srec $(obj)/vmlinux.bin:  vmlinux FORCE
        $(call if_changed,objcopy)
-       @echo '  Kernel: $@ is ready'
 
 $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
        $(call if_changed,objcopy)
-       @echo 'Kernel: $@ is ready'
 
 $(obj)/compressed/vmlinux: FORCE
        $(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
-CLEAN_FILES += arch/$(ARCH)/vmlinux.bin arch/$(ARCH)/vmlinux.srec
+$(obj)/uImage.bin: $(obj)/vmlinux.bin
+       $(call if_changed,uimage,none)
+
+CLEAN_FILES += arch/$(ARCH)/vmlinux.bin arch/$(ARCH)/vmlinux.srec arch/$(ARCH)/uImage.bin
 

diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 4401e74..adf83dd 100644 (file)
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -20,6 +20,7 @@ SECTIONS
 #else
        . = RAMTOP;
        _ramstart = .;
+       . = . + 0x40;
 #endif
        _text = .;
        HEAD_TEXT_SECTION