Hi Kory,
On Tue, 2 Feb 2021 at 08:42, Kory Maincent <kory.mainc...@bootlin.com> wrote:
>
> 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.mainc...@bootlin.com>
> ---
>
> Change since v4:
> - Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible
>
> cmd/pxe_utils.c | 52 ++++++++++++++++++++++++-------------------------
> 1 file changed, 25 insertions(+), 27 deletions(-)
>
> diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
> index 3526a651d7..e062c9edcf 100644
> --- a/cmd/pxe_utils.c
> +++ b/cmd/pxe_utils.c
> @@ -340,7 +340,7 @@ static int label_localboot(struct pxe_label *label)
> /*
> * Loads fdt overlays specified in 'fdtoverlays'.
> */
> -#ifdef CONFIG_OF_LIBFDT_OVERLAY
> +#if (IS_ENABLED(CONFIG_OF_LIBFDT_OVERLAY))
> static void label_boot_fdtoverlay(struct cmd_tbl *cmdtp, struct pxe_label
> *label)
> {
> char *fdtoverlay = label->fdtoverlays;
> @@ -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;
> + 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';
> + 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] = "";
> @@ -626,7 +626,7 @@ static int label_boot(struct cmd_tbl *cmdtp, struct
> pxe_label *label)
> }
> }
>
> -#ifdef CONFIG_OF_LIBFDT_OVERLAY
> +#if IS_ENABLED(CONFIG_OF_LIBFDT_OVERLAY)
There is actually no point in doing that...just leave it as it is.
IS_ENABLED() is useful when we can move things to the compiler instead
of the preprocessor.
> if (label->fdtoverlays)
> label_boot_fdtoverlay(cmdtp, label);
> #endif
> @@ -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)
> --
> 2.17.1
>
Regards,
Simon
