diff options
| -rw-r--r-- | arch/arm/cpu/start.c | 11 | ||||
| -rw-r--r-- | images/Makefile | 6 | ||||
| -rw-r--r-- | pbl/Kconfig | 5 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 12 |
4 files changed, 23 insertions, 11 deletions
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c index 755d488519..5861c15d43 100644 --- a/arch/arm/cpu/start.c +++ b/arch/arm/cpu/start.c @@ -52,7 +52,7 @@ u32 barebox_arm_machine(void) void *barebox_arm_boot_dtb(void) { void *dtb; - int ret; + int ret = 0; struct barebox_boarddata_compressed_dtb *compressed_dtb; static void *boot_dtb; @@ -75,8 +75,13 @@ void *barebox_arm_boot_dtb(void) if (!dtb) return NULL; - ret = uncompress(compressed_dtb->data, compressed_dtb->datalen, - NULL, NULL, dtb, NULL, NULL); + if (IS_ENABLED(CONFIG_IMAGE_COMPRESSION_NONE)) + memcpy(dtb, compressed_dtb->data, + compressed_dtb->datalen_uncompressed); + else + ret = uncompress(compressed_dtb->data, compressed_dtb->datalen, + NULL, NULL, dtb, NULL, NULL); + if (ret) { pr_err("uncompressing dtb failed\n"); free(dtb); diff --git a/images/Makefile b/images/Makefile index a148cf4176..c79f1a272e 100644 --- a/images/Makefile +++ b/images/Makefile @@ -108,12 +108,6 @@ $(obj)/%.pblb: $(obj)/%.pbl FORCE $(obj)/%.s: $(obj)/% FORCE $(call if_changed,disasm) -suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip -suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo -suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4) = lz4 -suffix_$(CONFIG_IMAGE_COMPRESSION_XZKERN) = xzkern -suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = comp_copy - $(obj)/piggy.o: $(obj)/barebox.z FORCE $(obj)/sha_sum.o: $(obj)/barebox.sha.bin FORCE diff --git a/pbl/Kconfig b/pbl/Kconfig index 4dfa9553f7..ba809af2d5 100644 --- a/pbl/Kconfig +++ b/pbl/Kconfig @@ -31,7 +31,10 @@ if PBL_IMAGE config USE_COMPRESSED_DTB bool depends on ARM || RISCV - select LZO_DECOMPRESS + select LZ4_DECOMPRESS if IMAGE_COMPRESSION_LZ4 + select LZO_DECOMPRESS if IMAGE_COMPRESSION_LZO + select ZLIB if IMAGE_COMPRESSION_GZIP + select XZ_DECOMPRESS if IMAGE_COMPRESSION_XZKERN config PBL_RELOCATABLE depends on ARM || MIPS || RISCV diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index c2301b5370..eada1dd519 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -272,6 +272,16 @@ cmd_ld = $(LD) $(KBUILD_LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \ quiet_cmd_objcopy = OBJCOPY $@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ +# Decompressor for barebox proper binary when using PBL +# --------------------------------------------------------------------------- + +suffix_y = comp_copy +suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip +suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo +suffix_$(CONFIG_IMAGE_COMPRESSION_LZ4) = lz4 +suffix_$(CONFIG_IMAGE_COMPRESSION_XZKERN) = xzkern +suffix_$(CONFIG_IMAGE_COMPRESSION_NONE) = comp_copy + # Gzip # --------------------------------------------------------------------------- @@ -337,7 +347,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb $(obj)/%.dtb.z $(srctree)/scripts/gen-dtb-s FORCE $(call if_changed,dt_S_dtb) $(obj)/%.dtb.z: $(obj)/%.dtb FORCE - $(call if_changed,lzo) + $(call if_changed,$(suffix_y)) dts-frags = $(subst $(quote),,$(CONFIG_EXTERNAL_DTS_FRAGMENTS)) quiet_cmd_dtc = DTC $@ |