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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77573C433EF for ; Sat, 9 Oct 2021 20:43:43 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 00D5060E0B for ; Sat, 9 Oct 2021 20:43:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 00D5060E0B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A68AC836CF; Sat, 9 Oct 2021 22:42:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 9C14883692; Sat, 9 Oct 2021 22:42:12 +0200 (CEST) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2624E83699 for ; Sat, 9 Oct 2021 22:41:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from localhost.localdomain ([198.134.98.50]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MF3cC-1mX31Z3llo-00FR1b; Sat, 09 Oct 2021 22:41:34 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Frieder Schrempf , Fabio Estevam , Stefano Babic , Oleksandr Suvorov , Marcel Ziswiler , Marek Vasut , Oleksandr Andrushchenko , Patrick Delaunay , Rick Chen , Tero Kristo , Wolfgang Denk Subject: [PATCH v6 09/11] include/configs: apalis-imx8/verdin-imx8mm: rename kernel image variable Date: Sat, 9 Oct 2021 22:41:11 +0200 Message-Id: <20211009204113.1208641-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211009204113.1208641-1-marcel@ziswiler.com> References: <20211009204113.1208641-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:CMn+DkY6Chn7wyK3AXWaWa4cHHObpouKKEEWYAQQcyYVpmtS8YA RJmh6EC4k0keUWxAv28kPACTRL22f021qBKKvwx/BvP1S8OPMTSRCYf1d9MVstuqENV9amm FcBzNWY6LVMruSV2RjdOYryv/fIutwcjXrCFpP43iS/l/9zuNle2TZdhMLs5m3i4XLg+36R uYjSO7AviGRGFNW2EFqbA== X-UI-Out-Filterresults: notjunk:1;V03:K0:acaQjR/sgLI=:9yafEHlNVnzajMF0qhacoN vUkAxckIHLWWLr/Lec1Z6gwI95NIOZdZv9yCKa/BfNA92oKWtPqfthX4KH3VK8qLF6+72HW7Q cBwprKUsVSRTlIpNxBLS2MzLkG90JMtkFhGzuYjWZbW9UCwzcRZ22on4d+fKy8LO1akomabqm AtlBhQaUl1HY0FxroCAZb0aK6mbB1wpmbM0K2Kp0EN1SBpFPzM/vlCduwhZ2zd3+ZF6xfPkN7 CGeQABvpugkj2hVAUmBYkfLWeV4axQWH/qWi5x5Lv3Ny105cHdxU792eigqMaKMVbWxsbSmt2 k0kaMAgwgOkFxNYK5XDCajC+Oc4+SYPdstUQ1/0QmPPR876l4Idtr5/nxvFHwCCwYaNH4SMwH vDABNNstSYCsdpCAX+t08X/qcW3fZw08WUY4JuvTJQHf5e4RqhhgSVYYCxIorXqL2lo0m6Jmd YEMvUU4mJr5MmMpEq7HQ5nEg7xpGwXtd2flb7oldA4NMOntCB+zFA/ykwr3jdlNLWLhr129Db 4E1bzW9qMtY8z6qM/K/D44nqzJ8/udo0uhjlRLc92UnhHc6+U9Jqc9vGnSxxdeA74/sEXp2Ta b2lixqnlilS8YU7o3oskKDDuDt5Hxj/vMmJVkq9dG1FI5ztuOO+0utItCxua9TTvBzDEJ3Mrr U52ICBBu0Dlj3o8hdFqrybqxA9CuVWPF9PnbuLje1frnznEAjQeVy6vRMxuZar67CRn72gPdU Kg4qAHz6cQUjvLaC8wKbQM1WpDJ9Jh0PRUzM0g== 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.103.2 at phobos.denx.de X-Virus-Status: Clean From: Oleksandr Suvorov Variable "kernel_image" is used in boot.scr script only, that sets its own default value to the constant string @@KERNEL_IMAGETYPE@@ in case "kernel_image" is not set. The default name of the kernel image shipped with BSP 5.x is "Image.gz". Setting kernel_image="Image" as a pre-defined u-boot variable breaks booting systems with modern versions of boot.scr, whereas renaming it fixes booting with modern scripts and does not break working of earlier versions of boot.scr. While at it also update the copyright period, rather than hard-coding fdtfile default fdt_board to dev for the Verdin iMX8M Mini and fix its closing #endif comment. Signed-off-by: Oleksandr Suvorov Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- Changes in v6: - Update commit message as requested by Wolfgang. Changes in v3: - Fix patch. - Add missing apalis-imx8 part. - While at it update copyright year resp. period. - Fix closing endif comment. Changes in v2: - New patch allows booting recent embedded Linux BSPs. include/configs/apalis-imx8.h | 6 +++--- include/configs/verdin-imx8mm.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 80594548877..ce5681499c9 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2019 Toradex + * Copyright 2019-2021 Toradex */ #ifndef __APALIS_IMX8_H @@ -42,12 +42,12 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ + "boot_file=Image\0" \ "console=ttyLP1 earlycon\0" \ "fdt_addr=0x83000000\0" \ "fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \ "fdtfile=fsl-imx8qm-apalis-eval.dtb\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ - "image=Image\0" \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffffffffffff\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ @@ -57,7 +57,7 @@ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \ "\0" \ - "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \ + "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; tftp ${fdt_addr} " \ "apalis-imx8/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" \ "panel=NULL\0" \ "script=boot.scr\0" \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 50c808383db..693fd6907eb 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2020 Toradex + * Copyright 2020-2021 Toradex */ #ifndef __VERDIN_IMX8MM_H @@ -54,16 +54,16 @@ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=fastboot 0\0" \ + "boot_file=Image\0" \ "console=ttymxc0\0" \ "fdt_addr=0x43000000\0" \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_board=dev\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "kernel_image=Image\0" \ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \ "\0" \ - "nfsboot=run netargs; dhcp ${loadaddr} ${kernel_image}; " \ + "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; " \ "tftp ${fdt_addr} verdin/${fdtfile}; " \ "booti ${loadaddr} - ${fdt_addr}\0" \ "setup=setenv setupargs console=${console},${baudrate} " \ @@ -118,4 +118,4 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#endif /*_VERDIN_IMX8MM_H */ +#endif /* __VERDIN_IMX8MM_H */ -- 2.26.2