From patchwork Mon Jun 26 11:55:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Chandra Jangir X-Patchwork-Id: 780684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wx6wV2vwYz9s76 for ; Mon, 26 Jun 2017 21:56:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OSqRV/CJ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="gFFINmzn"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="gFFINmzn"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=M1qoPKtgNqW/Tmyz1gnjQAjoFGI7E3d0c+HlHLSQpZg=; b=OSqRV/CJczcGnN v5CYhQK6ugDh9sBkTBO5kRIwW/sZT3dRfcJtPSPEwOqlGCX66tm8QSK0C8Ba8nShdEpe8oG2J9zrX F5vdz0/HQm2rNEWmVgdNe6H4RBItUPKTy4DwejeoHWqRLlQ9jnvO9C14wg4V/CNjbNH2HxkwCH9cS G8jLAdm4q2FmE7ct6bg4rwlbo5vo+AuOsTZDwNfmeyIlaDZpLCYXKLEcJisDZjWTSshOIcmDLWlWD zrakxAzs81fHEqPR5I9vLGG9I9B5bSy+iC6ky/5bwmyfsHLpKmHQ1nZDKexaAeTN/5bjWNLvcQJHu kFd2DZx7kNWdBsrpldSQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dPScr-0002r5-6O; Mon, 26 Jun 2017 11:56:17 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dPSco-0002o7-BC for lede-dev@lists.infradead.org; Mon, 26 Jun 2017 11:56:16 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B41A96110E; Mon, 26 Jun 2017 11:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498478153; bh=im8vhrtPfJ47QTRHrh4f1SPiIqolGBWIcDuLUimsFHw=; h=From:To:Cc:Subject:Date:From; b=gFFINmznh+/6qhbJ7CrSq6Qpmr38Zgywo+s/Ui6Y5+bubDjqd939WdjumZVYamcrv wftzZOOSyBzUmHs+N7RS37m+UWCMNZiggFmaOE+31KcNa196aQYdgxvX2MgE27A2Gk ZoWBVEkxeP9/zSF9Asn8ZdXDlwwbGpR6lakS5tdI= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from chen-lnxbld23.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: rjangi@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6799E6110E; Mon, 26 Jun 2017 11:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1498478153; bh=im8vhrtPfJ47QTRHrh4f1SPiIqolGBWIcDuLUimsFHw=; h=From:To:Cc:Subject:Date:From; b=gFFINmznh+/6qhbJ7CrSq6Qpmr38Zgywo+s/Ui6Y5+bubDjqd939WdjumZVYamcrv wftzZOOSyBzUmHs+N7RS37m+UWCMNZiggFmaOE+31KcNa196aQYdgxvX2MgE27A2Gk ZoWBVEkxeP9/zSF9Asn8ZdXDlwwbGpR6lakS5tdI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6799E6110E Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=rjangir@codeaurora.org From: Ram Chandra Jangir To: lede-dev@lists.infradead.org Date: Mon, 26 Jun 2017 17:25:44 +0530 Message-Id: <1498478144-7365-1-git-send-email-rjangir@codeaurora.org> X-Mailer: git-send-email 2.7.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170626_045614_444443_3607343F X-CRM114-Status: UNSURE ( 8.28 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [198.145.29.96 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH] uboot-envtools: Add support for IPQ806x AP148 and DB149 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ram Chandra Jangir MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org IPQ806x AP148 and DB149 boards didn't have the UCI ubootenv section initialized, so the usage of fw_printenv required manual configuration. With this change, the "fw_printenv" and "fw_setenv" command will automatically work on NOR and NAND based platforms. Signed-off-by: Ram Chandra Jangir --- package/boot/uboot-envtools/files/ipq | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/package/boot/uboot-envtools/files/ipq b/package/boot/uboot-envtools/files/ipq index 16c7ba6..01ae220 100644 --- a/package/boot/uboot-envtools/files/ipq +++ b/package/boot/uboot-envtools/files/ipq @@ -13,7 +13,29 @@ touch /etc/config/ubootenv board=$(ipq806x_board_name) +default_uboot_env () { + UBOOTENV_PART=$(cat /proc/mtd | grep APPSBLENV) + mtd_dev=$(echo $UBOOTENV_PART | awk '{print $1}' | sed 's/:$//') + mtd_size=0x$(echo $UBOOTENV_PART | awk '{print $2}') + mtd_erase=0x$(echo $UBOOTENV_PART | awk '{print $3}') + nor_flash=`find /sys/bus/spi/devices/*/mtd -name ${mtd_dev}` + + if [ -n "$nor_flash" ]; then + uboot_env_size=$mtd_size + else + # size is fixed to 0x40000 in u-boot + uboot_env_size=0x40000 + fi + + sectors=$(( $uboot_env_size / $mtd_erase )) + echo /dev/$mtd_dev 0x0 $uboot_env_size $mtd_erase $sectors +} + case "$board" in +ap148 | db149) + env=$(default_uboot_env) + [ -n "${env}" ] && ubootenv_add_uci_config $env + ;; ea8500) ubootenv_add_uci_config "/dev/mtd10" "0x0" "0x20000" "0x20000" ;;