Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 163376
b: refs/heads/master
c: 3c92832
h: refs/heads/master
v: v3
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Jul 29, 2009
1 parent d40aeb0 commit 7ccec35
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fd78a76aefb5bf28a11d6960d29e03a11db62320
refs/heads/master: 3c928320b2254cb6c8d8a7919a1fcf94ca7cae66
2 changes: 1 addition & 1 deletion trunk/arch/sh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y)
libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y)

BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.srec \
zImage vmlinux.srec
zImage vmlinux.srec romImage
PHONY += maketools $(BOOT_TARGETS) FORCE

maketools: include/linux/version.h FORCE
Expand Down
11 changes: 9 additions & 2 deletions trunk/arch/sh/boot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ suffix-$(CONFIG_KERNEL_GZIP) := gz
suffix-$(CONFIG_KERNEL_BZIP2) := bz2
suffix-$(CONFIG_KERNEL_LZMA) := lzma

targets := zImage vmlinux.srec uImage uImage.srec uImage.gz uImage.bz2 uImage.lzma
targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz uImage.bz2 uImage.lzma
extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma
subdir- := compressed
subdir- := compressed romimage

$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
$(call if_changed,objcopy)
Expand All @@ -35,6 +35,13 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
$(obj)/compressed/vmlinux: FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@

$(obj)/romImage: $(obj)/romimage/vmlinux FORCE
$(call if_changed,objcopy)
@echo ' Kernel: $@ is ready'

$(obj)/romimage/vmlinux: $(obj)/zImage FORCE
$(Q)$(MAKE) $(build)=$(obj)/romimage $@

KERNEL_MEMORY := 0x00000000
ifeq ($(CONFIG_PMB_FIXED),y)
KERNEL_MEMORY := $(shell /bin/bash -c 'printf "0x%08x" \
Expand Down
19 changes: 19 additions & 0 deletions trunk/arch/sh/boot/romimage/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#
# linux/arch/sh/boot/romimage/Makefile
#
# create an image suitable for burning to flash from zImage
#

targets := vmlinux head.o

OBJECTS = $(obj)/head.o
LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext 0 -e romstart

$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE
$(call if_changed,ld)
@:

LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T

$(obj)/piggy.o: $(obj)/vmlinux.scr arch/sh/boot/zImage FORCE
$(call if_changed,ld)
10 changes: 10 additions & 0 deletions trunk/arch/sh/boot/romimage/head.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
* linux/arch/sh/boot/romimage/head.S
*
* Board specific setup code, executed before zImage loader
*/

.text
.global romstart
romstart:
#include <romimage.h>
6 changes: 6 additions & 0 deletions trunk/arch/sh/boot/romimage/vmlinux.scr
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
SECTIONS
{
.text : {
*(.data)
}
}
1 change: 1 addition & 0 deletions trunk/arch/sh/include/mach-common/romimage.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* do nothing here by default */

0 comments on commit 7ccec35

Please sign in to comment.