From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Sun, 3 May 2020 15:19:03 +0000 (+0200)
Subject: bcm63xx: loader-lzma: use default lzma
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a0081b19452d8f052757bbe356a6e037ff9afdd3;p=openwrt%2Fstaging%2Fnoltari.git

bcm63xx: loader-lzma: use default lzma

Specific CFE LZMA parameters aren't needed for LZMA Loader.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/target/linux/bcm63xx/image/Makefile b/target/linux/bcm63xx/image/Makefile
index f6d2bf4bbd..9ef7a91ce7 100644
--- a/target/linux/bcm63xx/image/Makefile
+++ b/target/linux/bcm63xx/image/Makefile
@@ -53,20 +53,16 @@ define Build/loader-lzma
 	rm -rf $@.src
 endef
 
-define Build/lzma
+define Build/lzma-cfe
 	# 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 $@.lzma
-	mv $@.lzma $@
-endef
-
-define Build/lzma-cfe
+	$(call Build/lzma-no-dict,-d22 -fb64 -a1)
 	# Strip out the length, CFE doesn't like this
-	dd if=$@ of=$@.lzma.cfe bs=5 count=1
-	dd if=$@ of=$@.lzma.cfe ibs=13 obs=5 skip=1 seek=1 conv=notrunc
-	mv $@.lzma.cfe $@
+	dd if=$@ of=$@.new bs=5 count=1
+	dd if=$@ of=$@.new ibs=13 obs=5 skip=1 seek=1 conv=notrunc
+	mv $@.new $@
 endef
 
 define Build/relocate-kernel
diff --git a/target/linux/bcm63xx/image/bcm63xx.mk b/target/linux/bcm63xx/image/bcm63xx.mk
index 64ddb6374d..d5601e2c3c 100644
--- a/target/linux/bcm63xx/image/bcm63xx.mk
+++ b/target/linux/bcm63xx/image/bcm63xx.mk
@@ -19,7 +19,7 @@ endef
 
 define Device/bcm63xx
   FILESYSTEMS := squashfs jffs2-64k jffs2-128k
-  KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | lzma-cfe
+  KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma-cfe
   KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma elf
   IMAGES := cfe.bin
   IMAGE/cfe.bin := cfe-bin --pad $$$$(shell expr $$$$(FLASH_MB) / 2)