summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYacine Belkadi2012-03-02 17:43:09 +0100
committerYacine Belkadi2012-06-11 13:40:07 +0200
commita4cabf02de46c1b14fa52017277ef96ae85e86db (patch)
tree9fe207873d8f84ea39c674ca288030b96c893d2a
parent824f1f386012838e071b05cd029bc2c110a9ff14 (diff)
polux/linux: add the possibility to make an sImage
Copies from master at 31afe8813e218ba2bee76b3f1e653266e7f6f670
-rw-r--r--polux/linux-2.6.10/arch/arm/Makefile2
-rw-r--r--polux/linux-2.6.10/arch/arm/boot/Makefile14
2 files changed, 15 insertions, 1 deletions
diff --git a/polux/linux-2.6.10/arch/arm/Makefile b/polux/linux-2.6.10/arch/arm/Makefile
index a5c0917543..39e6e10d13 100644
--- a/polux/linux-2.6.10/arch/arm/Makefile
+++ b/polux/linux-2.6.10/arch/arm/Makefile
@@ -280,7 +280,7 @@ maketools: include/asm-arm/constants.h include/linux/version.h FORCE
# Convert bzImage to zImage
bzImage: zImage
-zImage Image xipImage bootpImage uImage: vmlinux
+zImage Image xipImage bootpImage uImage sImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
uCImage: vmlinux linux.bin
diff --git a/polux/linux-2.6.10/arch/arm/boot/Makefile b/polux/linux-2.6.10/arch/arm/boot/Makefile
index e5f2dc00d7..09aada6d8b 100644
--- a/polux/linux-2.6.10/arch/arm/boot/Makefile
+++ b/polux/linux-2.6.10/arch/arm/boot/Makefile
@@ -9,6 +9,7 @@
#
MKIMAGE := $(srctree)/scripts/mkuboot.sh
+MKSIMAGE := $(srctree)/scripts/mksimage/mksimage
ifneq ($(MACHINE),)
include $(srctree)/$(MACHINE)/Makefile.boot
@@ -65,6 +66,19 @@ $(obj)/uImage: $(obj)/zImage FORCE
$(call if_changed,uimage)
@echo ' Image $@ is ready'
+quiet_cmd_simage = SIMAGE $@
+cmd_simage = $(MKSIMAGE) --desc "MSE500-200 image" \
+ --ver "$(if $(IMG_VERSION),$(IMG_VERSION),$(shell date +%F\ %R))" \
+ --size "$(shell du -sb $< | awk '{ print $$1 }')" \
+ --md5 "$(shell md5sum $< | awk '{ print $$1 }')" \
+ --plc-ram "0" > $@ ; \
+ cat $< >> $@
+
+$(obj)/sImage: $(obj)/zImage FORCE
+ # Prepend SPiDCOM image desc to zImage
+ $(call if_changed,simage)
+ @echo ' Image $@ is ready'
+
$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
$(Q)$(MAKE) $(build)=$(obj)/bootp $@
@: