lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

fix jffs2 mtd partition splitting on little-endian CPU

Browse source
This commit is contained in:
Daniel Barlow 2023-09-26 16:40:37 +01:00
parent ab147abd9b
commit dfe7228b99
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/kernel/default.nix
View file

@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./cmdline-cookie.patch ./cmdline-cookie.patch
./make-mtdsplit-jffs2-endian-agnostic.patch
]; ];
# this is here to work around what I think is a bug in nixpkgs # this is here to work around what I think is a bug in nixpkgs

20
pkgs/kernel/make-mtdsplit-jffs2-endian-agnostic.patch Normal file
View file

@ -0,0 +1,20 @@
On a little-endian CPU, the little-endian JFFS2 magic
appears to be word-swapped.
There is probably a better way to implement this; if you are reading
this patch you are probably well-qualified to do that and upstream it
to OpenWrt
diff --git a/drivers/mtd/mtdsplit/mtdsplit.c b/drivers/mtd/mtdsplit/mtdsplit.c
index b2e51dcfc6..533af0298e 100644
--- a/drivers/mtd/mtdsplit/mtdsplit.c
+++ b/drivers/mtd/mtdsplit/mtdsplit.c
@@ -92,6 +93,6 @@
*type = MTDSPLIT_PART_TYPE_SQUASHFS;
return 0;
- } else if (magic == 0x19852003) {
+ } else if ((magic == 0x19852003) || (magic == 0x20031985)) {
if (type)
*type = MTDSPLIT_PART_TYPE_JFFS2;
return 0;