Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf00e204 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Add uImage and S-rec generation support. 



Add a couple of new targets, both for uImage and S-rec generation.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent fce3a24e

arch/sh/Makefile

+5 −2
Original line number Original line Diff line number Diff line
@@ -179,7 +179,7 @@ maketools: include/linux/version.h FORCE 




all: zImage

all: zImage





zImage: vmlinux

zImage uImage uImage.srec vmlinux.srec: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@





compressed: zImage

compressed: zImage
@@ -190,5 +190,8 @@ archclean: 
CLEAN_FILES += include/asm-sh/machtypes.h

CLEAN_FILES += include/asm-sh/machtypes.h





define archhelp

define archhelp

	@echo '  zImage 	           - Compressed kernel image (arch/sh/boot/zImage)'

	@echo '* zImage 	           - Compressed kernel image'

	@echo '  vmlinux.srec	           - Create an ELF S-record'

	@echo '  uImage  	           - Create a bootable image for U-Boot'

	@echo '  uImage.srec  	           - Create an S-record for U-Boot'

endef
 
endef

arch/sh/boot/Makefile

+38 −2
Original line number Original line Diff line number Diff line
@@ -8,7 +8,21 @@ 
# Copyright (C) 1999 Stuart Menefy

# Copyright (C) 1999 Stuart Menefy

#

#





targets := zImage

MKIMAGE := $(srctree)/scripts/mkuboot.sh



#

# Assign safe dummy values if these variables are not defined,

# in order to suppress error message.

#

CONFIG_PAGE_OFFSET	?= 0x80000000

CONFIG_MEMORY_START	?= 0x0c000000

CONFIG_BOOT_LINK_OFFSET	?= 0x00800000

CONFIG_ZERO_PAGE_OFFSET	?= 0x00001000



export CONFIG_PAGE_OFFSET CONFIG_MEMORY_START CONFIG_BOOT_LINK_OFFSET \

       CONFIG_ZERO_PAGE_OFFSET



targets := zImage vmlinux.srec uImage uImage.srec

subdir- := compressed

subdir- := compressed





$(obj)/zImage: $(obj)/compressed/vmlinux FORCE

$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
@@ -18,3 +32,25 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE 
$(obj)/compressed/vmlinux: FORCE

$(obj)/compressed/vmlinux: FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@





KERNEL_LOAD	:= $(shell printf "0x%8x" $$[$(CONFIG_PAGE_OFFSET)  + \

					     $(CONFIG_MEMORY_START) + \

					     $(CONFIG_ZERO_PAGE_OFFSET)+0x1000])



quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \

		   -C gzip -a $(KERNEL_LOAD) -e $(KERNEL_LOAD) \

		   -n 'Linux-$(KERNELRELEASE)' -d $< $@



$(obj)/uImage: $(obj)/zImage FORCE

	$(call if_changed,uimage)

	@echo '  Image $@ is ready'



OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec

$(obj)/vmlinux.srec: $(obj)/compressed/vmlinux

	$(call if_changed,objcopy)



OBJCOPYFLAGS_uImage.srec := -I binary -O srec

$(obj)/uImage.srec: $(obj)/uImage

	$(call if_changed,objcopy)



clean-files	+= uImage uImage.srec vmlinux.srec

arch/sh/boot/compressed/Makefile

+0 −6
Original line number Original line Diff line number Diff line
@@ -15,13 +15,7 @@ endif 




#

#

# IMAGE_OFFSET is the load offset of the compression loader

# IMAGE_OFFSET is the load offset of the compression loader

# Assign dummy values if these 2 variables are not defined,

# in order to suppress error message.

#

#

CONFIG_PAGE_OFFSET	?= 0x80000000

CONFIG_MEMORY_START     ?= 0x0c000000

CONFIG_BOOT_LINK_OFFSET ?= 0x00800000



IMAGE_OFFSET	:= $(shell printf "0x%08x" $$[$(CONFIG_PAGE_OFFSET)  + \

IMAGE_OFFSET	:= $(shell printf "0x%08x" $$[$(CONFIG_PAGE_OFFSET)  + \

					      $(CONFIG_MEMORY_START) + \

					      $(CONFIG_MEMORY_START) + \

					      $(CONFIG_BOOT_LINK_OFFSET)])

					      $(CONFIG_BOOT_LINK_OFFSET)])