GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-07-23 21:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Odroid C2 boot script syntax

Browse source 
Add ext4 fixes patch from PR36
This commit is contained in:
zador-blood-stained 2016-12-20 16:24:04 +03:00
parent 59ae22f3d2
commit 7b227afc59
2 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

27
config/bootscripts/boot-odroid-c2.ini
View file

@ -128,27 +128,8 @@ ext4load mmc 0:1 ${loadaddr} /boot/zImage || fatload mmc 0:1 ${loadaddr} zImage
ext4load mmc 0:1 ${dtb_loadaddr} /boot/dtb/meson64_odroidc2.dtb || fatload mmc 0:1 ${dtb_loadaddr} dtb/meson64_odroidc2.dtb || ext4load mmc 0:1 ${dtb_loadaddr} dtb/meson64_odroidc2.dtb
fdt addr ${dtb_loadaddr}
if test "${mesontimer}" = "0"; then
fdt rm /meson_timer
fdt rm /cpus/cpu@0/timer
fdt rm /cpus/cpu@1/timer
fdt rm /cpus/cpu@2/timer
fdt rm /cpus/cpu@3/timer
fi
if test "${mesontimer}" = "1"; then
fdt rm /timer
fi
if test "${nographics}" = "1"; then
fdt rm /meson-fb
fdt rm /amhdmitx
fdt rm /picdec
fdt rm /ppmgr
fdt rm /meson-vout
fdt rm /mesonstream
fdt rm /deinterlace
fdt rm /codec_mm
fdt rm /reserved-memory
fdt rm /aocec
fi
if test "${mesontimer}" = "0"; then fdt rm /meson_timer; fdt rm /cpus/cpu@0/timer; fdt rm /cpus/cpu@1/timer; fdt rm /cpus/cpu@2/timer; fdt rm /cpus/cpu@3/timer; fi
if test "${mesontimer}" = "1"; then fdt rm /timer; fi
if test "${nographics}" = "1"; then fdt rm /meson-fb; fdt rm /amhdmitx; fdt rm /picdec; fdt rm /ppmgr; fdt rm /meson-vout; fdt rm /mesonstream; fdt rm /deinterlace; fdt rm /codec_mm; fdt rm /reserved-memory; fdt rm /aocec; fi
booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}
booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}

26
patch/u-boot/u-boot-odroidc2/ext4-fixes-pr-36.patch Normal file
View file

@ -0,0 +1,26 @@
From e68703b116577a7944b089339789eb3f200f73d1 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Mon, 7 Sep 2015 11:20:07 +0200
Subject: [PATCH] fs: ext4: fix symlink read function
Since last API changes for files >2GB, the read of symlink is broken as
ext4fs_read_file now returns 0 instead of the length of the actual read.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
fs/ext4/ext4_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index cab5465..ff10a84 100644
--- a/fs/ext4/ext4_common.c
+++ b/fs/ext4/ext4_common.c
@@ -2040,7 +2040,7 @@ static char *ext4fs_read_symlink(struct ext2fs_node *node)
status = ext4fs_read_file(diro, 0,
__le32_to_cpu(diro->inode.size),
symlink, &actread);
- if (status == 0) {
+ if ((status < 0) || (actread == 0)) {
free(symlink);
return 0;
}