From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D54C1C43334 for ; Thu, 23 Jun 2022 13:43:56 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2211E842E0; Thu, 23 Jun 2022 15:43:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="s4niLIZD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2428484314; Thu, 23 Jun 2022 15:43:53 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2B4C3842DC for ; Thu, 23 Jun 2022 15:43:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id AC3CBB81BF7; Thu, 23 Jun 2022 13:43:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CB13C3411B; Thu, 23 Jun 2022 13:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655991828; bh=zoWgvkeJXU9eCkC7eJcga5dEV8mxFS3iwdYIUmYOIWk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=s4niLIZDPwuwxXChcOO5pMXnhuxJNaOeNw64qOBSCJFkmnWVMugOvzPTegQ66j9h3 6HZdQBMRRI7fhl1XIOr6n32Un+KvGY1Wx6mzhmZNK/nfB+UYi5qAkP+/+naHwJsiJj eu4wJKLcKIVMEili6aYU8Cj68/TBY5EjoG7/v7/zkXqbfSAgIacy6sJy8ShhJ4oAYZ CNpYaso1zxNAAe+I0Q3YCO0YRmd9Wn7FwIKSPNQ0/fpE65u7+4t/YbOt7wxvlZG04a piMOiuPDH2DDq6XrYI9yNiZFdQi0mjoyzWnACJGMWiDzbR80fBik/h+wJKW0Ae4YKv 4c4kbOKpzaSEg== Received: by pali.im (Postfix) id 59AA279F; Thu, 23 Jun 2022 15:43:45 +0200 (CEST) Date: Thu, 23 Jun 2022 15:43:45 +0200 From: Pali =?utf-8?B?Um9ow6Fy?= To: "Peng Fan (OSS)" Cc: Priyanka Jain , Qiang Zhao , Shengzhou Liu , Sinan Akman , u-boot@lists.denx.de Subject: Re: [PATCH v2] board: freescale: p1_p2_rdb_pc: Add env commands norlowerboot, norupperboot, sd2boot and defboot Message-ID: <20220623134345.i4ub2lm3uqlftyxt@pali> References: <20220407101624.15850-12-pali@kernel.org> <20220425145043.9945-1-pali@kernel.org> <62f6b1ab-7da2-766f-676f-40698af49fbb@oss.nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <62f6b1ab-7da2-766f-676f-40698af49fbb@oss.nxp.com> User-Agent: NeoMutt/20180716 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean On Thursday 16 June 2022 17:01:50 Peng Fan (OSS) wrote: > 在 2022/4/25 22:50, Pali Rohár 写道: > > All *boot env commands overrides default boot source location via i2c. > > After board reset without power off, BootROM then starts booting U-Boot > > from this specified location instead of the default one. > > > > Add new env command defboot which reverts boot location to the default > > value, which in most cases is configurable by HW DIP switches. > > > > And add new env commands norlowerboot, norupperboot, sd2boot to boot from > > other locations. norlowerboot would instruct BootROM to boot from lower NOR > > bank, norupperboot from upper NOR bank and sd2boot from SD card with > > alternative configuration. > > > > Signed-off-by: Pali Rohár > > Not able to apply this patch. And what is the reason? It applies cleanly on top of next branch, which is today at commit 9121478ee6f2aee381f8fe49d8997d43527d351a. See my steps and output: $ git clone https://source.denx.de/u-boot/u-boot.git -b next Cloning into 'u-boot'... remote: Enumerating objects: 861911, done. remote: Counting objects: 100% (15749/15749), done. remote: Compressing objects: 100% (3457/3457), done. remote: Total 861911 (delta 12303), reused 15650 (delta 12234), pack-reused 846162 Receiving objects: 100% (861911/861911), 171.30 MiB | 38.97 MiB/s, done. Resolving deltas: 100% (721111/721111), done. $ cd u-boot $ wget https://patchwork.ozlabs.org/project/uboot/patch/20220425145043.9945-1-pali@kernel.org/mbox/ -O patch --2022-06-23 15:39:52-- https://patchwork.ozlabs.org/project/uboot/patch/20220425145043.9945-1-pali@kernel.org/mbox/ Resolving patchwork.ozlabs.org (patchwork.ozlabs.org)... 2401:3900:2:1::2, 203.11.71.1 Connecting to patchwork.ozlabs.org (patchwork.ozlabs.org)|2401:3900:2:1::2|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 8916 (8.7K) [text/plain] Saving to: 'patch' patch 100%[===============================>] 8.71K --.-KB/s in 0s 2022-06-23 15:39:53 (57.2 MB/s) - 'patch' saved [8916/8916] $ git am patch Applying: board: freescale: p1_p2_rdb_pc: Add env commands norlowerboot, norupperboot, sd2boot and defboot $ git log --oneline | head -4 b94d5df9eb49 board: freescale: p1_p2_rdb_pc: Add env commands norlowerboot, norupperboot, sd2boot and defboot 9121478ee6f2 Merge branch '2022-06-22-platform-updates-and-additions' into next 929e581a620f corstone1000: Convert to text file environment 781a144a7a7e gxp: Convert to text file environment > Please new version. > > Thanks, > Peng. > > --- > > Changes in v2: > > * Fix commit message > > * Adapt code to use p1_p2_bootsrc.h > > --- > > include/configs/p1_p2_bootsrc.h | 20 ++++++++++++++++++++ > > include/configs/p1_p2_rdb_pc.h | 13 +++++++++++++ > > 2 files changed, 33 insertions(+) > > > > diff --git a/include/configs/p1_p2_bootsrc.h b/include/configs/p1_p2_bootsrc.h > > index a274c57786f5..60741ef544c0 100644 > > --- a/include/configs/p1_p2_bootsrc.h > > +++ b/include/configs/p1_p2_bootsrc.h > > @@ -30,6 +30,18 @@ > > #define RST_NOR_CMD(var, ...) "" > > #endif > > +#ifdef __SW_BOOT_NOR_BANK_LO > > +#define RST_NOR_LO_CMD(var, ...) __VAR_CMD_RST(var, __VA_ARGS__ __BOOTSRC_CMD(__SW_BOOT_NOR_BANK_LO, __SW_BOOT_MASK)) > > +#else > > +#define RST_NOR_LO_CMD(var, ...) "" > > +#endif > > + > > +#ifdef __SW_BOOT_NOR_BANK_UP > > +#define RST_NOR_UP_CMD(var, ...) __VAR_CMD_RST(var, __VA_ARGS__ __BOOTSRC_CMD(__SW_BOOT_NOR_BANK_UP, __SW_BOOT_MASK)) > > +#else > > +#define RST_NOR_UP_CMD(var, ...) "" > > +#endif > > + > > #ifdef __SW_BOOT_SPI > > #define RST_SPI_CMD(var, ...) __VAR_CMD_RST(var, __VA_ARGS__ __BOOTSRC_CMD(__SW_BOOT_SPI, __SW_BOOT_MASK)) > > #else > > @@ -42,6 +54,12 @@ > > #define RST_SD_CMD(var, ...) "" > > #endif > > +#ifdef __SW_BOOT_SD2 > > +#define RST_SD2_CMD(var, ...) __VAR_CMD_RST(var, __VA_ARGS__ __BOOTSRC_CMD(__SW_BOOT_SD2, __SW_BOOT_MASK)) > > +#else > > +#define RST_SD2_CMD(var, ...) "" > > +#endif > > + > > #ifdef __SW_BOOT_NAND > > #define RST_NAND_CMD(var, ...) __VAR_CMD_RST(var, __VA_ARGS__ __BOOTSRC_CMD(__SW_BOOT_NAND, __SW_BOOT_MASK)) > > #else > > @@ -53,3 +71,5 @@ > > #else > > #define RST_PCIE_CMD(var, ...) "" > > #endif > > + > > +#define RST_DEF_CMD(var, ...) __VAR_CMD_RST(var, __VA_ARGS__ __BOOTSRC_CMD(0x00, 0xff)) > > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > > index 47bd20eeeafb..50ce2d9aaed4 100644 > > --- a/include/configs/p1_p2_rdb_pc.h > > +++ b/include/configs/p1_p2_rdb_pc.h > > @@ -25,6 +25,9 @@ > > #define __SW_NOR_BANK_MASK 0xfd > > #define __SW_NOR_BANK_UP 0x00 > > #define __SW_NOR_BANK_LO 0x02 > > +#define __SW_BOOT_NOR_BANK_UP 0x5c /* (__SW_BOOT_NOR | __SW_NOR_BANK_UP) */ > > +#define __SW_BOOT_NOR_BANK_LO 0x5e /* (__SW_BOOT_NOR | __SW_NOR_BANK_LO) */ > > +#define __SW_BOOT_NOR_BANK_MASK 0x01 /* (__SW_BOOT_MASK & __SW_NOR_BANK_MASK) */ > > #define CONFIG_SYS_L2_SIZE (256 << 10) > > #endif > > @@ -54,6 +57,9 @@ > > #define __SW_NOR_BANK_MASK 0xfd > > #define __SW_NOR_BANK_UP 0x00 > > #define __SW_NOR_BANK_LO 0x02 > > +#define __SW_BOOT_NOR_BANK_UP 0x64 /* (__SW_BOOT_NOR | __SW_NOR_BANK_UP) */ > > +#define __SW_BOOT_NOR_BANK_LO 0x66 /* (__SW_BOOT_NOR | __SW_NOR_BANK_LO) */ > > +#define __SW_BOOT_NOR_BANK_MASK 0x01 /* (__SW_BOOT_MASK & __SW_NOR_BANK_MASK) */ > > #define CONFIG_SYS_L2_SIZE (256 << 10) > > /* > > * Dynamic MTD Partition support with mtdparts > > @@ -73,6 +79,9 @@ > > #define __SW_NOR_BANK_MASK 0xfd > > #define __SW_NOR_BANK_UP 0x00 > > #define __SW_NOR_BANK_LO 0x02 > > +#define __SW_BOOT_NOR_BANK_UP 0xc8 /* (__SW_BOOT_NOR | __SW_NOR_BANK_UP) */ > > +#define __SW_BOOT_NOR_BANK_LO 0xca /* (__SW_BOOT_NOR | __SW_NOR_BANK_LO) */ > > +#define __SW_BOOT_NOR_BANK_MASK 0x01 /* (__SW_BOOT_MASK & __SW_NOR_BANK_MASK) */ > > #define CONFIG_SYS_L2_SIZE (512 << 10) > > /* > > * Dynamic MTD Partition support with mtdparts > > @@ -605,10 +614,14 @@ __VSCFW_ADDR \ > > MAP_NOR_LO_CMD(map_lowernorbank) \ > > MAP_NOR_UP_CMD(map_uppernorbank) \ > > RST_NOR_CMD(norboot) \ > > +RST_NOR_LO_CMD(norlowerboot) \ > > +RST_NOR_UP_CMD(norupperboot) \ > > RST_SPI_CMD(spiboot) \ > > RST_SD_CMD(sdboot) \ > > +RST_SD2_CMD(sd2boot) \ > > RST_NAND_CMD(nandboot) \ > > RST_PCIE_CMD(pciboot) \ > > +RST_DEF_CMD(defboot) \ > > "" > > #define CONFIG_USB_FAT_BOOT \ >