diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-11-04 11:33:22 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-11-04 11:33:22 +0000 |
| commit | cea1fbf79a1230bdff5b97a2ac67ae43c3e993de (patch) | |
| tree | a5806ed9db355538c5da2c970b2ed6dc23680000 /tools/firmware-utils | |
| parent | e1bd3a280d948fc985999861766b51e14a5b84b5 (diff) | |
| download | master-187ad058-cea1fbf79a1230bdff5b97a2ac67ae43c3e993de.tar.gz master-187ad058-cea1fbf79a1230bdff5b97a2ac67ae43c3e993de.tar.bz2 master-187ad058-cea1fbf79a1230bdff5b97a2ac67ae43c3e993de.zip | |
brcm63xx: work around boot failures with squashfs on BCM6368
Due to the LWL/LWR SMP issue on BCM6368, booting with squash might fail
if the rootfs is not word aligned. As a quick fix, work around it by
ensuring this condition is always true.
Reported-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47380 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/firmware-utils')
| -rw-r--r-- | tools/firmware-utils/src/imagetag.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/firmware-utils/src/imagetag.c b/tools/firmware-utils/src/imagetag.c index 6a46a7ebd9..90fb7a4c73 100644 --- a/tools/firmware-utils/src/imagetag.c +++ b/tools/firmware-utils/src/imagetag.c @@ -164,6 +164,8 @@ int tagfile(const char *kernel, const char *rootfs, const char *bin, \ /* align the start if requested */ if (args->align_rootfs_flag) rootfsoff = (rootfsoff % block_size) > 0 ? (((rootfsoff / block_size) + 1) * block_size) : rootfsoff; + else + rootfsoff = (rootfsoff % 4) > 0 ? (((rootfsoff / 4) + 1) * 4) : rootfsoff; /* align the end */ rootfsend = rootfsoff + getlen(rootfsfile); |