[rdc] simplify sitecom image generation with a script, patch from rtz

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18670 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 26 insertions, 17 deletions

diff --git a/target/linux/rdc/image/Makefile b/target/linux/rdc/image/Makefile
index 0de6dbc25..f8082b08d 100644
--- a/target/linux/rdc/image/Makefile
+++ b/target/linux/rdc/image/Makefile
@@ -34,26 +34,18 @@ define Image/Build/ar525w
 	$(STAGING_DIR_HOST)/bin/airlink -e -b 1 -j $(shell bash -c 'echo $$[$(3)]') $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2)-web.img
 endef
 
-define Image/Prepare/sitecom/squashfs
-	dd if=/dev/null of=$(KDIR)/root.tmp seek=1 bs=32k
-	echo -n "0123456789abcdef0123" >> $(KDIR)/root.tmp
-	cat $(KDIR)/bzImage $(KDIR)/root.squashfs >> $(KDIR)/root.tmp
-	dd if=$(KDIR)/root.tmp of=$(KDIR)/root2.tmp bs=64k conv=sync
-	dd if=$(KDIR)/root2.tmp of=$(KDIR)/root.squashfs bs=1 skip=$$$$(perl -we 'print((-s"$(KDIR)/bzImage")+0x8014)')
-	$(RM) $(KDIR)/root.tmp $(KDIR)/root2.tmp
-	$(call add_jffs2_mark,$(KDIR)/root.squashfs)
+define Image/Postprocess/sitecom/squashfs
+	dd if=/dev/zero of=$(KDIR)/tmp2.img count=1 bs=32k #32k config data a start of flash
+	cat $(KDIR)/tmp.img >> $(KDIR)/tmp2.img
+	$(call prepare_generic_squashfs,$(KDIR)/tmp2.img)
+	dd if=$(KDIR)/tmp2.img of=$(KDIR)/tmp.img bs=32k skip=1
 endef
 
 define Image/Build/sitecom
-	echo -ne "\0\0" >> $(KDIR)/bzImage
-	dd if=$(KDIR)/bzImage of=$(KDIR)/bzImage.tmp bs=4 conv=sync
-	dd if=$(KDIR)/bzImage.tmp of=$(KDIR)/bzImage bs=1 count=$$$$(perl -we 'print((-s"$(KDIR)/bzImage.tmp")-2)')
-	perl -we 'while(<>){$$$$i.=$$$$_}print pack"v",-(unpack"%v*",$$$$i)' < $(KDIR)/bzImage.tmp >> $(KDIR)/bzImage
-	$(RM) $(KDIR)/bzImage.tmp
-	$(call Image/Prepare/sitecom/$(1))
-	perl -we 'print "CSYS",pack("V",-s"$(KDIR)/bzImage"),pack("V",-s"$(KDIR)/root.$(1)"),"WRRM",pack("V",-s"$(KDIR)/bzImage")' > $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
-	cat $(KDIR)/bzImage $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
-	if [ `perl -we 'print -s"$(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img"'` -gt $$$$((0xffff0000-0xffe08000)) ]; then mv $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img.too_big; echo "#ERR image too big"; fi 
+	$(TOPDIR)/target/linux/rdc/image/mkimg_sitecom.pl $(KDIR)/bzImage > $(KDIR)/tmp.img
+	cat $(KDIR)/root.$(1) >> $(KDIR)/tmp.img
+	$(call Image/Postprocess/sitecom/$(1))
+	cp $(KDIR)/tmp.img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
 endef
 
 define Image/Build/dir450
diff --git a/target/linux/rdc/image/mkimg_sitecom.pl b/target/linux/rdc/image/mkimg_sitecom.pl
new file mode 100644
index 000000000..4dd4a398c
--- /dev/null
+++ b/target/linux/rdc/image/mkimg_sitecom.pl
@@ -0,0 +1,17 @@
+#!/usr/bin/perl
+
+$bzimgsize = -s @ARGV[0];
+$padding = 4 - ($bzimgsize + 2) % 4;
+if ($padding == 4) {
+	$padding = 0; }
+open (bzimg, @ARGV[0]);
+while (<bzimg>) { $i .= $_; }
+$i .= "\0"x$padding;
+$i .= pack "v", -(unpack "%v*", $i); 
+print "CSYS";
+print pack("V", length($i));
+print pack("V", 0);
+#-s @ARGV[1]
+print "WRRM";
+print pack("V", length($i));
+print $i;