diff options
| author | Mathias Kresin <dev@kresin.me> | 2021-11-27 21:43:40 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2021-11-27 23:00:31 +0100 |
| commit | 36848e2c29ef7be477db875491fd96f2efa08645 (patch) | |
| tree | 5d10d0b454878d9a5312a714b4e0e77cf8b6717b /package/boot | |
| parent | 4172a8e0ad26d95ad21d7dd92f85a1d3f5abd74a (diff) | |
| download | upstream-36848e2c29ef7be477db875491fd96f2efa08645.tar.gz upstream-36848e2c29ef7be477db875491fd96f2efa08645.tar.bz2 upstream-36848e2c29ef7be477db875491fd96f2efa08645.zip | |
uboot-lantiq: danube: fix hanging lzma kernel uncompression #2
Follow up to commit c744798cad6a13436f2ba9dd3a280cb16d315c85. Managed to
hit the very same issue again while playing with the NOR SPL builds.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/boot')
| -rw-r--r-- | package/boot/uboot-lantiq/patches/0030-lzma-force-8bit-reads.patch | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/package/boot/uboot-lantiq/patches/0030-lzma-force-8bit-reads.patch b/package/boot/uboot-lantiq/patches/0030-lzma-force-8bit-reads.patch index dc7d9ed7ee..a934dab5cd 100644 --- a/package/boot/uboot-lantiq/patches/0030-lzma-force-8bit-reads.patch +++ b/package/boot/uboot-lantiq/patches/0030-lzma-force-8bit-reads.patch @@ -37,6 +37,15 @@ Signed-off-by: Mathias Kresin <dev@kresin.me> #define kNumTopBits 24 #define kTopValue ((UInt32)1 << kNumTopBits) +@@ -703,7 +704,7 @@ static ELzmaDummy LzmaDec_TryDummy(const + + static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data) + { +- p->code = ((UInt32)data[1] << 24) | ((UInt32)data[2] << 16) | ((UInt32)data[3] << 8) | ((UInt32)data[4]); ++ p->code = ((UInt32)readb(&data[1]) << 24) | ((UInt32)readb(&data[2]) << 16) | ((UInt32)readb(&data[3]) << 8) | ((UInt32)readb(&data[4])); + p->range = 0xFFFFFFFF; + p->needFlush = 0; + } @@ -929,7 +930,7 @@ SRes LzmaProps_Decode(CLzmaProps *p, con if (size < LZMA_PROPS_SIZE) return SZ_ERROR_UNSUPPORTED; |