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 B7410C32772 for ; Tue, 23 Aug 2022 14:30:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 10BE48484A; Tue, 23 Aug 2022 16:29:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=fris.de 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=fris.de header.i=@fris.de header.b="1RBggSZu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7BCB384815; Tue, 23 Aug 2022 16:29:34 +0200 (CEST) Received: from mail.fris.de (mail.fris.de [IPv6:2a01:4f8:c2c:390b::1]) (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 AE2EC83FB5 for ; Tue, 23 Aug 2022 16:29:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=fris.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=frieder@fris.de Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 004E8C01D1; Tue, 23 Aug 2022 16:29:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1661264971; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=gcY0mIaulm4zWMo6+JE7Hg3kNOaPrlaqYanzERtjIuc=; b=1RBggSZudLQ2BijIq8J8JxvlZJPz5g1O7Dksc/1eRnUxZNF0M2apDAbIqmmGOHxNBrfkux yMcxZ6CrhCYodwMuxyKIUofvsQb4kPFljaNLXhrf2szGdv7/qgY/sQeis7g2rhZuddm2G/ D7CyS9y8qkQcaU4GfroJS400LZi9xCo7KrpvW5Y1H7CZ1CsPE6F0UaBbSmNTZSgGlaRpaH Uop3DbKXEhhnqzJbBqnm2TGMKZgBUn4FZaCl1gpPs9PO/zrROZ4uPfEno1+d+Dl8yESarC xouxhv85quPRVZH2ubag5gaj+2lKQcqa0noSaQp/69B1WOt05wJo8qpwiukQlw== From: Frieder Schrempf To: Frieder Schrempf , u-boot@lists.denx.de Cc: Marcel Ziswiler , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Stefano Babic Subject: [PATCH 5/6] imx: imx6ul: kontron-sl-mx6ul: Migrate to use CONFIG_EXTRA_ENV_TEXT Date: Tue, 23 Aug 2022 16:29:14 +0200 Message-Id: <20220823142917.306176-6-frieder@fris.de> In-Reply-To: <20220823142917.306176-1-frieder@fris.de> References: <20220823142917.306176-1-frieder@fris.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 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 From: Frieder Schrempf Move the environment from the board header to a separate text file and also drop those variables that are already set in env_default.h from the Kconfig options or are not needed anymore. Signed-off-by: Frieder Schrempf --- board/kontron/sl-mx6ul/sl-mx6ul.env | 4 ++++ include/configs/kontron-sl-mx6ul.h | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 board/kontron/sl-mx6ul/sl-mx6ul.env diff --git a/board/kontron/sl-mx6ul/sl-mx6ul.env b/board/kontron/sl-mx6ul/sl-mx6ul.env new file mode 100644 index 00000000000..9484e739dd4 --- /dev/null +++ b/board/kontron/sl-mx6ul/sl-mx6ul.env @@ -0,0 +1,4 @@ +kernel_addr_r=0x82000000 +ramdisk_addr_r=0x88080000 +pxefile_addr_r=0x80100000 +scriptaddr=0x80100000 diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h index 7aac5d3f5a1..f0586f7f721 100644 --- a/include/configs/kontron-sl-mx6ul.h +++ b/include/configs/kontron-sl-mx6ul.h @@ -49,14 +49,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #endif -#define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x82000000\0" \ - "ramdisk_addr_r=0x88080000\0" \ - "pxefile_addr_r=0x80100000\0" \ - "scriptaddr=0x80100000\0" \ - "bootdelay=3\0" \ - "ethact=" CONFIG_ETHPRIME "\0" \ - "hostname=" CONFIG_HOSTNAME "\0" \ - BOOTENV +#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV #endif /* __KONTRON_MX6UL_CONFIG_H */ -- 2.37.2