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 8DCB6C433F5 for ; Fri, 8 Oct 2021 00:30:46 +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 1094E610C7 for ; Fri, 8 Oct 2021 00:30:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1094E610C7 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 50A248357F; Fri, 8 Oct 2021 02:29:56 +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 862C183374; Fri, 8 Oct 2021 02:29:15 +0200 (CEST) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) (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 AB22283362 for ; Fri, 8 Oct 2021 02:28:49 +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 toolbox.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MhjbJ-1mBs6F1Q3v-00Muyl; Fri, 08 Oct 2021 02:28:32 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Stefano Babic , Heiko Thiery , Frieder Schrempf , Oleksandr Suvorov , Marcel Ziswiler , Marek Vasut , Oleksandr Andrushchenko , Patrick Delaunay , Rick Chen , Tero Kristo , Wolfgang Denk Subject: [PATCH v5 08/10] include/configs: apalis-imx8/verdin-imx8mm: rename kernel image variable Date: Fri, 8 Oct 2021 02:28:13 +0200 Message-Id: <20211008002815.870313-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211008002815.870313-1-marcel@ziswiler.com> References: <20211008002815.870313-1-marcel@ziswiler.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:91evWQWdSkkcGkpUedlQFFDRoXfF7FrgWlx7eVCoUap54LcMRtS zXPMxtyc3zirknfaXw+VfUHtaxActjwR6uk1Z0Fjh9q4f7GtDDQd/shDKdybiGb8ZHalFky TnD60qtFQHCKn388wb2h8xtEKbzQfNir1h2bb6krF8c8RnA2JkVKwD/Fg4ScO2Hgjr5Qv6a aru6a+Xv78sS/k64K4ang== X-UI-Out-Filterresults: notjunk:1;V03:K0:VPNVTWfkRh0=:EC6q1FkxYzXVRPFcN8SUnN PqnA+KNLPAmxa/8V6zqar3Jt35FWgB9259aIYqXTzsi3hH0gPLUPd7jILI1rKnTFFXS0XcIOs bTxYOIe7oAhTaxaqVXJDwE7Mq81XzaFL7gzOS84jkQdqcsrouBFBq+Hpo6zqjeMA75k9h0FRM o5wKlkicod05qkjo4JKBxiRbMVY8g3PrI61D8IsPsaGdXsZbu3f0pCwrBZXZd6sOLMpe3nGmp vhjt8q86BrvhiHeXLq0f6GTPzXdj/GM3thC63vsi2JtluZu4o6qYCChOpVYfe8Pa+Jt4oHot9 3qpPyRYD3/EPu2/7dqRXJTF0C+sf1CW3wAgg0kGr1D97cUptoub+WtIyZLaOq5eUyBPcBwSha zKa5YJwKoX316bFYY4nkE/RR3bzl1VIs2c0CerRo2/eV1duiYE3KEIJmN6fwwXL8lD+5TgFnv C5Auvn+9aHS+LwNxzBJPm+C1NxIouUT6+3UNBKkQ3amRV/q8Q2XflmLuz13sKAn+5LM0TiEGA e5NCYM8DzH2c2ZaaiOnHR8KpDW62Q+JbV5XKtBB+ISyDfFAacCQMQIWU7+QUSrIBv2S36mujb OdssTICe3rptUSTR3nk8BicrVgz9OaK4qrL/Rbz0avmqKZXZRbzo5yvSKQEAMnjdt5NjDyX2u rKREOwDVDiqlfbPqGeshv0fRsUmHcl4THh/v/MOJeO6a6eFXjhlarAO7qXoTO+e5pVw/PICtp DfIZl0RgfhMRKAHr0zmolU5PYctb8UumzjOFBw== 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. Signed-off-by: Oleksandr Suvorov Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- (no changes since v3) 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