diff options
| author | Kory Maincent <kory.maincent@bootlin.com> | 2021-02-02 16:42:28 +0100 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2021-02-03 23:16:36 +0800 |
| commit | ff0287ec28504f2c1230739a71b6139cd45d34de (patch) | |
| tree | 6b86d3ef74e47b4f0633afab8ebb9a42c197d006 /cmd | |
| parent | d3a3d44fe2c1ca1710fb4599504332675c0ce966 (diff) | |
| download | u-boot-ff0287ec28504f2c1230739a71b6139cd45d34de.tar.gz u-boot-ff0287ec28504f2c1230739a71b6139cd45d34de.tar.bz2 u-boot-ff0287ec28504f2c1230739a71b6139cd45d34de.zip | |
cmd: pxe_utils: Replace ifdef by IS_ENABLED
Replace all the macro ifdef by IS_ENABLED.
All of these configs are set in the defconfig files and not in the
include board headers files.
Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: keep the preprocessor case unchanged]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/pxe_utils.c | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 3526a651d7..81150b162b 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -492,16 +492,16 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) env_get("gatewayip"), env_get("netmask")); } -#ifdef CONFIG_CMD_NET - if (label->ipappend & 0x2) { - int err; - - strcpy(mac_str, " BOOTIF="); - err = format_mac_pxe(mac_str + 8, sizeof(mac_str) - 8); - if (err < 0) - mac_str[0] = '\0'; + if (IS_ENABLED(CONFIG_CMD_NET)) { + if (label->ipappend & 0x2) { + int err; + + strcpy(mac_str, " BOOTIF="); + err = format_mac_pxe(mac_str + 8, sizeof(mac_str) - 8); + if (err < 0) + mac_str[0] = '\0'; + } } -#endif if ((label->ipappend & 0x3) || label->append) { char bootargs[CONFIG_SYS_CBSIZE] = ""; @@ -649,15 +649,13 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) /* Try bootm for legacy and FIT format image */ if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID) do_bootm(cmdtp, 0, bootm_argc, bootm_argv); -#ifdef CONFIG_CMD_BOOTI /* Try booting an AArch64 Linux kernel image */ - else + else if (IS_ENABLED(CONFIG_CMD_BOOTI)) do_booti(cmdtp, 0, bootm_argc, bootm_argv); -#elif defined(CONFIG_CMD_BOOTZ) /* Try booting a Image */ - else + else if (IS_ENABLED(CONFIG_CMD_BOOTZ)) do_bootz(cmdtp, 0, bootm_argc, bootm_argv); -#endif + unmap_sysmem(buf); cleanup: @@ -1424,20 +1422,20 @@ void handle_pxe_menu(struct cmd_tbl *cmdtp, struct pxe_menu *cfg) struct menu *m; int err; -#ifdef CONFIG_CMD_BMP - /* display BMP if available */ - if (cfg->bmp) { - if (get_relfile(cmdtp, cfg->bmp, image_load_addr)) { - if (CONFIG_IS_ENABLED(CMD_CLS)) - run_command("cls", 0); - bmp_display(image_load_addr, - BMP_ALIGN_CENTER, BMP_ALIGN_CENTER); - } else { - printf("Skipping background bmp %s for failure\n", - cfg->bmp); + if (IS_ENABLED(CONFIG_CMD_BMP)) { + /* display BMP if available */ + if (cfg->bmp) { + if (get_relfile(cmdtp, cfg->bmp, image_load_addr)) { + if (CONFIG_IS_ENABLED(CMD_CLS)) + run_command("cls", 0); + bmp_display(image_load_addr, + BMP_ALIGN_CENTER, BMP_ALIGN_CENTER); + } else { + printf("Skipping background bmp %s for failure\n", + cfg->bmp); + } } } -#endif m = pxe_menu_to_menu(cfg); if (!m) |