summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/arch
diff options
context:
space:
mode:
authorsave2009-07-28 11:07:52 +0000
committersave2009-07-28 11:07:52 +0000
commitb53b263f5ce9ab85077c5d783cd49ca4dd8a912d (patch)
tree30703f71504b6dcef8a771c9295054286f116343 /cleopatre/linux-2.6.25.10-spc300/arch
parentb0fc92e2fc71e678ec0ead3fc5da8e17a43c55b1 (diff)
[CLEO][KERNEL] Move make descriptor image
- Moved mkimgdesc from linux/tools to scripts/mksimge - Changed Makefile to compile mksimage before kernel - Changed sImage creation to call mksimage git-svn-id: svn+ssh://pessac/svn/cesar/trunk@5105 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/arch')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/Makefile25
1 files changed, 10 insertions, 15 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/Makefile b/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/Makefile
index 5dfd5ef48b..d88fc50f09 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/Makefile
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/boot/Makefile
@@ -11,11 +11,8 @@
# Copyright (C) 1995-2002 Russell King
#
-TOPDIR = .
-IMAGE_DIR = ./arch/arm/boot/
-MKIMAGEDESC=$(TOPDIR)/tools/mkimagedesc/mkimagedesc
-
MKIMAGE := $(srctree)/scripts/mkuboot.sh
+MKSIMAGE := $(srctree)/scripts/mksimage/mksimage
ifneq ($(MACHINE),)
include $(srctree)/$(MACHINE)/Makefile.boot
@@ -72,18 +69,16 @@ $(obj)/uImage: $(obj)/zImage FORCE
$(call if_changed,uimage)
@echo ' Image $@ is ready'
+quiet_cmd_simage = SIMAGE $@
+cmd_simage = $(MKSIMAGE) --desc "SPC300 image" \
+ --ver "$(shell date +%F)" \
+ --size "$(shell du -sb $< | awk '{ print $$1 }')" \
+ --md5 "$(shell md5sum $< | awk '{ print $$1 }')" > $@ ; \
+ cat $< >> $@
+
$(obj)/sImage: $(obj)/zImage FORCE
- # Prepend image desc to zImage
- @ksize=$(shell du -sb $< | awk '{ print $$1 }'); \
- kmd5=$(shell md5sum $< | awk '{ print $$1 }'); \
- kver=$(shell date +%F); \
- $(MKIMAGEDESC) --desc "SPC300 image" \
- --ver "$$kver" \
- --size "$$ksize" \
- --md5 "$$kmd5" > $@;
- @cat $< >> $@;
- @rm -f $(IMAGE_DIR)/image.bin;
- @ln -s $@ $(IMAGE_DIR)/image.bin;
+ # Prepend SPiDCOM image desc to zImage
+ $(call if_changed,simage)
@echo ' Image $@ is ready'
$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE