From 008aec391a3f7813ce9584c4bd60e393825a5b3e Mon Sep 17 00:00:00 2001 From: Jonas Gorski <jogo@openwrt.org> Date: Wed, 4 Nov 2015 11:33:22 +0000 Subject: [PATCH] brcm63xx: work around boot failures with squashfs on BCM6368 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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> SVN-Revision: 47380 --- tools/firmware-utils/src/imagetag.c | 2 ++ 1 file changed, 2 insertions(+) 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); -- GitLab