Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-30 00:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2023-02-08-Kconfig-cleanup-CONFIG_IS_ENABLED-to-IS_ENABLED'

Browse source 
- This series brings in a large number of patches in the form of changing
  CONFIG_IS_ENABLED(FOO) to IS_ENABLED(CONFIG_FOO) when there it is the
  case that CONFIG_xPL_FOO is never a valid symbol. The majority of
  the times where we do this, it is unintentional and does not make the
  code more useful, or rarely, introduces bugs.
This commit is contained in:
Tom Rini 2023-02-10 09:17:25 -05:00
commit 8b301102e2
139 changed files with 230 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arc/lib/bootm.c
View file

@ -29,7 +29,7 @@ static int boot_prep_linux(struct bootm_headers *images)
{
int ret;
if (CONFIG_IS_ENABLED(LMB)) {
if (IS_ENABLED(CONFIG_LMB)) {
ret = image_setup_linux(images);
if (ret)
return ret;

2
arch/arm/cpu/armv8/fsl-layerscape/cpu.c
View file

@ -760,7 +760,7 @@ enum boot_src __get_boot_src(u32 porsr1)
}
#endif
if (CONFIG_IS_ENABLED(SYS_FSL_ERRATUM_A010539) && !rcw_src)
if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_A010539) && !rcw_src)
src = BOOT_SOURCE_QSPI_NOR;
debug("%s: src 0x%x\n", __func__, src);

2
arch/arm/include/asm/mach-imx/module_fuse.h
View file

@ -74,7 +74,7 @@ struct fuse_entry_desc {
u32 status;
};
#if !CONFIG_IS_ENABLED(IMX_MODULE_FUSE)
#if !IS_ENABLED(CONFIG_IMX_MODULE_FUSE)
static inline u32 check_module_fused(enum fuse_module_type module)
{
return 0;

2
arch/arm/lib/bootm.c
View file

@ -199,7 +199,7 @@ static void boot_prep_linux(struct bootm_headers *images)
{
char *commandline = env_get("bootargs");
if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
debug("using: FDT\n");
if (image_setup_linux(images)) {
panic("FDT creation failed!");

4
arch/arm/lib/save_prev_bl_data.c
View file

@ -60,9 +60,9 @@ int save_prev_bl_data(void)
return -ENODATA;
}
if (CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR))
if (IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR))
env_set_addr("prevbl_fdt_addr", (void *)reg0);
if (!CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR))
if (!IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR))
return 0;
node = fdt_path_offset(fdt_blob, "/chosen");

2
arch/arm/mach-exynos/mmu-arm64.c
View file

@ -7,7 +7,7 @@
#include <common.h>
#include <asm/armv8/mmu.h>
#if CONFIG_IS_ENABLED(EXYNOS7420)
#if IS_ENABLED(CONFIG_EXYNOS7420)
static struct mm_region exynos7420_mem_map[] = {
{

12
arch/arm/mach-mvebu/arm64-common.c
View file

@ -49,11 +49,11 @@ const struct mbus_dram_target_info *mvebu_mbus_dram_info(void)
__weak int dram_init_banksize(void)
{
if (CONFIG_IS_ENABLED(ARMADA_8K))
if (IS_ENABLED(CONFIG_ARMADA_8K))
return a8k_dram_init_banksize();
else if (CONFIG_IS_ENABLED(ARMADA_3700))
else if (IS_ENABLED(CONFIG_ARMADA_3700))
return a3700_dram_init_banksize();
else if (CONFIG_IS_ENABLED(ALLEYCAT_5))
else if (IS_ENABLED(CONFIG_ALLEYCAT_5))
return alleycat5_dram_init_banksize();
else
return fdtdec_setup_memory_banksize();
@ -61,16 +61,16 @@ __weak int dram_init_banksize(void)
__weak int dram_init(void)
{
if (CONFIG_IS_ENABLED(ARMADA_8K)) {
if (IS_ENABLED(CONFIG_ARMADA_8K)) {
gd->ram_size = a8k_dram_scan_ap_sz();
if (gd->ram_size != 0)
return 0;
}
if (CONFIG_IS_ENABLED(ARMADA_3700))
if (IS_ENABLED(CONFIG_ARMADA_3700))
return a3700_dram_init();
if (CONFIG_IS_ENABLED(ALLEYCAT_5))
if (IS_ENABLED(CONFIG_ALLEYCAT_5))
return alleycat5_dram_init();
if (fdtdec_setup_mem_size_base() != 0)

2
arch/arm/mach-rockchip/board.c
View file

@ -306,7 +306,7 @@ int board_usb_init(int index, enum usb_init_type init)
#endif /* CONFIG_USB_GADGET */
#if CONFIG_IS_ENABLED(FASTBOOT)
#if IS_ENABLED(CONFIG_FASTBOOT)
int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
{
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)

2
arch/arm/mach-rockchip/cpu-info.c
View file

@ -44,7 +44,7 @@ char *get_reset_cause(void)
return cause;
}
#if CONFIG_IS_ENABLED(DISPLAY_CPUINFO)
#if IS_ENABLED(CONFIG_DISPLAY_CPUINFO)
int print_cpuinfo(void)
{
char *cause = get_reset_cause();

8
arch/arm/mach-rockchip/misc.c
View file

@ -23,7 +23,7 @@
int rockchip_setup_macaddr(void)
{
#if CONFIG_IS_ENABLED(CMD_NET)
#if IS_ENABLED(CONFIG_CMD_NET)
int ret;
const char *cpuid = env_get("cpuid#");
u8 hash[SHA256_SUM_LEN];
@ -60,15 +60,15 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset,
const u32 cpuid_length,
u8 *cpuid)
{
#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP)
#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || IS_ENABLED(CONFIG_ROCKCHIP_OTP)
struct udevice *dev;
int ret;
/* retrieve the device */
#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE)
#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE)
ret = uclass_get_device_by_driver(UCLASS_MISC,
DM_DRIVER_GET(rockchip_efuse), &dev);
#elif CONFIG_IS_ENABLED(ROCKCHIP_OTP)
#elif IS_ENABLED(CONFIG_ROCKCHIP_OTP)
ret = uclass_get_device_by_driver(UCLASS_MISC,
DM_DRIVER_GET(rockchip_otp), &dev);
#endif

2
arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c
View file

@ -150,7 +150,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc,
/* Try bootm for legacy and FIT format image */
if (genimg_get_format(uimage) != IMAGE_FORMAT_INVALID)
do_bootm(cmdtp, 0, 4, bootm_argv);
else if (CONFIG_IS_ENABLED(CMD_BOOTZ))
else if (IS_ENABLED(CONFIG_CMD_BOOTZ))
do_bootz(cmdtp, 0, 4, bootm_argv);
}
if (data->script)

6
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
View file

@ -1583,7 +1583,7 @@ int stm32prog_pmic_read(struct stm32prog_data *data, u32 offset, u8 *buffer,
int result = 0, ret;
struct udevice *dev;
if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) {
if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) {
stm32prog_err("PMIC update not supported");
return -EOPNOTSUPP;
@ -1633,7 +1633,7 @@ int stm32prog_pmic_start(struct stm32prog_data *data)
int ret;
struct udevice *dev;
if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) {
if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) {
stm32prog_err("PMIC update not supported");
return -EOPNOTSUPP;
@ -1748,7 +1748,7 @@ static void stm32prog_end_phase(struct stm32prog_data *data, u64 offset)
}
}
if (CONFIG_IS_ENABLED(MTD) &&
if (IS_ENABLED(CONFIG_MTD) &&
data->cur_part->bin_nb > 1) {
if (stm32prog_copy_fsbl(data->cur_part)) {
stm32prog_err("%s (0x%x): copy of fsbl failed",

2
arch/arm/mach-stm32mp/fdt.c
View file

@ -505,7 +505,7 @@ int ft_system_setup(void *blob, struct bd_info *bd)
* under CONFIG_STM32MP15x_STM32IMAGE only for compatibility
* when FIP is not used by TF-A
*/
if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) &&
if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE) &&
!tee_find_device(NULL, NULL, NULL, NULL))
stm32_fdt_disable_optee(blob);
}

2
arch/m68k/lib/bootm.c
View file

@ -60,7 +60,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[],
}
set_clocks_in_mhz(kbd);
if (CONFIG_IS_ENABLED(LMB)) {
if (IS_ENABLED(CONFIG_LMB)) {
ret = image_setup_linux(images);
if (ret)
goto error;

2
arch/microblaze/cpu/cpuinfo.c
View file

@ -8,7 +8,7 @@
DECLARE_GLOBAL_DATA_PTR;
#if CONFIG_IS_ENABLED(CPU_MICROBLAZE)
#if IS_ENABLED(CONFIG_CPU_MICROBLAZE)
/* These key value are as per MBV field in PVR0 */
static const struct microblaze_version_map cpu_ver_lookup[] = {
{"5.00.a", 0x01},

2
arch/microblaze/include/asm/cpuinfo.h
View file

@ -26,7 +26,7 @@ struct microblaze_cpuinfo {
u32 dcache_size;
u32 dcache_line_length;
#if CONFIG_IS_ENABLED(CPU_MICROBLAZE)
#if IS_ENABLED(CONFIG_CPU_MICROBLAZE)
u32 use_mmu;
u32 cpu_freq;
u32 addr_size;

2
arch/microblaze/lib/bootm.c
View file

@ -73,7 +73,7 @@ static void boot_jump_linux(struct bootm_headers *images, int flag)
static void boot_prep_linux(struct bootm_headers *images)
{
if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
debug("using: FDT\n");
if (image_setup_linux(images)) {
printf("FDT creation failed! hanging...");

2
arch/mips/include/asm/cm.h
View file

@ -108,7 +108,7 @@
#include <asm/io.h>
#include <linux/bitops.h>
#if CONFIG_IS_ENABLED(MIPS_CM)
#if IS_ENABLED(CONFIG_MIPS_CM)
static inline void *mips_cm_base(void)
{
return (void *)CKSEG1ADDR(CONFIG_MIPS_CM_BASE);

4
arch/mips/lib/bootm.c
View file

@ -284,10 +284,10 @@ static void boot_jump_linux(struct bootm_headers *images)
if (CONFIG_IS_ENABLED(MALTA))
linux_extra = gd->ram_size;
#if CONFIG_IS_ENABLED(BOOTSTAGE_FDT)
#if IS_ENABLED(CONFIG_BOOTSTAGE_FDT)
bootstage_fdt_add_report();
#endif
#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT)
#if IS_ENABLED(CONFIG_BOOTSTAGE_REPORT)
bootstage_report();
#endif

4
arch/mips/mach-octeon/cpu.c
View file

@ -448,10 +448,10 @@ int arch_misc_init(void)
if (ret)
return ret;
if (CONFIG_IS_ENABLED(OCTEON_SERIAL_PCIE_CONSOLE))
if (IS_ENABLED(CONFIG_OCTEON_SERIAL_PCIE_CONSOLE))
init_pcie_console();
if (CONFIG_IS_ENABLED(OCTEON_SERIAL_BOOTCMD))
if (IS_ENABLED(CONFIG_OCTEON_SERIAL_BOOTCMD))
init_bootcmd_console();
return 0;

2
arch/powerpc/lib/bootm.c
View file

@ -214,7 +214,7 @@ static int boot_body_linux(struct bootm_headers *images)
if (ret)
return ret;
if (CONFIG_IS_ENABLED(LMB)) {
if (IS_ENABLED(CONFIG_LMB)) {
ret = image_setup_linux(images);
if (ret)
return ret;

2
arch/riscv/lib/bootm.c
View file

@ -64,7 +64,7 @@ static void announce_and_cleanup(int fake)
static void boot_prep_linux(struct bootm_headers *images)
{
if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
debug("using: FDT\n");
if (image_setup_linux(images)) {
printf("FDT creation failed! hanging...");

2
arch/sandbox/lib/bootm.c
View file

@ -55,7 +55,7 @@ static int boot_prep_linux(struct bootm_headers *images)
{
int ret;
if (CONFIG_IS_ENABLED(LMB)) {
if (IS_ENABLED(CONFIG_LMB)) {
ret = image_setup_linux(images);
if (ret)
return ret;

2
arch/x86/cpu/coreboot/coreboot.c
View file

@ -77,7 +77,7 @@ static void board_final_init(void)
int last_stage_init(void)
{
/* start usb so that usb keyboard can be used as input device */
if (CONFIG_IS_ENABLED(USB_KEYBOARD))
if (IS_ENABLED(CONFIG_USB_KEYBOARD))
usb_init();
board_final_init();

2
arch/x86/cpu/efi/payload.c
View file

@ -171,7 +171,7 @@ int reserve_arch(void)
int last_stage_init(void)
{
/* start usb so that usb keyboard can be used as input device */
if (CONFIG_IS_ENABLED(USB_KEYBOARD))
if (IS_ENABLED(CONFIG_USB_KEYBOARD))
usb_init();
return 0;

4
arch/x86/lib/bootm.c
View file

@ -39,7 +39,7 @@ void bootm_announce_and_cleanup(void)
timestamp_add_now(TS_START_KERNEL);
#endif
bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel");
#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT)
#if IS_ENABLED(CONFIG_BOOTSTAGE_REPORT)
bootstage_report();
#endif
@ -78,7 +78,7 @@ static int boot_prep_linux(struct bootm_headers *images)
size_t len;
int ret;
if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
debug("using: FDT\n");
if (image_setup_linux(images)) {
puts("FDT creation failed! hanging...");

2
arch/x86/lib/fsp/fsp_dram.c
View file

@ -60,7 +60,7 @@ int dram_init_banksize(void)
*
* However it seems FSP2's behavior is different. We need to add the
* DRAM range in MTRR otherwise the boot process goes very slowly,
* which was observed on Chrromebook Coral with FSP2.
* which was observed on Chromebook Coral with FSP2.
*/
update_mtrr = CONFIG_IS_ENABLED(FSP_VERSION2);

2
board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c
View file

@ -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)
{

2
board/broadcom/bcmns3/ns3.c
View file

@ -150,7 +150,7 @@ int board_init(void)
if (bl33_info->version != BL33_INFO_VERSION)
printf("*** warning: ATF BL31 and U-Boot not in sync! ***\n");
#if CONFIG_IS_ENABLED(BNXT_ETH)
#if IS_ENABLED(CONFIG_BNXT_ETH)
if (chimp_fastboot_optee() != 0)
printf("*** warning: secure chimp fastboot failed! ***\n");
#endif

2
board/compulab/cm_fx6/cm_fx6.c
View file

@ -736,7 +736,7 @@ U_BOOT_DRVINFO(cm_fx6_serial) = {
.plat = &cm_fx6_mxc_serial_plat,
};
#if CONFIG_IS_ENABLED(AHCI)
#if IS_ENABLED(CONFIG_AHCI)
static int sata_imx_probe(struct udevice *dev)
{
int i, err;

2
board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c
View file

@ -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)
{

2
board/emulation/common/qemu_dfu.c
View file

@ -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;

2
board/emulation/qemu-arm/qemu-arm.c
View file

@ -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)
{

4
board/engicam/imx8mp/icore_mx8mp.c
View file

@ -58,10 +58,10 @@ int board_phy_config(struct phy_device *phydev)
int board_init(void)
{
if (CONFIG_IS_ENABLED(FEC_MXC))
if (IS_ENABLED(CONFIG_FEC_MXC))
setup_fec();
if (CONFIG_IS_ENABLED(DWC_ETH_QOS))
if (IS_ENABLED(CONFIG_DWC_ETH_QOS))
setup_eqos();
return 0;

2
board/engicam/stm32mp1/stm32mp1.c
View file

@ -68,7 +68,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
case BOOT_FLASH_NAND:
case BOOT_FLASH_SPINAND:
if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI))
if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
return ENVL_UBI;
else
return ENVL_NOWHERE;

4
board/freescale/imx8mp_evk/imx8mp_evk.c
View file

@ -55,11 +55,11 @@ int board_init(void)
{
int ret = 0;
if (CONFIG_IS_ENABLED(FEC_MXC)) {
if (IS_ENABLED(CONFIG_FEC_MXC)) {
setup_fec();
}
if (CONFIG_IS_ENABLED(DWC_ETH_QOS)) {
if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) {
ret = setup_eqos();
}

4
board/freescale/imx93_evk/imx93_evk.c
View file

@ -66,10 +66,10 @@ static int setup_eqos(void)
int board_init(void)
{
if (CONFIG_IS_ENABLED(FEC_MXC))
if (IS_ENABLED(CONFIG_FEC_MXC))
setup_fec();
if (CONFIG_IS_ENABLED(DWC_ETH_QOS))
if (IS_ENABLED(CONFIG_DWC_ETH_QOS))
setup_eqos();
return 0;

6
board/freescale/lx2160a/lx2160a.c
View file

@ -676,7 +676,7 @@ void board_quiesce_devices(void)
}
#endif
#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB)
#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB)
int fdt_fixup_add_thermal(void *blob, int mux_node, int channel, int reg)
{
int err;
@ -798,7 +798,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
u64 mc_memory_size = 0;
u16 total_memory_banks;
int err;
#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB)
#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB)
u8 board_rev;
#endif
@ -862,7 +862,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
#endif
fdt_fixup_icid(blob);
#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB)
#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB)
board_rev = (QIXIS_READ(arch) & 0xf) - 1 + 'A';
if (board_rev == 'C')
fdt_fixup_i2c_thermal_node(blob);

8
board/keymile/common/common.c
View file

@ -79,10 +79,10 @@ int set_km_env(void)
}
#if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED)
#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \
!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \
(CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \
CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)))
#if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \
!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) || \
(IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \
IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)))
#error "It has to be either bootpackage or update u-boot image!"
#endif
void check_for_uboot_update(void)

4
board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c
View file

@ -71,7 +71,7 @@ int board_early_init_f(void)
/* QRIO Configuration */
qrio_uprstreq(UPREQ_CORE_RST);
#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_SELI8)
#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_SELI8)
qrio_prstcfg(KM_LIU_RST, PRSTCFG_POWUP_UNIT_RST);
qrio_wdmask(KM_LIU_RST, true);
@ -79,7 +79,7 @@ int board_early_init_f(void)
qrio_wdmask(KM_PAXK_RST, true);
#endif
#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_EXPU1)
#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_EXPU1)
qrio_prstcfg(WCOM_TMG_RST, PRSTCFG_POWUP_UNIT_RST);
qrio_wdmask(WCOM_TMG_RST, true);

2
board/kontron/pitx_imx8m/pitx_imx8m.c
View file

@ -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,

2
board/kontron/sl-mx8mm/sl-mx8mm.c
View file

@ -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,

8
board/kontron/sl28/sl28.c
View file

@ -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,
@ -109,7 +109,7 @@ static void print_cpld_version(void)
int checkboard(void)
{
printf("EL: %d\n", current_el());
if (CONFIG_IS_ENABLED(SL28CPLD))
if (IS_ENABLED(CONFIG_SL28CPLD))
print_cpld_version();
return 0;
@ -157,7 +157,7 @@ int fsl_board_late_init(void)
* If the watchdog isn't enabled at reset (which is a configuration
* option) disabling it doesn't hurt either.
*/
if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART))
if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART))
stop_recovery_watchdog();
return 0;
@ -188,7 +188,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
fdt_fixup_icid(blob);
if (CONFIG_IS_ENABLED(SL28_SPL_LOADS_OPTEE_BL32)) {
if (IS_ENABLED(CONFIG_SL28_SPL_LOADS_OPTEE_BL32)) {
node = fdt_node_offset_by_compatible(blob, -1, "linaro,optee-tz");
if (node)
fdt_set_node_status(blob, node, FDT_STATUS_OKAY);

2
board/rockchip/evb_rk3399/evb-rk3399.c
View file

@ -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 = {

2
board/sandbox/sandbox.c
View file

@ -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, \

4
board/sifive/unleashed/unleashed.c
View file

@ -27,7 +27,7 @@
#ifdef CONFIG_MISC_INIT_R
#if CONFIG_IS_ENABLED(SIFIVE_OTP)
#if IS_ENABLED(CONFIG_SIFIVE_OTP)
static u32 otp_read_serialnum(struct udevice *dev)
{
int ret;
@ -53,7 +53,7 @@ static u32 fu540_read_serialnum(void)
{
u32 serial = ERROR_READING_SERIAL_NUMBER;
#if CONFIG_IS_ENABLED(SIFIVE_OTP)
#if IS_ENABLED(CONFIG_SIFIVE_OTP)
struct udevice *dev;
int ret;

2
board/socionext/developerbox/developerbox.c
View file

@ -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,

2
board/st/common/stm32mp_dfu.c
View file

@ -123,7 +123,7 @@ void set_dfu_alt_info(char *interface, char *devstr)
board_get_alt_info_mmc(dev, buf);
}
if (CONFIG_IS_ENABLED(MTD)) {
if (IS_ENABLED(CONFIG_MTD)) {
/* probe all MTD devices */
mtd_probe_devices();

2
board/st/common/stm32mp_mtdparts.c
View file

@ -96,7 +96,7 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts)
case BOOT_SERIAL_UART:
case BOOT_SERIAL_USB:
serial = true;
if (CONFIG_IS_ENABLED(CMD_STM32PROG)) {
if (IS_ENABLED(CONFIG_CMD_STM32PROG)) {
#ifdef CONFIG_STM32MP15x_STM32IMAGE
tee = stm32prog_get_tee_partitions();
#endif

10
board/st/stm32mp1/stm32mp1.c
View file

@ -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 = {
@ -129,7 +129,7 @@ int checkboard(void)
fdt_compat && fdt_compat_len ? fdt_compat : "");
/* display the STMicroelectronics board identification */
if (CONFIG_IS_ENABLED(CMD_STBOARD)) {
if (IS_ENABLED(CONFIG_CMD_STBOARD)) {
ret = uclass_get_device_by_driver(UCLASS_MISC,
DM_DRIVER_GET(stm32mp_bsec),
&dev);
@ -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);
@ -831,7 +831,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
case BOOT_FLASH_NAND:
case BOOT_FLASH_SPINAND:
if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI))
if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
return ENVL_UBI;
else
return ENVL_NOWHERE;
@ -930,7 +930,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
if (IS_ENABLED(CONFIG_FDT_FIXUP_PARTITIONS))
fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
if (CONFIG_IS_ENABLED(FDT_SIMPLEFB))
if (IS_ENABLED(CONFIG_FDT_SIMPLEFB))
fdt_simplefb_enable_and_mem_rsv(blob);
return 0;

2
board/ti/am57xx/board.c
View file

@ -1172,7 +1172,7 @@ int board_fit_config_name_match(const char *name)
}
#endif
#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
{
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)

2
board/ti/dra7xx/evm.c
View file

@ -1049,7 +1049,7 @@ int board_fit_config_name_match(const char *name)
}
#endif
#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
{
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)

10
board/traverse/ten64/ten64.c
View file

@ -97,7 +97,7 @@ int checkboard(void)
printf("Unknown boot source %d\n", src);
puts("Controller: ");
if (CONFIG_IS_ENABLED(TEN64_CONTROLLER)) {
if (IS_ENABLED(CONFIG_TEN64_CONTROLLER)) {
/* Driver not compatible with alpha/beta board MCU firmware */
if (board_rev <= TEN64_BOARD_REV_C) {
if (ten64_read_board_info(&boardinfo)) {
@ -123,7 +123,7 @@ int board_init(void)
{
init_final_memctl_regs();
if (CONFIG_IS_ENABLED(FSL_CAAM))
if (IS_ENABLED(CONFIG_FSL_CAAM))
sec_init();
return 0;
@ -211,7 +211,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
base[i] = gd->bd->bi_dram[i].start;
size[i] = gd->bd->bi_dram[i].size;
/* reduce size if reserved memory is within this bank */
if (CONFIG_IS_ENABLED(RESV_RAM) && RESV_MEM_IN_BANK(i))
if (IS_ENABLED(CONFIG_RESV_RAM) && RESV_MEM_IN_BANK(i))
size[i] = gd->arch.resv_ram - base[i];
}
@ -229,7 +229,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
fdt_fsl_mc_fixup_iommu_map_entry(blob);
if (CONFIG_IS_ENABLED(FSL_MC_ENET))
if (IS_ENABLED(CONFIG_FSL_MC_ENET))
fdt_fixup_board_enet(blob);
fdt_fixup_icid(blob);
@ -375,7 +375,7 @@ static void ten64_board_retimer_ds110df410_init(void)
/* Retimer power cycle not implemented on early board
* revisions/controller firmwares
*/
if (CONFIG_IS_ENABLED(TEN64_CONTROLLER) &&
if (IS_ENABLED(CONFIG_TEN64_CONTROLLER) &&
board_rev >= TEN64_BOARD_REV_C) {
ret = board_cycle_retimer(&retim_dev);
if (ret) {

2
board/variscite/imx8mn_var_som/imx8mn_var_som.c
View file

@ -18,7 +18,7 @@ static void setup_fec(void)
int board_init(void)
{
if (CONFIG_IS_ENABLED(FEC_MXC))
if (IS_ENABLED(CONFIG_FEC_MXC))
setup_fec();
return 0;

14
board/xilinx/common/board.c
View file

@ -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)
{
@ -208,7 +208,7 @@ static int xilinx_read_eeprom_fru(struct udevice *dev, char *name,
}
fru_capture((unsigned long)fru_content);
if (gd->flags & GD_FLG_RELOC || (_DEBUG && CONFIG_IS_ENABLED(DTB_RESELECT))) {
if (gd->flags & GD_FLG_RELOC || (_DEBUG && IS_ENABLED(CONFIG_DTB_RESELECT))) {
printf("Xilinx I2C FRU format at %s:\n", name);
ret = fru_display(0);
if (ret) {
@ -306,7 +306,7 @@ static int xilinx_read_eeprom_single(char *name,
debug("%s: i2c memory detected: %s\n", __func__, name);
if (CONFIG_IS_ENABLED(CMD_FRU) && xilinx_detect_fru(buffer))
if (IS_ENABLED(CONFIG_CMD_FRU) && xilinx_detect_fru(buffer))
return xilinx_read_eeprom_fru(dev, name, desc);
if (xilinx_detect_legacy(buffer))
@ -412,14 +412,14 @@ int board_late_init_xilinx(void)
struct xilinx_board_description *desc;
phys_size_t bootm_size = gd->ram_top - gd->ram_base;
if (!CONFIG_IS_ENABLED(MICROBLAZE)) {
if (!IS_ENABLED(CONFIG_MICROBLAZE)) {
ulong scriptaddr;
scriptaddr = env_get_hex("scriptaddr", 0);
ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr);
}
if (CONFIG_IS_ENABLED(ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE))
if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || IS_ENABLED(CONFIG_MICROBLAZE))
bootm_size = min(bootm_size, (phys_size_t)(SZ_512M + SZ_256M));
ret |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET);
@ -481,7 +481,7 @@ int __maybe_unused board_fit_config_name_match(const char *name)
debug("%s: Check %s, default %s\n", __func__, name, board_name);
#if !defined(CONFIG_SPL_BUILD)
if (CONFIG_IS_ENABLED(REGEX)) {
if (IS_ENABLED(CONFIG_REGEX)) {
struct slre slre;
int ret;
@ -501,7 +501,7 @@ int __maybe_unused board_fit_config_name_match(const char *name)
return -1;
}
#if CONFIG_IS_ENABLED(DTB_RESELECT)
#if IS_ENABLED(CONFIG_DTB_RESELECT)
#define MAX_NAME_LENGTH 50
char * __maybe_unused __weak board_name_decode(void)

4
board/xilinx/versal-net/board.c
View file

@ -172,7 +172,7 @@ int board_late_init(void)
return 0;
}
if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG))
if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG))
return 0;
return board_late_init_xilinx();
@ -195,7 +195,7 @@ int dram_init(void)
{
int ret;
if (CONFIG_IS_ENABLED(SYS_MEM_RSVD_FOR_MMU))
if (IS_ENABLED(CONFIG_SYS_MEM_RSVD_FOR_MMU))
ret = fdtdec_setup_mem_size_base();
else
ret = fdtdec_setup_mem_size_base_lowest();

2
board/xilinx/versal/board.c
View file

@ -142,7 +142,7 @@ int board_late_init(void)
return 0;
}
if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG))
if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG))
return 0;
bootmode = versal_get_bootmode();

2
board/xilinx/zynq/board.c
View file

@ -55,7 +55,7 @@ int board_late_init(void)
return 0;
}
if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG))
if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG))
return 0;
switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {

2
board/xilinx/zynqmp/zynqmp.c
View file

@ -405,7 +405,7 @@ int board_late_init(void)
return 0;
}
if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG))
if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG))
return 0;
ret = set_fdtfile();

3
boot/Makefile
View file

@ -30,8 +30,9 @@ obj-$(CONFIG_$(SPL_TPL_)QFW) += bootmeth_qfw.o
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o
obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o
ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL
obj-$(CONFIG_$(SPL_TPL_)CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o
obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o
obj-$(CONFIG_$(SPL_TPL_)EXPO) += bootflow_menu.o
obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o
endif
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o

8
boot/bootm.c
View file

@ -100,7 +100,7 @@ static int bootm_pre_load(struct cmd_tbl *cmdtp, int flag, int argc,
ulong data_addr = bootm_data_addr(argc, argv);
int ret = 0;
if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD))
if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD))
ret = image_pre_load(data_addr);
if (ret)
@ -226,7 +226,7 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc,
}
if (images.os.type == IH_TYPE_KERNEL_NOLOAD) {
if (CONFIG_IS_ENABLED(CMD_BOOTI) &&
if (IS_ENABLED(CONFIG_CMD_BOOTI) &&
images.os.arch == IH_ARCH_ARM64) {
ulong image_addr;
ulong image_size;
@ -313,7 +313,7 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start,
return 1;
}
if (CONFIG_IS_ENABLED(CMD_FDT))
if (IS_ENABLED(CONFIG_CMD_FDT))
set_working_fdt_addr(map_to_sysmem(images.ft_addr));
#endif
@ -893,7 +893,7 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc,
&fit_uname_config,
&fit_uname_kernel);
if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD))
if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD))
img_addr += image_load_offset;
bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC);

2
boot/image-board.c
View file

@ -927,7 +927,7 @@ int image_setup_linux(struct bootm_headers *images)
int ret;
/* This function cannot be called without lmb support */
if (!CONFIG_IS_ENABLED(LMB))
if (!IS_ENABLED(CONFIG_LMB))
return -EFAULT;
if (CONFIG_IS_ENABLED(OF_LIBFDT))
boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree);

4
boot/image-fdt.c
View file

@ -272,7 +272,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
*of_flat_tree = of_start;
*of_size = of_len;
if (CONFIG_IS_ENABLED(CMD_FDT))
if (IS_ENABLED(CONFIG_CMD_FDT))
set_working_fdt_addr(map_to_sysmem(*of_flat_tree));
return 0;
@ -638,7 +638,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob,
/* Update ethernet nodes */
fdt_fixup_ethernet(blob);
#if CONFIG_IS_ENABLED(CMD_PSTORE)
#if IS_ENABLED(CONFIG_CMD_PSTORE)
/* Append PStore configuration */
fdt_fixup_pstore(blob);
#endif

4
cmd/bootcount.c
View file

@ -46,7 +46,7 @@ static int do_bootcount(struct cmd_tbl *cmdtp, int flag, int argc,
return CMD_RET_USAGE;
}
#if CONFIG_IS_ENABLED(SYS_LONGHELP)
#if IS_ENABLED(CONFIG_SYS_LONGHELP)
static char bootcount_help_text[] =
"print - print current bootcounter\n"
"reset - reset the bootcounter"
@ -55,7 +55,7 @@ static char bootcount_help_text[] =
U_BOOT_CMD(bootcount, 2, 1, do_bootcount,
"bootcount",
#if CONFIG_IS_ENABLED(SYS_LONGHELP)
#if IS_ENABLED(CONFIG_SYS_LONGHELP)
bootcount_help_text
#endif
);

4
cmd/bootmenu.c
View file

@ -223,7 +223,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu,
return 1;
}
#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG))
#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (IS_ENABLED(CONFIG_CMD_EFICONFIG))
/**
* prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries
*
@ -343,7 +343,7 @@ static struct bootmenu_data *bootmenu_create(int delay)
if (ret < 0)
goto cleanup;
#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG))
#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (IS_ENABLED(CONFIG_CMD_EFICONFIG))
if (i < MAX_COUNT - 1) {
efi_status_t efi_ret;

2
cmd/cls.c
View file

@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc,
/* Send clear screen and home */
printf(CSI "2J" CSI "1;1H");
if (CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) {
if (IS_ENABLED(CONFIG_VIDEO) && !IS_ENABLED(CONFIG_VIDEO_ANSI)) {
if (uclass_first_device_err(UCLASS_VIDEO, &dev))
return CMD_RET_FAILURE;
if (video_clear(dev))

2
cmd/cpu.c
View file

@ -83,7 +83,7 @@ static int do_cpu_detail(struct cmd_tbl *cmdtp, int flag, int argc,
return 0;
}
#if CONFIG_IS_ENABLED(SYS_LONGHELP)
#if IS_ENABLED(CONFIG_SYS_LONGHELP)
static char cpu_help_text[] =
"list - list available CPUs\n"
"cpu detail - show CPU detail"

2
cmd/dm.c
View file

@ -84,7 +84,7 @@ static int do_dm_dump_uclass(struct cmd_tbl *cmdtp, int flag, int argc,
#define DM_MEM
#endif
#if CONFIG_IS_ENABLED(SYS_LONGHELP)
#if IS_ENABLED(CONFIG_SYS_LONGHELP)
static char dm_help_text[] =
"compat Dump list of drivers with compatibility strings\n"
"dm devres Dump list of device resources for each device\n"

2
cmd/eficonfig.c
View file

@ -2670,7 +2670,7 @@ static const struct eficonfig_item maintenance_menu_items[] = {
{"Edit Boot Option", eficonfig_process_edit_boot_option},
{"Change Boot Order", eficonfig_process_change_boot_order},
{"Delete Boot Option", eficonfig_process_delete_boot_option},
#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && CONFIG_IS_ENABLED(EFI_MM_COMM_TEE))
#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && IS_ENABLED(CONFIG_EFI_MM_COMM_TEE))
{"Secure Boot Configuration", eficonfig_process_secure_boot_config},
#endif
{"Quit", eficonfig_process_quit},

4
cmd/fastboot.c
View file

@ -21,7 +21,7 @@ static int do_fastboot_udp(int argc, char *const argv[],
{
int err;
if (!CONFIG_IS_ENABLED(UDP_FUNCTION_FASTBOOT)) {
if (!IS_ENABLED(CONFIG_UDP_FUNCTION_FASTBOOT)) {
pr_err("Fastboot UDP not enabled\n");
return CMD_RET_FAILURE;
}
@ -44,7 +44,7 @@ static int do_fastboot_usb(int argc, char *const argv[],
char *endp;
int ret;
if (!CONFIG_IS_ENABLED(USB_FUNCTION_FASTBOOT)) {
if (!IS_ENABLED(CONFIG_USB_FUNCTION_FASTBOOT)) {
pr_err("Fastboot USB not enabled\n");
return CMD_RET_FAILURE;
}

6
cmd/net.c
View file

@ -280,7 +280,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[])
switch (argc) {
case 1:
if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT)
if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT)
return 1;
/* refresh bootfile name from env */
@ -289,7 +289,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[])
break;
case 2:
if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT)
if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT)
return 1;
/*
* Only one arg - accept two forms:
@ -311,7 +311,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[])
break;
case 3:
if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) {
if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) {
if (parse_addr_size(argv))
return 1;
} else {

2
cmd/nvedit.c
View file

@ -231,7 +231,7 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag)
debug("Initial value for argc=%d\n", argc);
#if CONFIG_IS_ENABLED(CMD_NVEDIT_EFI)
#if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_CMD_NVEDIT_EFI)
if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'e')
return do_env_set_efi(NULL, flag, --argc, ++argv);
#endif

2
cmd/ti/pd.c
View file

@ -177,7 +177,7 @@ static int ti_do_pd(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv
U_BOOT_CMD(pd, 4, 1, ti_do_pd,
"TI power domain control",
#if CONFIG_IS_ENABLED(SYS_LONGHELP)
#if IS_ENABLED(CONFIG_SYS_LONGHELP)
"dump - show power domain status\n"
"enable [psc] [lpsc] - enable power domain\n"
"disable [psc] [lpsc] - disable power domain\n"

8
common/board_r.c
View file

@ -155,7 +155,7 @@ static int initr_reloc_global_data(void)
* The fdt_blob needs to be moved to new relocation address
* incase of FDT blob is embedded with in image
*/
if (CONFIG_IS_ENABLED(OF_EMBED) && CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC))
if (IS_ENABLED(CONFIG_OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
gd->fdt_blob += gd->reloc_off;
#ifdef CONFIG_EFI_LOADER
@ -452,8 +452,8 @@ static int initr_env(void)
env_set_hex("fdtcontroladdr",
(unsigned long)map_to_sysmem(gd->fdt_blob));
#if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \
CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR))
#if (IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR) || \
IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR))
save_prev_bl_data();
#endif
@ -609,7 +609,7 @@ static init_fnc_t init_sequence_r[] = {
*/
#endif
initr_reloc_global_data,
#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT)
#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT)
event_manual_reloc,
#endif
#if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)

2
common/cli.c
View file

@ -31,7 +31,7 @@
*/
int run_command(const char *cmd, int flag)
{
#if !CONFIG_IS_ENABLED(HUSH_PARSER)
#if !IS_ENABLED(CONFIG_HUSH_PARSER)
/*
* cli_run_command can return 0 or 1 for success, so clean up
* its result.

2
common/event.c
View file

@ -155,7 +155,7 @@ void event_show_spy_list(void)
}
}
#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC)
#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)
int event_manual_reloc(void)
{
struct evspy_info *spy, *end;

2
common/fdt_simplefb.c
View file

@ -82,7 +82,7 @@ int fdt_simplefb_enable_existing_node(void *blob)
return fdt_simplefb_configure_node(blob, off);
}
#if CONFIG_IS_ENABLED(VIDEO)
#if IS_ENABLED(CONFIG_VIDEO)
int fdt_simplefb_enable_and_mem_rsv(void *blob)
{
struct fdt_memory mem;

4
common/hash.c
View file

@ -326,8 +326,8 @@ static struct hash_algo hash_algo[] = {
};
/* Try to minimize code size for boards that don't want much hashing */
#if CONFIG_IS_ENABLED(SHA256) || CONFIG_IS_ENABLED(CMD_SHA1SUM) || \
CONFIG_IS_ENABLED(CRC32_VERIFY) || CONFIG_IS_ENABLED(CMD_HASH) || \
#if CONFIG_IS_ENABLED(SHA256) || IS_ENABLED(CONFIG_CMD_SHA1SUM) || \
CONFIG_IS_ENABLED(CRC32_VERIFY) || IS_ENABLED(CONFIG_CMD_HASH) || \
CONFIG_IS_ENABLED(SHA384) || CONFIG_IS_ENABLED(SHA512)
#define multi_hash() 1
#else

2
common/splash.c
View file

@ -89,7 +89,7 @@ static inline int splash_video_logo_load(void) { return -ENOSYS; }
__weak int splash_screen_prepare(void)
{
if (CONFIG_IS_ENABLED(SPLASH_SOURCE))
if (IS_ENABLED(CONFIG_SPLASH_SOURCE))
return splash_source_load(default_splash_locations,
ARRAY_SIZE(default_splash_locations));

2
disk/part_dos.c
View file

@ -318,7 +318,7 @@ int is_valid_dos_buf(void *buf)
return test_block_type(buf) == DOS_MBR ? 0 : -1;
}
#if CONFIG_IS_ENABLED(CMD_MBR)
#if IS_ENABLED(CONFIG_CMD_MBR)
static void lba_to_chs(lbaint_t lba, unsigned char *rc, unsigned char *rh,
unsigned char *rs)
{

2
disk/part_efi.c
View file

@ -242,7 +242,7 @@ void part_print_efi(struct blk_desc *dev_desc)
print_efiname(&gpt_pte[i]));
printf("\tattrs:\t0x%016llx\n", gpt_pte[i].attributes.raw);
uuid = (unsigned char *)gpt_pte[i].partition_type_guid.b;
if (CONFIG_IS_ENABLED(PARTITION_TYPE_GUID))
if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID))
printf("\ttype:\t%pUl\n\t\t(%pUs)\n", uuid, uuid);
else
printf("\ttype:\t%pUl\n", uuid);

4
drivers/clk/clk-divider.c
View file

@ -81,7 +81,7 @@ static ulong clk_divider_recalc_rate(struct clk *clk)
unsigned long parent_rate = clk_get_parent_rate(clk);
unsigned int val;
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
val = divider->io_divider_val;
#else
val = readl(divider->reg);
@ -210,7 +210,7 @@ static struct clk *_register_divider(struct device *dev, const char *name,
div->width = width;
div->flags = clk_divider_flags;
div->table = table;
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
div->io_divider_val = *(u32 *)reg;
#endif

6
drivers/clk/clk-gate.c
View file

@ -62,7 +62,7 @@ static void clk_gate_endisable(struct clk *clk, int enable)
if (set)
reg |= BIT(gate->bit_idx);
} else {
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
reg = gate->io_gate_val;
#else
reg = readl(gate->reg);
@ -96,7 +96,7 @@ int clk_gate_is_enabled(struct clk *clk)
struct clk_gate *gate = to_clk_gate(clk);
u32 reg;
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
reg = gate->io_gate_val;
#else
reg = readl(gate->reg);
@ -142,7 +142,7 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
gate->reg = reg;
gate->bit_idx = bit_idx;
gate->flags = clk_gate_flags;
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
gate->io_gate_val = *(u32 *)reg;
#endif

8
drivers/clk/clk-mux.c
View file

@ -90,7 +90,7 @@ u8 clk_mux_get_parent(struct clk *clk)
struct clk_mux *mux = to_clk_mux(clk);
u32 val;
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
val = mux->io_mux_val;
#else
val = readl(mux->reg);
@ -137,7 +137,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent)
if (mux->flags & CLK_MUX_HIWORD_MASK) {
reg = mux->mask << (mux->shift + 16);
} else {
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
reg = mux->io_mux_val;
#else
reg = readl(mux->reg);
@ -146,7 +146,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent)
}
val = val << mux->shift;
reg |= val;
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
mux->io_mux_val = reg;
#else
writel(reg, mux->reg);
@ -194,7 +194,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name,
mux->mask = mask;
mux->flags = clk_mux_flags;
mux->table = table;
#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF)
#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF)
mux->io_mux_val = *(u32 *)reg;
#endif

6
drivers/clk/clk_k210.c
View file

@ -308,7 +308,7 @@ enum k210_clk_flags {
* @gate: An &enum k210_gate_id of this clock's gate
*/
struct k210_clk_params {
#if CONFIG_IS_ENABLED(CMD_CLK)
#if IS_ENABLED(CONFIG_CMD_CLK)
const char *name;
#endif
u8 flags;
@ -326,7 +326,7 @@ struct k210_clk_params {
};
static const struct k210_clk_params k210_clks[] = {
#if CONFIG_IS_ENABLED(CMD_CLK)
#if IS_ENABLED(CONFIG_CMD_CLK)
#define NAME(_name) .name = (_name),
#else
#define NAME(name)
@ -1284,7 +1284,7 @@ U_BOOT_DRIVER(k210_clk) = {
.priv_auto = sizeof(struct k210_clk_priv),
};
#if CONFIG_IS_ENABLED(CMD_CLK)
#if IS_ENABLED(CONFIG_CMD_CLK)
static char show_enabled(struct k210_clk_priv *priv, int id)
{
bool enabled;

2
drivers/clk/imx/clk-imx8.c
View file

@ -42,7 +42,7 @@ static int imx8_clk_enable(struct clk *clk)
return __imx8_clk_enable(clk, 1);
}
#if CONFIG_IS_ENABLED(CMD_CLK)
#if IS_ENABLED(CONFIG_CMD_CLK)
int soc_clk_dump(void)
{
struct udevice *dev;

2
drivers/clk/imx/clk-imx8.h
View file

@ -9,7 +9,7 @@ struct imx8_clks {
const char *name;
};
#if CONFIG_IS_ENABLED(CMD_CLK)
#if IS_ENABLED(CONFIG_CMD_CLK)
extern struct imx8_clks imx8_clk_names[];
extern int num_clks;
#endif

2
drivers/clk/imx/clk-imx8qm.c
View file

@ -16,7 +16,7 @@
#include "clk-imx8.h"
#if CONFIG_IS_ENABLED(CMD_CLK)
#if IS_ENABLED(CONFIG_CMD_CLK)
struct imx8_clks imx8_clk_names[] = {
{ IMX8QM_A53_DIV, "A53_DIV" },
{ IMX8QM_UART0_CLK, "UART0" },

2
drivers/clk/imx/clk-imx8qxp.c
View file

@ -16,7 +16,7 @@
#include "clk-imx8.h"
#if CONFIG_IS_ENABLED(CMD_CLK)
#if IS_ENABLED(CONFIG_CMD_CLK)
struct imx8_clks imx8_clk_names[] = {
{ IMX8QXP_A35_DIV, "A35_DIV" },
{ IMX8QXP_I2C0_CLK, "I2C0" },

2
drivers/crypto/aspeed/aspeed_hace.c
View file

@ -288,7 +288,7 @@ static int aspeed_hace_digest_wd(struct udevice *dev, enum HASH_ALGO algo,
if (rc)
return rc;
if (CONFIG_IS_ENABLED(HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) {
if (IS_ENABLED(CONFIG_HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) {
cur = ibuf;
end = ibuf + ilen;

2
drivers/crypto/hash/hash_sw.c
View file

@ -244,7 +244,7 @@ static int sw_hash_digest_wd(struct udevice *dev, enum HASH_ALGO algo,
if (rc)
return rc;
if (CONFIG_IS_ENABLED(HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) {
if (IS_ENABLED(CONFIG_HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) {
cur = ibuf;
end = ibuf + ilen;

8
drivers/fastboot/fb_command.c
View file

@ -295,11 +295,11 @@ void fastboot_data_complete(char *response)
*/
static void __maybe_unused flash(char *cmd_parameter, char *response)
{
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC))
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC))
fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr,
image_size, response);
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND))
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND))
fastboot_nand_flash_write(cmd_parameter, fastboot_buf_addr,
image_size, response);
}
@ -315,10 +315,10 @@ static void __maybe_unused flash(char *cmd_parameter, char *response)
*/
static void __maybe_unused erase(char *cmd_parameter, char *response)
{
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC))
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC))
fastboot_mmc_erase(cmd_parameter, response);
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND))
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND))
fastboot_nand_erase(cmd_parameter, response);
}

2
drivers/fastboot/fb_common.c
View file

@ -99,7 +99,7 @@ int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
const int mmc_dev = config_opt_enabled(CONFIG_FASTBOOT_FLASH_MMC,
CONFIG_FASTBOOT_FLASH_MMC_DEV, -1);
if (!CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC))
if (!IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC))
return -EINVAL;
if (reason >= FASTBOOT_REBOOT_REASONS_COUNT)

10
drivers/fastboot/fb_getvar.c
View file

@ -57,17 +57,17 @@ static const struct {
}, {
.variable = "current-slot",
.dispatch = getvar_current_slot
#if CONFIG_IS_ENABLED(FASTBOOT_FLASH)
#if IS_ENABLED(CONFIG_FASTBOOT_FLASH)
}, {
.variable = "has-slot",
.dispatch = getvar_has_slot
#endif
#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)
#if IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)
}, {
.variable = "partition-type",
.dispatch = getvar_partition_type
#endif
#if CONFIG_IS_ENABLED(FASTBOOT_FLASH)
#if IS_ENABLED(CONFIG_FASTBOOT_FLASH)
}, {
.variable = "partition-size",
.dispatch = getvar_partition_size
@ -99,12 +99,12 @@ static int getvar_get_part_info(const char *part_name, char *response,
struct disk_partition disk_part;
struct part_info *part_info;
if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) {
if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) {
r = fastboot_mmc_get_part_info(part_name, &dev_desc, &disk_part,
response);
if (r >= 0 && size)
*size = disk_part.size * disk_part.blksz;
} else if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) {
} else if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) {
r = fastboot_nand_get_part_info(part_name, &part_info, response);
if (r >= 0 && size)
*size = part_info->size;

2
drivers/fastboot/fb_mmc.c
View file

@ -588,7 +588,7 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
}
#endif
#if CONFIG_IS_ENABLED(FASTBOOT_MMC_USER_SUPPORT)
#if IS_ENABLED(CONFIG_FASTBOOT_MMC_USER_SUPPORT)
if (strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) {
dev_desc = fastboot_mmc_get_dev(response);
if (!dev_desc)

4
drivers/i2c/mxc_i2c.c
View file

@ -744,7 +744,7 @@ void bus_i2c_init(int index, int speed, int unused,
return;
}
if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
if (i2c_fused((ulong)mxc_i2c_buses[index].base)) {
printf("SoC fuse indicates I2C@0x%lx is unavailable.\n",
(ulong)mxc_i2c_buses[index].base);
@ -878,7 +878,7 @@ static int mxc_i2c_probe(struct udevice *bus)
if (addr == FDT_ADDR_T_NONE)
return -EINVAL;
if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
if (i2c_fused((ulong)addr)) {
printf("SoC fuse indicates I2C@0x%lx is unavailable.\n",
(ulong)addr);

2
drivers/misc/fsl_ifc.c
View file

@ -371,7 +371,7 @@ void init_early_memctl_regs(void)
for (i = 0 ; i < regs_info.cs_size; i++) {
if (regs[i].pr && (regs[i].pr & CSPR_V)) {
/* skip setting cspr/csor_ext in below condition */
if (!(CONFIG_IS_ENABLED(A003399_NOR_WORKAROUND) &&
if (!(IS_ENABLED(CONFIG_A003399_NOR_WORKAROUND) &&
i == 0 &&
((regs[0].pr & CSPR_MSEL) == CSPR_MSEL_NOR))) {
if (regs[i].pr_ext)

2
drivers/mmc/Makefile
View file

@ -46,7 +46,7 @@ obj-$(CONFIG_MMC_MXS) += mxsmmc.o
obj-$(CONFIG_MMC_OCTEONTX) += octeontx_hsmmc.o
obj-$(CONFIG_MMC_OWL) += owl_mmc.o
obj-$(CONFIG_MMC_PCI) += pci_mmc.o
obj-$(CONFIG_$(SPL_TPL_)SUPPORT_EMMC_RPMB) += rpmb.o
obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o
obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o
obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o
obj-$(CONFIG_SH_SDHI) += sh_sdhi.o

2
drivers/mmc/tmio-common.h
View file

@ -140,7 +140,7 @@ struct tmio_sd_priv {
struct clk clk;
struct clk clkh;
#endif
#if CONFIG_IS_ENABLED(RENESAS_SDHI)
#if IS_ENABLED(CONFIG_RENESAS_SDHI)
unsigned int smpcmp;
u8 tap_set;
u8 tap_num;

2
drivers/net/fec_mxc.c
View file

@ -1205,7 +1205,7 @@ static int fecmxc_probe(struct udevice *dev)
uint32_t start;
int ret;
if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) {
if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) {
if (enet_fused((ulong)priv->eth)) {
printf("SoC fuse indicates Ethernet@0x%lx is unavailable.\n", (ulong)priv->eth);
return -ENODEV;

Some files were not shown because too many files have changed in this diff Show more