From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 18 May 2008 17:30:04 +0000 (+0000)
Subject: bcm963xx: image generation using image tagger
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2dfabe39918965db358452bea94d2a317c58309a;p=openwrt%2Fstaging%2Fsvanheule.git

bcm963xx: image generation using image tagger

This adds CFE tagged image generation in the BCM963xx target image Makefile.
It has to generate its own LZMA compressed kernel because CFE is a LZMA nazi.
It also seems that the Broadcom image tagger as well as CFE use AdvanceCOMP,
which is based on a slightly older LZMA SDK. Anyways, some of the code is
GPL, some of it is LGPL, so it might be that Broadcom owes some sources.
Also, LZMA has a bug which causes it to generate different output when you
are using stdin / stdout compared to plain files. I've just worked around
the issue by using plain files.

Signed-off-by: Axel Gembe <ago@bastart.eu.org>

SVN-Revision: 11171
---

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 227dbd7a54..47c1df730d 100644
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -27,25 +27,52 @@ define trxalign/squashfs
 -a 1024
 endef
 
+define Image/Build/CFE
+	# Generate the tagged image
+	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
+		-o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin \
+		-b $(2) -c $(3) -e $(LOADADDR) -l $(LOADADDR)
+#		-b $(2) -c $(3) -e $(KERNEL_ENTRY) -l $(LOADADDR)
+
+	$(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin)
+endef
+
 define Build/Clean
 	$(MAKE) -C lzma-loader clean
 endef
 
 define Image/Prepare
+	# Standard LZMA kernel
 	cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+
+	# CFE is a LZMA nazi! It took me hours to find out the parameters!
+	# Also I think lzma has a bug cause it generates different output depending on
+	# if you use stdin / stdout or not. Use files instead of stdio here, cause
+	# otherwise CFE will complain and not boot the image.
+	$(STAGING_DIR_HOST)/bin/lzma e -d22 -fb64 -a1 $(KDIR)/vmlinux $(KDIR)/vmlinux.lzma.tmp
+
+	# Strip out the length, CFE doesn't like this
+	dd if=$(KDIR)/vmlinux.lzma.tmp of=$(KDIR)/vmlinux.lzma.cfe bs=5 count=1
+	dd if=$(KDIR)/vmlinux.lzma.tmp of=$(KDIR)/vmlinux.lzma.cfe ibs=13 obs=5 skip=1 seek=1 conv=notrunc
+	rm -f $(KDIR)/vmlinux.lzma.tmp
+
+	# Build the LZMA loader
 	rm -f $(KDIR)/loader.gz
 	$(MAKE) -C lzma-loader \
 		BUILD_DIR="$(KDIR)" \
 		TARGET="$(KDIR)" \
 		clean install
+
 	echo -ne "\\x00" >> $(KDIR)/loader.gz
 	rm -f $(KDIR)/fs_mark
 	touch $(KDIR)/fs_mark
 	$(call prepare_generic_squashfs,$(KDIR)/fs_mark)
+
 endef
 
 define Image/Build
 	$(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1)) -f $(KDIR)/root.$(1)
+	$(call Image/Build/CFE,$(1),96345GW2,6345)
 endef
 
 $(eval $(call BuildImage))