mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
x86: zimage: Avoid using #ifdef
Use IS_ENABLED() instead of #ifdef in this file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
e814837488
commit
30b372d419
@ -303,21 +303,17 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
|
|||||||
build_command_line(cmd_line, auto_boot);
|
build_command_line(cmd_line, auto_boot);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_INTEL_MID
|
if (IS_ENABLED(CONFIG_INTEL_MID) && bootproto >= 0x0207)
|
||||||
if (bootproto >= 0x0207)
|
|
||||||
hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
|
hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_GENERATE_ACPI_TABLE
|
if (IS_ENABLED(CONFIG_GENERATE_ACPI_TABLE))
|
||||||
setup_base->acpi_rsdp_addr = acpi_get_rsdp_addr();
|
setup_base->acpi_rsdp_addr = acpi_get_rsdp_addr();
|
||||||
#endif
|
|
||||||
|
|
||||||
setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
|
setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
|
||||||
setup_video(&setup_base->screen_info);
|
setup_video(&setup_base->screen_info);
|
||||||
|
|
||||||
#ifdef CONFIG_EFI_STUB
|
if (IS_ENABLED(CONFIG_EFI_STUB))
|
||||||
setup_efi_info(&setup_base->efi_info);
|
setup_efi_info(&setup_base->efi_info);
|
||||||
#endif
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user