From patchwork Tue Jul 16 07:42:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1132488 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="qkfVgqnq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45nswb1K09z9sNf for ; Tue, 16 Jul 2019 17:49:02 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2A7AEC21E18; Tue, 16 Jul 2019 07:46:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9BCCEC21DF3; Tue, 16 Jul 2019 07:46:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7B491C21E34; Tue, 16 Jul 2019 07:43:39 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 051DFC21DDC for ; Tue, 16 Jul 2019 07:43:36 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id 207so17581034wma.1 for ; Tue, 16 Jul 2019 00:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cXG2MvzLT2zoCFFeeXWkAeEnGn/GW0m4kKzN7UGuubk=; b=qkfVgqnq/eDB0i6vOE3GN+lKLdGssr+jNr9zD4txGNUqqjNZgdaOKTFWX4lBqsGKqc cbjiprCTKDmsh6+faOygSh3RucIJkyKDu4KUw+zYozjXpQXc8z7kcIAS059QL2Ur4T92 E4UoXe60Zz9oTlRtfc46WCYM03mEtxTiSfL0gPuaAXKWyfrNI0JFtHH0iKATBf77Ftwq 0xsA/yUwfq67ciY33qHdokTiFV1kj4esvhVxkU/lM5huPMb9wvpEil4Aqdsb4v4puLav 7tJnal+HyFvhjVDXXkOukgLMHqozia9mkOogjIwZMltLeIPcmkND8eFRAJ05HZtUbgjj pDOg== 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; bh=cXG2MvzLT2zoCFFeeXWkAeEnGn/GW0m4kKzN7UGuubk=; b=S4x7b0F1gBmnlpp1LLhYDn1atG1y22KpMY5HfIJVtoErz+YEMmn/PNVHemKQbLzxSp 6iuH5XxScUs8R/Ik/7Xwyx+4Kiaurojb8k7zhxhxzIWy7hDmfZG0bs/mENTXryUWj9vU ck0HD8lh57hqK2J3z5LUW0NJ2aqEhHTKw+53gSyynxkqRPh0gm/5Vj+splUebVgIibhj vqaF48xm7QX8zdw91dMZGhE2mvv2/oTSVQidGQdMr8GBdBXPyq2UQmBS3MQ8KKVjd5VD t7wH9+f82q71Lhr9LPGCE8Ocxu8Q/Q/uatAyGbf8+vPVy1bjSplS5MXBA7R7huUYerDC MHBQ== X-Gm-Message-State: APjAAAWmwvtUblTUXmBGNBq98a0ejFuH7nqvJf38GOHGR3+2rt9RXGzg Hr8Fb5trpOWzhUdhpCAkqY5lXA== X-Google-Smtp-Source: APXvYqz2ZCLrEPhH7oIlygcO6F9x/IkbyURyymNrgUZRCjCqYNvIE9wEPtXjIf26jnWsLxO9ugiCXQ== X-Received: by 2002:a1c:c1c1:: with SMTP id r184mr28688170wmf.9.1563263015669; Tue, 16 Jul 2019 00:43:35 -0700 (PDT) Received: from localhost.localdomain (li1816-253.members.linode.com. [172.104.240.253]) by smtp.gmail.com with ESMTPSA id x83sm19349251wmb.42.2019.07.16.00.43.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Jul 2019 00:43:35 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Tue, 16 Jul 2019 15:42:57 +0800 Message-Id: <1563262978-6855-3-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563262978-6855-1-git-send-email-jun.nie@linaro.org> References: <1563262978-6855-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH 2/3] pico-imx7d: Support distro boot for FIT image case X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Support distro boot for pico imx7d in FIT image case. Signed-off-by: Jun Nie Tested-by: Joris Offouga --- include/configs/pico-imx7d.h | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 9101540..7b2bd00 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -55,17 +55,17 @@ /* When booting with FIT specify the node entry containing boot.scr */ #if defined(CONFIG_FIT) #define PICO_BOOT_ENV \ - "bootscr_fitimage_name=bootscr\0" \ - "bootscriptaddr=0x83200000\0" \ - "fdtovaddr=0x83100000\0" \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ - "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "rootwait rw;\0" \ - "loadbootscript=" \ - "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source ${bootscriptaddr}:${bootscr_fitimage_name}\0" + BOOTENV \ + "fdtovaddr=0x83100000\0" \ + "scriptaddr=0x83200000\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "rootwait rw\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "iminfo ${scriptaddr};" \ + "if test $? -eq 1; then hab_failsafe; fi;" \ + "source ${scriptaddr}:bootscr\0" #else #define PICO_BOOT_ENV \ "bootmenu_0=Boot using PICO-Hobbit baseboard=" \ @@ -107,21 +107,6 @@ "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \ PICO_BOOT_ENV -#if defined(CONFIG_FIT) -#define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev};" \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "iminfo ${bootscriptaddr};" \ - "if test $? -eq 1; then hab_failsafe; fi;" \ - "run bootscript; " \ - "else " \ - "echo Fail to load fitImage with boot script;" \ - "hab_failsafe;" \ - "fi; " \ - "fi" -#endif - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \