From patchwork Sat Feb 14 17:18:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudio Leite X-Patchwork-Id: 439764 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DE5E6140172 for ; Sun, 15 Feb 2015 04:19:21 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6DDCA28013B; Sat, 14 Feb 2015 18:19:05 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 958D528013B for ; Sat, 14 Feb 2015 18:19:00 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .staticky. - helo: .smtp.rcn. - helo-domain: .rcn.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=1; rate: -5.5 Received: from smtp.rcn.com (smtp.rcn.com [69.168.97.78]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 14 Feb 2015 18:18:59 +0100 (CET) X_CMAE_Category: , , X-CNFS-Analysis: v=2.0 cv=a5CyBDuF c=1 sm=1 a=GuteYBN2S9jz87ZyP3BHnQ==:17 a=8ndMLmUfAAAA:8 a=PR7QuSWhIQPBPEXR9f4A:9 a=GuteYBN2S9jz87ZyP3BHnQ==:117 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: bGVpdGVjQHN0YXRpY2t5LmNvbQ== Authentication-Results: smtp01.rcn.cmh.synacor.com smtp.mail=leitec@staticky.com; spf=neutral; sender-id=neutral Authentication-Results: smtp01.rcn.cmh.synacor.com header.from=leitec@staticky.com; sender-id=neutral Received-SPF: neutral (smtp01.rcn.cmh.synacor.com: 208.58.65.14 is neither permitted nor denied by domain of staticky.com) Received: from [208.58.65.14] ([208.58.65.14:46098] helo=dirk.lan.staticky.com) by smtp.rcn.com (envelope-from ) (ecelerity 3.6.2.43620 r(Platform:3.6.2.0)) with ESMTP id 14/DA-44282-0838FD45; Sat, 14 Feb 2015 12:18:57 -0500 From: Claudio Leite To: openwrt-devel@lists.openwrt.org Date: Sat, 14 Feb 2015 12:18:56 -0500 Message-Id: <1423934336-17020-1-git-send-email-leitec@staticky.com> X-Mailer: git-send-email 2.3.0.rc1.30.g76afe74 Subject: [OpenWrt-Devel] [PATCH] mvebu: fix WRT1900AC ubinized images X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" The VID header offset must be specified explicitly. Signed-off-by: Claudio Leite --- target/linux/mvebu/image/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 3512c6a..da7d217 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -31,6 +31,7 @@ endef # $(3): Erase Block Size # $(4): Page Size # $(5): Sub-Page Size (optional) +# $(6): VID offset (optional) define NANDProfile define Image/BuildKernel/Profile/$(1) $(call Image/Build/DTB,$(2)) @@ -48,7 +49,7 @@ define NANDProfile endef define Image/Build/Profile/$(1)/squashfs - $(call Image/Build/UbinizeImage,$(2),,squashfs, -p $(3) -m $(4) $(if $(5),-s $(5))) + $(call Image/Build/UbinizeImage,$(2),,squashfs, -p $(3) -m $(4) $(if $(5),-s $(5)) $(if $(6),-O $(6))) # The next line will be dropped, migrate your board to use a single firmware file cp $(KDIR)/$$(IMG_PREFIX)-$(2)-squashfs-ubinized.bin $(BIN_DIR) endef @@ -136,7 +137,7 @@ $(eval $(call NANDProfile,XP-DB,armada-xp-db,512KiB,4096)) $(eval $(call NANDProfile,XP-GP,armada-xp-gp,512KiB,4096)) # Boards with NAND, with subpages -$(eval $(call NANDProfile,Mamba,armada-xp-mamba,128KiB,2048,512)) +$(eval $(call NANDProfile,Mamba,armada-xp-mamba,128KiB,2048,512,2048)) # Boards with large NOR, where we want to use UBI $(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB)) @@ -145,7 +146,7 @@ $(eval $(call UBINORProfile,OpenBlocks-AX-3-4,armada-xp-openblocks-ax3-4,128KiB) $(eval $(call NORProfile,385-RD,armada-385-rd,256KiB)) define Image/Build/Profile/Mamba/squashfs - $(call Image/Build/UbinizeImage,armada-xp-mamba,,squashfs, -p 128KiB -m 2048 -s 512) + $(call Image/Build/UbinizeImage,armada-xp-mamba,,squashfs, -p 128KiB -m 2048 -s 512 -O 2048) ( \ dd if=$(KDIR)/uImage-armada-xp-mamba bs=3072k conv=sync; \ dd if=$(KDIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \