diff mbox

[v2] SPARC: added U-Boot build target: uImage

Message ID 1294674552-26656-1-git-send-email-daniel@gaisler.com
State Changes Requested
Delegated to: David Miller
Headers show

Commit Message

Daniel Hellstrom Jan. 10, 2011, 3:49 p.m. UTC 
This is only for LEON as u-boot for SPARC only supports LEON.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
---
 arch/sparc/Kconfig       |   33 +++++++++++++++++++++++++++++++
 arch/sparc/Makefile      |    3 +-
 arch/sparc/boot/Makefile |   48 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletions(-)

Comments

Sam Ravnborg Jan. 10, 2011, 4:17 p.m. UTC | #1 
Hi Daniel.

Looks better...

>  define archhelp
>    echo  '* image        - kernel image ($(boot)/image)'
>    echo  '* zImage       - stripped kernel image ($(boot)/zImage)'
> +  echo  '  uImage       - U-Boot SPARC32/LEON Image'
>    echo  '  tftpboot.img - image prepared for tftp'

On the commandline you use "sparc32" - so to be consistent I think we should
use "sparc32" in the help text too. But I do not feel strong about this at all.


> +OBJCOPYFLAGS_image.bin := -S -O binary -R .note -R .comment
> +$(obj)/image.bin: $(obj)/image FORCE
> +	$(call if_changed,objcopy)

I recall that we remove .note in similar places.
Could you double check what other archs do here.

> +
> +$(obj)/image.gz: $(obj)/image.bin
> +	$(call if_changed,gzip)
> +
> +# Start of Main memory which this Linux kernel will be loaded to.
> +ifndef CONFIG_UBOOT_LOAD_ADDR
> +CONFIG_UBOOT_LOAD_ADDR=0x40004000
> +endif

I do not see that value in testign for the three newly introduced
Kconfig symbols.
In your backported kernel it may make sense but in mainline the symbols
will always be defined as Kconfig define them.

So just reference them direct.

	Sam
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Daniel Hellstrom Jan. 26, 2011, 3:40 p.m. UTC | #2 
Sam Ravnborg wrote:

>Hi Daniel.
>
>Looks better...
>
>  
>
>> define archhelp
>>   echo  '* image        - kernel image ($(boot)/image)'
>>   echo  '* zImage       - stripped kernel image ($(boot)/zImage)'
>>+  echo  '  uImage       - U-Boot SPARC32/LEON Image'
>>   echo  '  tftpboot.img - image prepared for tftp'
>>    
>>
>
>On the commandline you use "sparc32" - so to be consistent I think we should
>use "sparc32" in the help text too. But I do not feel strong about this at all.
>
>
>  
>
>>+OBJCOPYFLAGS_image.bin := -S -O binary -R .note -R .comment
>>+$(obj)/image.bin: $(obj)/image FORCE
>>+	$(call if_changed,objcopy)
>>    
>>
>
>I recall that we remove .note in similar places.
>Could you double check what other archs do here.
>  
>
It seems to me that x86 also removes .note when making bin format.

>  
>
>>+
>>+$(obj)/image.gz: $(obj)/image.bin
>>+	$(call if_changed,gzip)
>>+
>>+# Start of Main memory which this Linux kernel will be loaded to.
>>+ifndef CONFIG_UBOOT_LOAD_ADDR
>>+CONFIG_UBOOT_LOAD_ADDR=0x40004000
>>+endif
>>    
>>
>
>I do not see that value in testign for the three newly introduced
>Kconfig symbols.
>In your backported kernel it may make sense but in mainline the symbols
>will always be defined as Kconfig define them.
>
>So just reference them direct.
>  
>
Good point, see new patch.

Thanks,
Daniel
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 45d9c87..3b9e142 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -467,6 +467,39 @@  config SPARC_LEON
 	  from www.gaisler.com. You can download a sparc-linux cross-compilation
 	  toolchain at www.gaisler.com.
 
+if SPARC_LEON
+menu "U-Boot options"
+
+config UBOOT_LOAD_ADDR
+	hex "uImage Load Address"
+	default 0x40004000
+	---help---
+	 U-Boot kernel load address, the address in physical address space
+	 where u-boot will place the Linux kernel before booting it.
+	 This address is normally the base address of main memory + 0x4000.
+
+config UBOOT_FLASH_ADDR
+	hex "uImage.o Load Address"
+	default 0x00080000
+	---help---
+	 Optional setting only affecting the uImage.o ELF-image used to
+	 download the uImage file to the target using a ELF-loader other than
+	 U-Boot. It may for example be used to download an uImage to FLASH with
+	 the GRMON utility before even starting u-boot.
+
+config UBOOT_ENTRY_ADDR
+	hex "uImage Entry Address"
+	default 0xf0004000
+	---help---
+	 Do not change this unless you know what you're doing. This is
+	 hardcoded by the SPARC32 and LEON port.
+
+	 This is the virtual address u-boot jumps to when booting the Linux
+	 Kernel.
+
+endmenu
+endif
+
 endmenu
 
 menu "Bus options (PCI etc.)"
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 113225b..012d289 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -88,7 +88,7 @@  boot := arch/sparc/boot
 # Default target
 all: zImage
 
-image zImage tftpboot.img vmlinux.aout: vmlinux
+image zImage uImage tftpboot.img vmlinux.aout: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 archclean:
@@ -102,6 +102,7 @@  ifeq ($(ARCH),sparc)
 define archhelp
   echo  '* image        - kernel image ($(boot)/image)'
   echo  '* zImage       - stripped kernel image ($(boot)/zImage)'
+  echo  '  uImage       - U-Boot SPARC32/LEON Image'
   echo  '  tftpboot.img - image prepared for tftp'
 endef
 else
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index 97e3feb..302e8fc 100644
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -5,6 +5,7 @@ 
 
 ROOT_IMG	:= /usr/src/root.img
 ELFTOAOUT	:= elftoaout
+MKIMAGE 	:= $(srctree)/scripts/mkuboot.sh
 
 hostprogs-y	:= piggyback_32 piggyback_64 btfixupprep
 targets		:= tftpboot.img btfix.o btfix.S image zImage vmlinux.aout
@@ -90,5 +91,52 @@  $(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback_64 System.map $(ROOT_IMG) FOR
 $(obj)/vmlinux.aout: vmlinux FORCE
 	$(call if_changed,elftoaout)
 	@echo '  kernel: $@ is ready'
+else
+
+# The following lines make a readable image for U-Boot.
+#  uImage   - Binary file read by U-boot
+#  uImage.o - object file of uImage for loading with a
+#             flash programmer understanding ELF.
+
+OBJCOPYFLAGS_image.bin := -S -O binary -R .note -R .comment
+$(obj)/image.bin: $(obj)/image FORCE
+	$(call if_changed,objcopy)
+
+$(obj)/image.gz: $(obj)/image.bin
+	$(call if_changed,gzip)
+
+# Start of Main memory which this Linux kernel will be loaded to.
+ifndef CONFIG_UBOOT_LOAD_ADDR
+CONFIG_UBOOT_LOAD_ADDR=0x40004000
+endif
+
+# Entry Point of Linux kernel (Virtual Address)
+ifndef CONFIG_UBOOT_ENTRY_ADDR
+CONFIG_UBOOT_ENTRY_ADDR=0xf0004000
 endif
 
+# Optional uImage.o ELF-image load address. It will load the uImage to the
+# target.
+# Default is the first sector after the U-Boot image (512k). Override this
+# accoring to your u-boot binary size and FLASH block size.
+ifndef CONFIG_UBOOT_FLASH_ADDR
+CONFIG_UBOOT_FLASH_ADDR=0x00080000
+endif
+
+quiet_cmd_uimage = UIMAGE  $@
+      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sparc -O linux -T kernel \
+               -C gzip -a $(CONFIG_UBOOT_LOAD_ADDR) \
+	       -e $(CONFIG_UBOOT_ENTRY_ADDR) -n 'Linux-$(KERNELRELEASE)' \
+               -d $< $@
+
+quiet_cmd_uimage.o = UIMAGE.O $@
+      cmd_uimage.o = $(LD) -Tdata $(CONFIG_UBOOT_FLASH_ADDR) \
+                     -r -b binary $@ -o $@.o
+
+targets += uImage
+$(obj)/uImage: $(obj)/image.gz
+	$(call if_changed,uimage)
+	$(call if_changed,uimage.o)
+	@echo '  Image $@ is ready'
+
+endif