From patchwork Thu Mar 26 14:44:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 1262055 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=boundarydevices.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=boundarydevices-com.20150623.gappssmtp.com header.i=@boundarydevices-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=TNGLVJVL; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48p77B3dYhz9sSK for ; Fri, 27 Mar 2020 01:44:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 969D487313; Thu, 26 Mar 2020 14:44:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EWj-tGhFAz-0; Thu, 26 Mar 2020 14:44:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7151B8720F; Thu, 26 Mar 2020 14:44:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2C7851BF362 for ; Thu, 26 Mar 2020 14:44:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 267F420440 for ; Thu, 26 Mar 2020 14:44:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lTlHUSeStOk4 for ; Thu, 26 Mar 2020 14:44:45 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by silver.osuosl.org (Postfix) with ESMTPS id 06BFE203CE for ; Thu, 26 Mar 2020 14:44:45 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id m11so2227845wrx.10 for ; Thu, 26 Mar 2020 07:44:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EGNsqelJhds3eeOkdcMb1S0gadKZtbFbOUGDXqvHUFU=; b=TNGLVJVL5aNF1ZAv/OJFjQZgmnA/2ToYOE5q49Yod/G8QvcKgs3WmmwZrfQR84LJWq IBbPwwwZjd2p3aSKaABH/ZW4pvapWR0jUEqb4GyvU54p4h1B5EVXfJFEtGcOKOVqVP8S kVDyKLxs3ep4FA9hIWsH+1fZFDYHzIKx5jp/AJtQH3DDUTv2bGbnnHn1cHwXMbiD2hVS qe5gy5cbErQ92TAH7I3BYgTkkY3vtce7pzdGZzUl27tFr+urpbXmOENHj5zzXtYlLi3c VjpAbu/59XK9TS1vm/ysQ26JKYExrSeoWDTZhsLeTT3t8xJg7743D/2j5kBixS1Bk3e1 9UnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EGNsqelJhds3eeOkdcMb1S0gadKZtbFbOUGDXqvHUFU=; b=E2lYfy8cyGDFw3R2Qw3Cr6pC3mV6rZq7/4mOLPPpafnsEXGIixqgZ2RRslnwowwPJo vKjmxS+W0TfKgecSnNQkdXdotfLUdrMW5VPPom/+hJlaoR/DBlQ4Pc3C7lNtGws4dOw/ 0VWSbJhR3l+VYm95dCNd/WcgL3jh19TNcybHLS3l9XsMvRCtZ5PAgIVCznaC1nagm1Nk y+nMfgfeYELiHSqpJs2YfD6l0JfUDeB9cOabHZvcWuwc0o3cFShtJnAp0OlfKvykZg/U btC3GBnrNKyvUctcgU9CP/yOQu1H1pa7jUrdvIqzLEVbK+LuYF7QElPYeh5Ltf6TJePr TiLg== X-Gm-Message-State: ANhLgQ133cPwkilot2mUcT5ZCyXmgaIMIz/bdlSzSmzTy62LAFjmF0Or pcDwLTzKkf/fhyL5BcnOJfxYxEJqFAM= X-Google-Smtp-Source: ADFU+vsuh8VVAWIyKqOmfIyFc1Otysx11RjkGUhMa2TPmHKUZ5YzbVGDMjLvYc0rmlLzsoVUP0zWig== X-Received: by 2002:adf:bbcf:: with SMTP id z15mr10546502wrg.340.1585233883029; Thu, 26 Mar 2020 07:44:43 -0700 (PDT) Received: from p1g2.home (2a01cb000f89b400cc883edd44ec4519.ipv6.abo.wanadoo.fr. [2a01:cb00:f89:b400:cc88:3edd:44ec:4519]) by smtp.gmail.com with ESMTPSA id z21sm3802163wmf.28.2020.03.26.07.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 07:44:41 -0700 (PDT) From: Gary Bisson To: buildroot@buildroot.org Date: Thu, 26 Mar 2020 15:44:35 +0100 Message-Id: <20200326144436.529906-3-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200326144436.529906-1-gary.bisson@boundarydevices.com> References: <20200326144436.529906-1-gary.bisson@boundarydevices.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] board/boundarydevices: update boot scripts X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Add support for 8MMini and 8MNano - Upgrade script now resets by default Signed-off-by: Gary Bisson --- board/boundarydevices/common/boot.cmd | 24 +++++++++++++++--------- board/boundarydevices/common/upgrade.cmd | 20 +++++++++++++++----- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/board/boundarydevices/common/boot.cmd b/board/boundarydevices/common/boot.cmd index 760363da9b..dbc3b3c373 100644 --- a/board/boundarydevices/common/boot.cmd +++ b/board/boundarydevices/common/boot.cmd @@ -9,9 +9,9 @@ if itest.s x51 == "x${imx_cpu}" ; then a_base=0x90000000 elif itest.s x53 == "x${imx_cpu}"; then a_base=0x70000000 -elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then +elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then a_base=0x80000000 -elif itest.s x8MQ == "x${imx_cpu}"; then +elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}" || itest.s x8MNano == "x${imx_cpu}"; then a_base=0x40000000 kernelimage=Image bootcommand=booti @@ -43,10 +43,18 @@ if itest.s "x" == "x${fdt_file}" ; then fdt_file=imx6qp-${board}.dtb; elif itest.s x6SX == "x${imx_cpu}" ; then fdt_file=imx6sx-${board}${m4}.dtb; + elif itest.s x6ULL == "x${imx_cpu}" ; then + fdt_file=imx6ull-${board}.dtb; elif itest.s x7D == "x${imx_cpu}" ; then fdt_file=imx7d-${board}${m4}.dtb; elif itest.s x8MQ == "x${imx_cpu}" ; then fdt_file=imx8mq-${board}${m4}.dtb; + elif itest.s x8MM == "x${imx_cpu}" ; then + fdt_file=imx8mm-${board}${m4}.dtb; + elif itest.s x8MMQ == "x${imx_cpu}" ; then + fdt_file=imx8mm-${board}${m4}.dtb; + elif itest.s x8MNano == "x${imx_cpu}" ; then + fdt_file=imx8mn-${board}${m4}.dtb; elif itest.s x51 == "x${imx_cpu}" ; then fdt_file=imx51-${board}.dtb; elif itest.s x53 == "x${imx_cpu}" ; then @@ -63,7 +71,6 @@ fi if load ${devtype} ${devnum}:${distro_bootpart} ${a_script} uEnv.txt ; then env import -t ${a_script} ${filesize} fi - setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${imx_cpu} board=${board} if load ${devtype} ${devnum}:${distro_bootpart} ${a_fdt} ${prefix}${fdt_file} ; then @@ -74,21 +81,20 @@ else exit; fi -fdt resize +fdt resize 4096 +if itest.s "x" != "x${cmd_board}" ; then + run cmd_board +fi if itest.s "x" != "x${cmd_custom}" ; then run cmd_custom fi if itest.s "x" != "x${cmd_hdmi}" ; then run cmd_hdmi - if itest.s x == x${allow_noncea} ; then - setenv bootargs ${bootargs} mxc_hdmi.only_cea=1; - echo "only CEA modes allowed on HDMI port"; - else + if itest.s x != x${allow_noncea} ; then setenv bootargs ${bootargs} mxc_hdmi.only_cea=0; echo "non-CEA modes allowed on HDMI, audio may be affected"; fi fi - if itest.s "x" != "x${cmd_lcd}" ; then run cmd_lcd fi diff --git a/board/boundarydevices/common/upgrade.cmd b/board/boundarydevices/common/upgrade.cmd index 24b705eb76..ce32d77b5b 100644 --- a/board/boundarydevices/common/upgrade.cmd +++ b/board/boundarydevices/common/upgrade.cmd @@ -13,11 +13,14 @@ if itest.s x51 == "x${imx_cpu}"; then a_base=0x92000000 elif itest.s x53 == "x${imx_cpu}"; then a_base=0x72000000 -elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then +elif itest.s x6SX == "x${imx_cpu}" || itest.s x6ULL == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then a_base=0x82000000 -elif itest.s x8MQ == "x${imx_cpu}"; then +elif itest.s x8MQ == "x${imx_cpu}" || itest.s x8MM == "x${imx_cpu}" || itest.s x8MMQ == "x${imx_cpu}"; then a_base=0x42000000 offset=0x8400 +elif itest.s x8MNano == "x${imx_cpu}"; then + a_base=0x42000000 + offset=0x8000 fi qspi_match=1 @@ -56,6 +59,7 @@ mmc dev ${env_dev} ${env_part} mmc read ${a_uImage2} ${cntoffset} ${cntfile} if cmp.b ${a_uImage1} ${a_uImage2} ${filesize} ; then echo "------- U-Boot versions match" ; + echo "------- U-Boot upgrade NOT needed" ; exit ; fi @@ -134,7 +138,7 @@ fi if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then echo "------- U-Boot versions match" ; if itest.s "${qspi_match}" == "1" ; then - echo "------- upgrade not needed" ; + echo "------- U-Boot upgrade NOT needed" ; if itest.s "x" != "x${next}" ; then if ${fs}load ${devtype} ${devnum}:${distro_bootpart} ${a_script} ${next} ; then source ${a_script} @@ -206,6 +210,12 @@ if itest.s "x" != "x${next}" ; then fi fi -while echo "---- U-Boot upgraded. Please reset the board" ; do - sleep 120 +if itest.s "xno" == "x${reset}" ; then + while echo "---- U-Boot upgraded. Please reset the board" ; do + sleep 120 + done +fi +echo "---- U-Boot upgraded. The board will now reset." +sleep 1 +reset done