From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from magratgarlick.emantor.de ([78.46.208.201]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kI4kV-00031Q-Qc for barebox@lists.infradead.org; Tue, 15 Sep 2020 06:47:32 +0000 From: Rouven Czerwinski Date: Tue, 15 Sep 2020 08:47:22 +0200 Message-Id: <20200915064722.17355-4-r.czerwinski@pengutronix.de> In-Reply-To: <20200915064722.17355-1-r.czerwinski@pengutronix.de> References: <20200915064722.17355-1-r.czerwinski@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 4/4] fastboot: only unset image, not loadaddr To: barebox@lists.infradead.org Cc: Rouven Czerwinski In case the board needs to setup the load address of the kernel, don't overwrite the variable, instead only override the image. Signed-off-by: Rouven Czerwinski --- common/fastboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/fastboot.c b/common/fastboot.c index 302720c43d..86e7997a0b 100644 --- a/common/fastboot.c +++ b/common/fastboot.c @@ -383,7 +383,7 @@ static void __maybe_unused cb_boot(struct fastboot *fb, const char *opt) fastboot_tx_print(fb, FASTBOOT_MSG_INFO, "Booting kernel..\n"); globalvar_set_match("linux.bootargs.dyn.", ""); - globalvar_set_match("bootm.image", ""); + globalvar_set("bootm.image", ""); data.os_file = fb->tempname; -- 2.28.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox