Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Add uImage and S-rec generation support.

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

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+43 -10
+5 -2
arch/sh/Makefile
··· 179 179 180 180 all: zImage 181 181 182 - zImage: vmlinux 182 + zImage uImage uImage.srec vmlinux.srec: vmlinux 183 183 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ 184 184 185 185 compressed: zImage ··· 190 190 CLEAN_FILES += include/asm-sh/machtypes.h 191 191 192 192 define archhelp 193 - @echo ' zImage - Compressed kernel image (arch/sh/boot/zImage)' 193 + @echo '* zImage - Compressed kernel image' 194 + @echo ' vmlinux.srec - Create an ELF S-record' 195 + @echo ' uImage - Create a bootable image for U-Boot' 196 + @echo ' uImage.srec - Create an S-record for U-Boot' 194 197 endef
+38 -2
arch/sh/boot/Makefile
··· 8 8 # Copyright (C) 1999 Stuart Menefy 9 9 # 10 10 11 - targets := zImage 11 + MKIMAGE := $(srctree)/scripts/mkuboot.sh 12 + 13 + # 14 + # Assign safe dummy values if these variables are not defined, 15 + # in order to suppress error message. 16 + # 17 + CONFIG_PAGE_OFFSET ?= 0x80000000 18 + CONFIG_MEMORY_START ?= 0x0c000000 19 + CONFIG_BOOT_LINK_OFFSET ?= 0x00800000 20 + CONFIG_ZERO_PAGE_OFFSET ?= 0x00001000 21 + 22 + export CONFIG_PAGE_OFFSET CONFIG_MEMORY_START CONFIG_BOOT_LINK_OFFSET \ 23 + CONFIG_ZERO_PAGE_OFFSET 24 + 25 + targets := zImage vmlinux.srec uImage uImage.srec 12 26 subdir- := compressed 13 27 14 28 $(obj)/zImage: $(obj)/compressed/vmlinux FORCE 15 29 $(call if_changed,objcopy) 16 - @echo 'Kernel: $@ is ready' 30 + @echo ' Kernel: $@ is ready' 17 31 18 32 $(obj)/compressed/vmlinux: FORCE 19 33 $(Q)$(MAKE) $(build)=$(obj)/compressed $@ 20 34 35 + KERNEL_LOAD := $(shell printf "0x%8x" $$[$(CONFIG_PAGE_OFFSET) + \ 36 + $(CONFIG_MEMORY_START) + \ 37 + $(CONFIG_ZERO_PAGE_OFFSET)+0x1000]) 38 + 39 + quiet_cmd_uimage = UIMAGE $@ 40 + cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sh -O linux -T kernel \ 41 + -C gzip -a $(KERNEL_LOAD) -e $(KERNEL_LOAD) \ 42 + -n 'Linux-$(KERNELRELEASE)' -d $< $@ 43 + 44 + $(obj)/uImage: $(obj)/zImage FORCE 45 + $(call if_changed,uimage) 46 + @echo ' Image $@ is ready' 47 + 48 + OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec 49 + $(obj)/vmlinux.srec: $(obj)/compressed/vmlinux 50 + $(call if_changed,objcopy) 51 + 52 + OBJCOPYFLAGS_uImage.srec := -I binary -O srec 53 + $(obj)/uImage.srec: $(obj)/uImage 54 + $(call if_changed,objcopy) 55 + 56 + clean-files += uImage uImage.srec vmlinux.srec
-6
arch/sh/boot/compressed/Makefile
··· 15 15 16 16 # 17 17 # IMAGE_OFFSET is the load offset of the compression loader 18 - # Assign dummy values if these 2 variables are not defined, 19 - # in order to suppress error message. 20 18 # 21 - CONFIG_PAGE_OFFSET ?= 0x80000000 22 - CONFIG_MEMORY_START ?= 0x0c000000 23 - CONFIG_BOOT_LINK_OFFSET ?= 0x00800000 24 - 25 19 IMAGE_OFFSET := $(shell printf "0x%08x" $$[$(CONFIG_PAGE_OFFSET) + \ 26 20 $(CONFIG_MEMORY_START) + \ 27 21 $(CONFIG_BOOT_LINK_OFFSET)])