mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 05:50:17 +00:00 
			
		
		
		
	Correct SPL uses of EFI_HAVE_CAPSULE_SUPPORT
This converts 13 usages of this option to the non-SPL form, since there is no SPL_EFI_HAVE_CAPSULE_SUPPORT defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
		
							parent
							
								
									5cf9952e69
								
							
						
					
					
						commit
						71aa806d5d
					
				@ -35,7 +35,7 @@ static void setup_gpmi_nand(void)
 | 
			
		||||
}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[] = {
 | 
			
		||||
#if defined(CONFIG_TARGET_IMX8MP_RSB3720A1_4G)
 | 
			
		||||
	{
 | 
			
		||||
 | 
			
		||||
@ -31,7 +31,7 @@
 | 
			
		||||
 | 
			
		||||
DECLARE_GLOBAL_DATA_PTR;
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[] = {
 | 
			
		||||
#if defined(CONFIG_TARGET_IMX8MM_CL_IOT_GATE)
 | 
			
		||||
	{
 | 
			
		||||
 | 
			
		||||
@ -44,7 +44,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
 | 
			
		||||
 | 
			
		||||
	ALLOC_CACHE_ALIGN_BUFFER(char, buf, DFU_ALT_BUF_LEN);
 | 
			
		||||
 | 
			
		||||
	if (!CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) &&
 | 
			
		||||
	if (!IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) &&
 | 
			
		||||
	    env_get("dfu_alt_info"))
 | 
			
		||||
		return;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -29,7 +29,7 @@
 | 
			
		||||
#ifdef CONFIG_ARM64
 | 
			
		||||
#include <asm/armv8/mmu.h>
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[] = {
 | 
			
		||||
#if defined(CONFIG_TARGET_QEMU_ARM_32BIT)
 | 
			
		||||
	{
 | 
			
		||||
 | 
			
		||||
@ -32,7 +32,7 @@ static iomux_v3_cfg_t const uart_pads[] = {
 | 
			
		||||
	IMX8MQ_PAD_ECSPI1_MISO__UART3_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[] = {
 | 
			
		||||
	{
 | 
			
		||||
		.image_type_id = KONTRON_PITX_IMX8M_FIT_IMAGE_GUID,
 | 
			
		||||
 | 
			
		||||
@ -18,7 +18,7 @@
 | 
			
		||||
 | 
			
		||||
DECLARE_GLOBAL_DATA_PTR;
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[] = {
 | 
			
		||||
	{
 | 
			
		||||
		.image_type_id = KONTRON_SL_MX8MM_FIT_IMAGE_GUID,
 | 
			
		||||
 | 
			
		||||
@ -28,7 +28,7 @@
 | 
			
		||||
 | 
			
		||||
DECLARE_GLOBAL_DATA_PTR;
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[] = {
 | 
			
		||||
	{
 | 
			
		||||
		.image_type_id = KONTRON_SL28_FIT_IMAGE_GUID,
 | 
			
		||||
 | 
			
		||||
@ -14,7 +14,7 @@
 | 
			
		||||
 | 
			
		||||
#define ROCKPI4_UPDATABLE_IMAGES	2
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
static struct efi_fw_image fw_images[ROCKPI4_UPDATABLE_IMAGES] = {0};
 | 
			
		||||
 | 
			
		||||
struct efi_capsule_update_info update_info = {
 | 
			
		||||
 | 
			
		||||
@ -29,7 +29,7 @@
 | 
			
		||||
 */
 | 
			
		||||
gd_t *gd;
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
/* GUIDs for capsule updatable firmware images */
 | 
			
		||||
#define SANDBOX_UBOOT_IMAGE_GUID \
 | 
			
		||||
	EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \
 | 
			
		||||
 | 
			
		||||
@ -18,7 +18,7 @@
 | 
			
		||||
 | 
			
		||||
#include <linux/kernel.h>
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[] = {
 | 
			
		||||
	{
 | 
			
		||||
		.image_type_id = DEVELOPERBOX_UBOOT_IMAGE_GUID,
 | 
			
		||||
 | 
			
		||||
@ -88,7 +88,7 @@
 | 
			
		||||
#define USB_START_LOW_THRESHOLD_UV	1230000
 | 
			
		||||
#define USB_START_HIGH_THRESHOLD_UV	2150000
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[1];
 | 
			
		||||
 | 
			
		||||
struct efi_capsule_update_info update_info = {
 | 
			
		||||
@ -677,7 +677,7 @@ int board_init(void)
 | 
			
		||||
 | 
			
		||||
	setup_led(LEDST_ON);
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
	efi_guid_t image_type_guid = STM32MP_FIP_IMAGE_GUID;
 | 
			
		||||
 | 
			
		||||
	guidcpy(&fw_images[0].image_type_id, &image_type_guid);
 | 
			
		||||
 | 
			
		||||
@ -33,7 +33,7 @@
 | 
			
		||||
 | 
			
		||||
#include "fru.h"
 | 
			
		||||
 | 
			
		||||
#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
 | 
			
		||||
struct efi_fw_image fw_images[] = {
 | 
			
		||||
#if defined(XILINX_BOOT_IMAGE_GUID)
 | 
			
		||||
	{
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user