From patchwork Sun May 2 14:32:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZHIZHIKIN Andrey X-Patchwork-Id: 1472785 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.a=rsa-sha256 header.s=selector1 header.b=CJ2l34zM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FY7rn0lxKz9sCD for ; Mon, 3 May 2021 00:33:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5BDD81CD1; Sun, 2 May 2021 16:33:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=leica-geosystems.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=leica-geosystems.com header.i=@leica-geosystems.com header.b="CJ2l34zM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1666F81FB2; Sun, 2 May 2021 16:33:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on072c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::72c]) (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 1620880FBD for ; Sun, 2 May 2021 16:33:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=leica-geosystems.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=andrey.zhizhikin@leica-geosystems.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aF+XJ1QnoL4bxceNbwGAdVx9oF7qFEgTAy0y+MD+rC3r9yCOyPxMyZAm26HZ3ggJ+UsLbZ+53e7XHwQPW2mNYCB+tGgp8QE6G8oaqPAbG4ZQlqXH+x23LALY55IHmaFHIX31gPlecfe37JS1tPxqc5eJwNeLLFeBasFRt1chfMNqveqOFavdRruN4kFEO5OrzQmCsLpdzM2vQrXb2NesJiPjAynJJTAwLPiG8Z/TfK3YPL/VUq4wZ1rX161CGDRrdMP5aY9eYqYqFpy41WBvQW6vusTMCy1Qo0EMfxpQSLxF760HmAZQs4n6BhGn1etu0i4f4Fwh1zNb8guxoDsEhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JvJc+/UiMi/0p2p6ngufCMacTNYHqUMokeFqI6RnLdg=; b=PbtYLll/DmDlaIgSJDKtCDZ+UEur9GZGNCbgx7WXwTQTM90qxET4hZudyGgpvS4XYVSEUliOMFUjiRCADFAYZzy/bPAjAZ5d+AEQ8wcglPdFixAC9HKqixO5AU+35Je0Wq5oiD+S7Oi9WgY05XIJ2AzA0nuux8d2nZnBiESCEoibncC6AtZo8nRJqXaAPv1i7pneeocPtK7l2expmf5VTPpVNrsRFvZ/Fc3y0e45g2OLUPpRPAxKZXg5oGbyV6HXzNXL2s9a0s98LcS/DvDYMWB1TmLie7MAG3znlDxz8dQpWJRtUWOkzjKXMelHIP+EZTlCbEzb5MZ5sjahaQ3uAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=leica-geosystems.com; dmarc=pass action=none header.from=leica-geosystems.com; dkim=pass header.d=leica-geosystems.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leica-geosystems.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JvJc+/UiMi/0p2p6ngufCMacTNYHqUMokeFqI6RnLdg=; b=CJ2l34zMOUcBY+ORoXJP8KHyB+BJoje1H4nM2Ku5GBasAQddggjlVHhj/azN/zYyPtGhfawESWiDYd3zQ4PBFJxnNHE8eREZN6OL0JS73aHWnW9DdbqNugRxGY4uQaGg32fIgNpNGmmVvPu41J6FDvx4KAusyVQGA+8ZWC68/nM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=leica-geosystems.com; Received: from AM6PR0602MB3736.eurprd06.prod.outlook.com (2603:10a6:209:25::28) by AM6PR06MB4737.eurprd06.prod.outlook.com (2603:10a6:20b:5b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.38; Sun, 2 May 2021 14:33:24 +0000 Received: from AM6PR0602MB3736.eurprd06.prod.outlook.com ([fe80::acf8:3328:58c2:68c5]) by AM6PR0602MB3736.eurprd06.prod.outlook.com ([fe80::acf8:3328:58c2:68c5%4]) with mapi id 15.20.4065.037; Sun, 2 May 2021 14:33:23 +0000 From: Andrey Zhizhikin To: u-boot@lists.denx.de Cc: festevam@gmail.com, peng.fan@nxp.com, Andrey Zhizhikin Subject: [PATCH v2] imx8mn: configs: add support for distro boot commands Date: Sun, 2 May 2021 16:32:37 +0200 Message-Id: <20210502143236.25796-1-andrey.zhizhikin@leica-geosystems.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210501202306.5254-4-andrey.zhizhikin@leica-geosystems.com> References: <20210501202306.5254-4-andrey.zhizhikin@leica-geosystems.com> X-Originating-IP: [146.185.2.7] X-ClientProxiedBy: ZR0P278CA0058.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::9) To AM6PR0602MB3736.eurprd06.prod.outlook.com (2603:10a6:209:25::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from GEO-HfyyrYQLnZo.lgs-net.com (146.185.2.7) by ZR0P278CA0058.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.25 via Frontend Transport; Sun, 2 May 2021 14:33:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 890f54ce-60b2-4574-90d1-08d90d773caa X-MS-TrafficTypeDiagnostic: AM6PR06MB4737: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ycdnJBGiGRPloNt1brENHVPGxmYpFFFm4tNiEA4hnruI3nplWzEsMYmE9RNzO8pP6WOuYJsFX8HaGsOJBYQcWIf9kJ+D8ixZP2fDdVUaw0IJp+r0P4WJSHVO9Ve7WXo4o9ZoriLTPz+ORt2psveBu4owXbxpJ8iuDGGkBKdiIRx5kFWCDyd9NVHFCGZsQU+7fHFpUBN15Vd6wx11+mXy1Hp497riPgenMuaYk3rwEcC/Z2vkOYmHaKG66glbzI5ZTScKPCX2hRGZWtAO4xaPislQAMdv+u3XuNPJ6djOGCQp2ciK2Xbr8hxx2fkX7qSWlMpeVb/XKIToe8K/TPX5U3U+vY/mBQSBsifcpaJspZiyY0NiYrja5Zk7xmJjm/OXzUP04yMEXJcfDjM2rDk/lOfG8pJuLl4bUAMYgVGvq9IJqD6rYd+sI33R9X5iDt48XybxtomE4WzhWTCEvQQYAE4KIq4JzjQhL9RpABOgh40uSUg3k4GXUMci/ULBTtR+Nr1Py/oZbf0Yj6f43RoQBil7hIdIDGzAj97OozgMxfFvY0mks/v4FF4C0EFq67Nsn5F1c0D1zUd4Iy6giU9Vce/yjLnWWvzgrfOruCZ4GfCA102MZ8aZEX+Srqh/hjYfOm3an/OJop39Spui9ULezNlpg2UUBFCTQGo0z5TIOOT3/JFkJzIUtQn+UMYBQz9VTdk5ancCeeeSEPgRc87r2w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR0602MB3736.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(376002)(346002)(39860400002)(136003)(4326008)(38350700002)(38100700002)(2906002)(66556008)(6486002)(36756003)(66946007)(956004)(44832011)(2616005)(6506007)(52116002)(26005)(66476007)(316002)(8936002)(107886003)(1076003)(186003)(6512007)(83380400001)(6916009)(8676002)(86362001)(6666004)(5660300002)(478600001)(16526019)(32563001)(139555002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: sfwdLn/mk9pyAfuREBRwdV0Zq4Zv68sPC2FtaS5OFJfxsAQx2TOnqGyw9lXlTmC8DeU0u1OSxnnj9noxROr0iUufoH31uPF8VHDq85GhCyt4XxlQErlvdGfhOjjUu+krXVOU6uCYG1Nz94KSUZtZ8PL767qk3UlYYxQYhvGo1m/Iua1TG0JXFYQ/Ntvd4ZurO6XEUYdy/zlsiRe+Sc4ZJDjSdQuwHB6GLEF4QjBlcAK7pQBK+HNWEGdALbRr1Fr6gJS51j0/8mhp1p2wP6xEReXTCHQqRf3q+fB8oLflx3rT1nzMEeBy7q1o6/OADQg9D0gf9VMkUXRnQin4S11R8OvWso6NqpLgGuBFJG7QcgK+Km6ne4OZt9gQdYNlmYlZjfGqekxa+uNkmWB/IMK4J/QjXihTBTN4CKQ4Z5bw4bi51BCeAPArUgl7YAauU9K45vTC+FGBvmjtGZYJ24p0JXRCXVG9MIOql0BXCe/5sOn1Fkk6xliezQqmvUz9OqvHywTEiQpYG9TpDUpj6Wn8N5VRqogiNHLHuGOe4KcL2h7LncLAJiF3iMUN9HNOU3B0zA/Gu6uva4kY5lOUPB6rzwztrIsoq02XxbQLZAAvgtCa0R/x0iQX/Uco/+EUbCEKbE6Y4CaMCBwlt4bPKdt+2RYh7Z9c5KpofgMqYCA1+Q5PCJewTOKNyavcQK5Rp/tOuSqCGjZ29vgvKRlMZcOh47sLibzinjpTwVysFy8sdhfOWJWzRzvLp9wP6LUxhfKt5gfk9nqEM3PC8kPXT2C3udQTkbMsBtrYxdBJWPfG5bR0ODtQJPHTtY94iVnJH+9ER2Aj32sYTBfqp27oo80rfnEmdn4hfsiZdGzD6wkGv7L2c4ZLTgU0BCcgvvF3LotZJXD1HLTNR0UpezcJ21QJ9xjgDb7YVQxnYsdpA0QowpSLBjL8s2cRZX3AK4nUbezjvI1yJasXAwqkDOPauy2BEX9/BoQPFCXe1/Oyra0yDK/PbQ98r8OH5HZSr/9pJYsRUOGXO/XQZ7YMAGYQIhtJjdQjq7F0u8fRTeqJbQKNMzqQF8Qeba8pqLi6rhYFixyPx/kEjiBJi5j3RMdrH6T7n6kuF3ylOw5IEhWPoxRdfMS7mlXOOc9KGJE+KgGgK/SEyOg+CsUpzTEA8hSKAkd/sS6efpde5GkQpeGrJdZIKEvQxuCts9qPZC8YzRuX6i8CyaeBouzSAGCGrKun6WMB9rDXEKwgtlQHS7/vaLvkMTpPKqvSsuCi7pMfeGzY5Ik2G2FiuHLpYADghzBYtkJdQ7ZCZsBpNQLsZUFhOZfQlta0yNnrZholDs50qk1uCDqX X-OriginatorOrg: leica-geosystems.com X-MS-Exchange-CrossTenant-Network-Message-Id: 890f54ce-60b2-4574-90d1-08d90d773caa X-MS-Exchange-CrossTenant-AuthSource: AM6PR0602MB3736.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2021 14:33:23.5597 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 1b16ab3e-b8f6-4fe3-9f3e-2db7fe549f6a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kqCbZ+yF+6VGB/2QDGnESAGh9eFlEkd2UdaT+IAjg1kJBSWxCn6RoXPrw/T8BbnlOT5pjJZU2isaM+gWt5XGKDpp2z7iH9S524cq5+ITNJA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR06MB4737 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean Supported boot device types in iMX8MN: MMC, DHCP. Add DISTRO_DEFAULTS config option and include the distro boot command header file to enable full support of distro boot on i.MX8M Nano EVK (both DDR and LPDDR derivatives). Drop previous environment, which was targeting customized boot commands and boot order. Signed-off-by: Andrey Zhizhikin Cc: Peng Fan Reviewed-by: Fabio Estevam --- Changes in v2: - Correct fdt parameters: "fdt_file" -> "fdtfile", "fdt_addr" -> "fdt_addr_r" - Set "kernel_addr_r" and "scriptaddr" from config configs/imx8mn_ddr4_evk_defconfig | 1 + configs/imx8mn_evk_defconfig | 1 + include/configs/imx8mn_evk.h | 68 +++++++------------------------ 3 files changed, 16 insertions(+), 54 deletions(-) diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index b10cd13fc3..1686e1a851 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -19,6 +19,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DEFAULT_DEVICE_TREE="imx8mn-ddr4-evk" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index d0e5b58902..14db624e29 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -22,6 +22,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_DEFAULT_DEVICE_TREE="imx8mn-evk" +CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 596e255ca6..985bec803a 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -31,69 +31,29 @@ #endif +#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ + func(DHCP, dhcp, na) + +#include +#endif + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ "image=Image\0" \ + BOOTENV \ + "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "console=ttymxc1,115200\0" \ - "fdt_addr=0x43000000\0" \ + "fdt_addr_r=0x43000000\0" \ "boot_fit=no\0" \ - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "initrd_addr=0x43800000\0" \ "bootm_size=0x10000000\0" \ - "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ - "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \ - "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fit} = yes || test ${boot_fit} = try; then " \ - "bootm ${loadaddr}; " \ - "else " \ - "if run loadfdt; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi;\0" \ - "netargs=setenv bootargs console=${console} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ - "run netargs; " \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "${get_cmd} ${loadaddr} ${image}; " \ - "if test ${boot_fit} = yes || test ${boot_fit} = try; then " \ - "bootm ${loadaddr}; " \ - "else " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi;\0" - -#define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loadimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "fi; " \ - "fi;" /* Link Definitions */ #define CONFIG_LOADADDR 0x40480000