[04/18] nios2: Drop separate parsing of bootm args

Message ID	20231203172622.4.I786baf70a4f8d91c3b9ce38c2501b714b03b94d8@changeid
State	Superseded
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Scott McNutt <smcnutt@psyent.com>, Thomas Chou <thomas@wytron.com.tw> Subject: [PATCH 04/18] nios2: Drop separate parsing of bootm args Date: Sun, 3 Dec 2023 17:26:20 -0700 Message-ID: <20231203172622.4.I786baf70a4f8d91c3b9ce38c2501b714b03b94d8@changeid> In-Reply-To: <20231204002642.895926-1-sjg@chromium.org> References: <20231204002642.895926-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	Complete decoupling of bootm logic from commands \| expand [00/18] Complete decoupling of bootm logic from commands [01/18] bootm: netbds: Drop passing of arguments [02/18] bootm: plan: Drop passing of arguments [03/18] bootm: qnxelf: Drop passing of arguments [04/18] nios2: Drop separate parsing of bootm args [05/18] treewide: bootm: Drop command-line args to boot_os_fn [06/18] bootm: Drop arguments from boot_selected_os() [07/18] mips: Add a reset_cpu() function [08/18] m68k: Add a reset_cpu() function [09/18] ppc: Add a reset_cpu() function [10/18] nios2: Add a reset_cpu() function [11/18] riscv: Add a reset_cpu() function [12/18] bootm: Adjust how the board is reset [13/18] bootm: Drop arguments from do_bootm_states() and rename [14/18] bootm: Create a function to run through the bootm states [15/18] stm32: Use local vars in stm32prog for initrd and fdt [16/18] bootm: Create a function to run through the bootz states [17/18] stm32: Use bootm_run() and bootz_run() [18/18] bootm: Create a function to run through the booti states

Message ID

20231203172622.4.I786baf70a4f8d91c3b9ce38c2501b714b03b94d8@changeid

State

Superseded

Delegated to:

Tom Rini

Headers

From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>,
 Scott McNutt <smcnutt@psyent.com>, Thomas Chou <thomas@wytron.com.tw>
Subject: [PATCH 04/18] nios2: Drop separate parsing of bootm args
Date: Sun,  3 Dec 2023 17:26:20 -0700
Message-ID: 
 <20231203172622.4.I786baf70a4f8d91c3b9ce38c2501b714b03b94d8@changeid>
In-Reply-To: <20231204002642.895926-1-sjg@chromium.org>
References: <20231204002642.895926-1-sjg@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

Complete decoupling of bootm logic from commands | expand

Commit Message

Simon Glass Dec. 4, 2023, 12:26 a.m. UTC

This function is supposed to boot the OS. Parsing of the arguments is
done in easier phases.

The code to handle this is already here, behind an #ifdef on
CONFIG_OF_LIBFDT so rely on that.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/nios2/lib/bootm.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c
index 06c094d0f1c7..823d524c9a2d 100644
--- a/arch/nios2/lib/bootm.c
+++ b/arch/nios2/lib/bootm.c
@@ -29,8 +29,6 @@  int do_bootm_linux(int flag, int argc, char *const argv[],
 	if (images->ft_len)
 		of_flat_tree = images->ft_addr;
 #endif
-	if (!of_flat_tree && argc > 1)
-		of_flat_tree = (char *)hextoul(argv[1], NULL);
 	if (of_flat_tree)
 		initrd_end = (ulong)of_flat_tree;

[04/18] nios2: Drop separate parsing of bootm args

Commit Message

Patch