mirror of
				https://source.denx.de/u-boot/u-boot.git
				synced 2025-10-31 08:21:36 +01:00 
			
		
		
		
	In the next commit, CONFIG_EFI_SETUP_EARLY will become mandated in order to support dynamic enumeration of efi_disk objects. This can, however, be problematic particularly in case of file-based variable storage (efi_variable.c, default). Non-volatile variables are to be restored from EFI system partition by efi_init_variables() in efi_init_obj_list(). When efi_init_obj_list() is called in board_init_r(), we don't know yet what disk devices we have since none of device probing commands (say, scsi rescan) has not been executed at that stage. So in this commit, a preparatory change is made; efi_init_obj_list() is broken into the two functions; * efi_init_early(), and * new efi_init_obj_list() Only efi_init_early() will be called in board_init_r(), which allows us to execute any of device probing commands, either though "preboot" variable or normal command line, before calling efi_init_obj_list() which is to be invoked at the first execution of an efi-related command (or at efi_launch_capsules()) as used to be. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
		
			
				
	
	
		
			72 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			72 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0+
 | |
| /*
 | |
|  * (C) Copyright 2000
 | |
|  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 | |
|  */
 | |
| 
 | |
| /* #define	DEBUG	*/
 | |
| 
 | |
| #include <common.h>
 | |
| #include <autoboot.h>
 | |
| #include <bootstage.h>
 | |
| #include <cli.h>
 | |
| #include <command.h>
 | |
| #include <console.h>
 | |
| #include <env.h>
 | |
| #include <init.h>
 | |
| #include <net.h>
 | |
| #include <version_string.h>
 | |
| #include <efi_loader.h>
 | |
| 
 | |
| static void run_preboot_environment_command(void)
 | |
| {
 | |
| 	char *p;
 | |
| 
 | |
| 	p = env_get("preboot");
 | |
| 	if (p != NULL) {
 | |
| 		int prev = 0;
 | |
| 
 | |
| 		if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
 | |
| 			prev = disable_ctrlc(1); /* disable Ctrl-C checking */
 | |
| 
 | |
| 		run_command_list(p, -1, 0);
 | |
| 
 | |
| 		if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED))
 | |
| 			disable_ctrlc(prev);	/* restore Ctrl-C checking */
 | |
| 	}
 | |
| }
 | |
| 
 | |
| /* We come here after U-Boot is initialised and ready to process commands */
 | |
| void main_loop(void)
 | |
| {
 | |
| 	const char *s;
 | |
| 
 | |
| 	bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop");
 | |
| 
 | |
| 	if (IS_ENABLED(CONFIG_VERSION_VARIABLE))
 | |
| 		env_set("ver", version_string);  /* set version variable */
 | |
| 
 | |
| 	cli_init();
 | |
| 
 | |
| 	if (IS_ENABLED(CONFIG_USE_PREBOOT))
 | |
| 		run_preboot_environment_command();
 | |
| 
 | |
| 	if (IS_ENABLED(CONFIG_UPDATE_TFTP))
 | |
| 		update_tftp(0UL, NULL, NULL);
 | |
| 
 | |
| 	if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK_EARLY)) {
 | |
| 		/* efi_init_early() already called */
 | |
| 		if (efi_init_obj_list() == EFI_SUCCESS)
 | |
| 			efi_launch_capsules();
 | |
| 	}
 | |
| 
 | |
| 	s = bootdelay_process();
 | |
| 	if (cli_process_fdt(&s))
 | |
| 		cli_secure_boot_cmd(s);
 | |
| 
 | |
| 	autoboot_command(s);
 | |
| 
 | |
| 	cli_loop();
 | |
| 	panic("No CLI available");
 | |
| }
 |