diff options
-rw-r--r-- | board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 2 | ||||
-rw-r--r-- | board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 2 | ||||
-rw-r--r-- | board/emulation/common/qemu_dfu.c | 2 | ||||
-rw-r--r-- | board/emulation/qemu-arm/qemu-arm.c | 2 | ||||
-rw-r--r-- | board/kontron/pitx_imx8m/pitx_imx8m.c | 2 | ||||
-rw-r--r-- | board/kontron/sl-mx8mm/sl-mx8mm.c | 2 | ||||
-rw-r--r-- | board/kontron/sl28/sl28.c | 2 | ||||
-rw-r--r-- | board/rockchip/evb_rk3399/evb-rk3399.c | 2 | ||||
-rw-r--r-- | board/sandbox/sandbox.c | 2 | ||||
-rw-r--r-- | board/socionext/developerbox/developerbox.c | 2 | ||||
-rw-r--r-- | board/st/stm32mp1/stm32mp1.c | 4 | ||||
-rw-r--r-- | board/xilinx/common/board.c | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index aa9687f7a9..34109c69dd 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -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) { diff --git a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c index 3d7fff34d2..b373e45df9 100644 --- a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c +++ b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c @@ -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) { diff --git a/board/emulation/common/qemu_dfu.c b/board/emulation/common/qemu_dfu.c index c1aeaf10d9..332d659c1f 100644 --- a/board/emulation/common/qemu_dfu.c +++ b/board/emulation/common/qemu_dfu.c @@ -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; diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c index dae37640bc..34ed3e8ae6 100644 --- a/board/emulation/qemu-arm/qemu-arm.c +++ b/board/emulation/qemu-arm/qemu-arm.c @@ -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) { diff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/kontron/pitx_imx8m/pitx_imx8m.c index d974af8da1..af1832c473 100644 --- a/board/kontron/pitx_imx8m/pitx_imx8m.c +++ b/board/kontron/pitx_imx8m/pitx_imx8m.c @@ -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, diff --git a/board/kontron/sl-mx8mm/sl-mx8mm.c b/board/kontron/sl-mx8mm/sl-mx8mm.c index 4ac430b29a..250195694b 100644 --- a/board/kontron/sl-mx8mm/sl-mx8mm.c +++ b/board/kontron/sl-mx8mm/sl-mx8mm.c @@ -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, diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 0576b3eae4..4ad6b32347 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -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, diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index f56b379b93..c99ffdd75e 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -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 = { diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 8b953f9b39..2e44bdf0df 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -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, \ diff --git a/board/socionext/developerbox/developerbox.c b/board/socionext/developerbox/developerbox.c index 6415c90c1c..16e14d4f7f 100644 --- a/board/socionext/developerbox/developerbox.c +++ b/board/socionext/developerbox/developerbox.c @@ -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, diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index b0dfa2b332..ec6f0b43f2 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -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); diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 35a2f310f4..aa9f3ef071 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -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) { |