EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bcm63xx: loader-lzma: use default lzma

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

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2020-05-03 17:19:03 +02:00
parent 84646936a6
commit a0081b1945
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/bcm63xx/image/Makefile
View File

@ -53,20 +53,16 @@ define Build/loader-lzma
rm -rf $@.src rm -rf $@.src
endef endef
define Build/lzma define Build/lzma-cfe
# CFE is a LZMA nazi! It took me hours to find out the parameters! # 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 # 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 # if you use stdin / stdout or not. Use files instead of stdio here, cause
# otherwise CFE will complain and not boot the image. # otherwise CFE will complain and not boot the image.
$(STAGING_DIR_HOST)/bin/lzma e $@ -d22 -fb64 -a1 $@.lzma $(call Build/lzma-no-dict,-d22 -fb64 -a1)
mv $@.lzma $@
endef
define Build/lzma-cfe
# Strip out the length, CFE doesn't like this # Strip out the length, CFE doesn't like this
dd if=$@ of=$@.lzma.cfe bs=5 count=1 dd if=$@ of=$@.new bs=5 count=1
dd if=$@ of=$@.lzma.cfe ibs=13 obs=5 skip=1 seek=1 conv=notrunc dd if=$@ of=$@.new ibs=13 obs=5 skip=1 seek=1 conv=notrunc
mv $@.lzma.cfe $@ mv $@.new $@
endef endef
define Build/relocate-kernel define Build/relocate-kernel

2
target/linux/bcm63xx/image/bcm63xx.mk
View File

@ -19,7 +19,7 @@ endef
define Device/bcm63xx define Device/bcm63xx
FILESYSTEMS := squashfs jffs2-64k jffs2-128k 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 KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | loader-lzma elf
IMAGES := cfe.bin IMAGES := cfe.bin
IMAGE/cfe.bin := cfe-bin --pad $$$$(shell expr $$$$(FLASH_MB) / 2) IMAGE/cfe.bin := cfe-bin --pad $$$$(shell expr $$$$(FLASH_MB) / 2)