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 04850C433FE for ; Sun, 20 Nov 2022 16:56:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F00B6854AC; Sun, 20 Nov 2022 17:56:41 +0100 (CET) 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="Ftksk6wE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 116A285369; Sun, 20 Nov 2022 17:56:40 +0100 (CET) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (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 06B99853E7 for ; Sun, 20 Nov 2022 17:56:38 +0100 (CET) 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 8BDBBB80B24; Sun, 20 Nov 2022 16:56:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 172EAC433D6; Sun, 20 Nov 2022 16:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668963396; bh=ZpSVlqrpKELZY3t7TrP0K0/+wqn6PeY4sB4bvLcQ+wY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ftksk6wE513OysIIrNpWYOPhLurdjmvEJKI+n9jiwakgSGsWOSxRCrDH9u5ZuDvP/ HoHdpspDvgT/CFYV2jL0kbZDmwYyt1z9FMNh0F8HugFXUmYrisauzY8YU+vXe0QWaW BB8uv+LRMseFZjWIExn3zCwNTkzQc8sCbeHympIrwkozOG+64oC5U1cOlzTyPF7ab2 tZA3aWigaqSWCOGniqjmeMHy7C5XJYu9DwQANt6tu9dm+h+Dbi7GfUB2p3cws5PB1w q3GcfsU3Z15fHU9J1Fb9IC4NrHi0SMW83zzW77sol3mYTw46BYLvzBcM+/gJj+HOGT 7H1PzTjbeUk3A== Received: by pali.im (Postfix) id C57BA82F; Sun, 20 Nov 2022 17:56:35 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Tom Rini Cc: u-boot@lists.denx.de, maemo-leste@lists.dyne.org Subject: [PATCH 3/3] Nokia RX-51: Do not overwrite standard $loadaddr variable Date: Sun, 20 Nov 2022 17:56:28 +0100 Message-Id: <20221120165628.14661-4-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221120165628.14661-1-pali@kernel.org> References: <20221120165628.14661-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Instead of overwriting $loadaddr variable, use custom temporary $fileloadaddr variable. So scripts can access default/original address stored in $loadaddr at build time. Signed-off-by: Pali Rohár --- include/configs/nokia_rx51.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index a88cfe77d50c..99a020c3c71d 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -78,15 +78,16 @@ "kernaddr=0x82008000\0" \ "initrdaddr=0x84008000\0" \ "scriptaddr=0x86008000\0" \ + "fileloadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fileload=${mmctype}load mmc ${mmcnum}:${mmcpart} " \ - "${loadaddr} ${mmcfile}\0" \ - "kernload=setenv loadaddr ${kernaddr};" \ + "${fileloadaddr} ${mmcfile}\0" \ + "kernload=setenv fileloadaddr ${kernaddr};" \ "setenv mmcfile ${mmckernfile};" \ "run fileload\0" \ - "initrdload=setenv loadaddr ${initrdaddr};" \ + "initrdload=setenv fileloadaddr ${initrdaddr};" \ "setenv mmcfile ${mmcinitrdfile};" \ "run fileload\0" \ - "scriptload=setenv loadaddr ${scriptaddr};" \ + "scriptload=setenv fileloadaddr ${scriptaddr};" \ "setenv mmcfile ${mmcscriptfile};" \ "run fileload\0" \ "scriptboot=echo Running ${mmcscriptfile} from mmc " \ -- 2.20.1