diff options
author | Jesper Nilsson <jesper.nilsson@axis.com> | 2009-04-21 11:44:57 +0200 |
---|---|---|
committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2009-04-21 11:44:57 +0200 |
commit | 66ab3a74c5ce737effc2c64391e036b0938b1c36 (patch) | |
tree | abe71b0c811dd13c9b9ad2587ba8779a8f852220 /arch/cris/arch-v10/boot/rescue/Makefile | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff) | |
download | linux-66ab3a74c5ce737effc2c64391e036b0938b1c36.tar.xz linux-66ab3a74c5ce737effc2c64391e036b0938b1c36.zip |
CRIS: Merge machine dependent boot/compressed and boot/rescue
Merge the machine dependent boot directories for v10 and v32.
This avoids some code duplication and eases the way for further
merging later on.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/arch-v10/boot/rescue/Makefile')
-rw-r--r-- | arch/cris/arch-v10/boot/rescue/Makefile | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile deleted file mode 100644 index 82ab59b968e5..000000000000 --- a/arch/cris/arch-v10/boot/rescue/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# -# Makefile for rescue (bootstrap) code -# - -ccflags-y += -O2 $(LINUXINCLUDE) -asflags-y += $(LINUXINCLUDE) -ldflags-y += -T $(srctree)/$(src)/rescue.lds -OBJCOPYFLAGS = -O binary --remove-section=.bss -obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o -OBJECT := $(obj)/head.o - -targets := rescue.o rescue.bin - -$(obj)/rescue.o: $(OBJECT) FORCE - $(call if_changed,ld) - -$(obj)/rescue.bin: $(obj)/rescue.o FORCE - $(call if_changed,objcopy) - cp -p $(obj)/rescue.bin $(objtree) - -$(obj)/testrescue.bin: $(obj)/testrescue.o - $(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/testrescue.o tr.bin -# Pad it to 784 bytes - dd if=/dev/zero of=tmp2423 bs=1 count=784 - cat tr.bin tmp2423 >testrescue_tmp.bin - dd if=testrescue_tmp.bin of=$(obj)/testrescue.bin bs=1 count=784 - rm tr.bin tmp2423 testrescue_tmp.bin - -$(obj)/kimagerescue.bin: $(obj)/kimagerescue.o - $(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/kimagerescue.o ktr.bin -# Pad it to 784 bytes, that's what the rescue loader expects - dd if=/dev/zero of=tmp2423 bs=1 count=784 - cat ktr.bin tmp2423 >kimagerescue_tmp.bin - dd if=kimagerescue_tmp.bin of=$(obj)/kimagerescue.bin bs=1 count=784 - rm ktr.bin tmp2423 kimagerescue_tmp.bin |