diff options
Diffstat (limited to 'arch/x86/lib')
32 files changed, 53 insertions, 9 deletions
diff --git a/arch/x86/lib/acpi.c b/arch/x86/lib/acpi.c index 7431458dcf..155fffabf0 100644 --- a/arch/x86/lib/acpi.c +++ b/arch/x86/lib/acpi.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <log.h> #include <acpi/acpi_table.h> #include <asm/io.h> #include <asm/tables.h> diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 13f1409de8..6985ef4ba5 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -9,6 +9,7 @@ #include <common.h> #include <cpu.h> #include <dm.h> +#include <log.h> #include <dm/uclass-internal.h> #include <mapmem.h> #include <serial.h> diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index 30c0997fd0..3ab432e262 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -8,6 +8,7 @@ #include <common.h> #include <bios_emul.h> #include <irq_func.h> +#include <log.h> #include <vbe.h> #include <linux/linkage.h> #include <asm/cache.h> diff --git a/arch/x86/lib/bios_interrupts.c b/arch/x86/lib/bios_interrupts.c index fdd966b2c8..d6b4da7e25 100644 --- a/arch/x86/lib/bios_interrupts.c +++ b/arch/x86/lib/bios_interrupts.c @@ -8,6 +8,7 @@ */ #include <common.h> +#include <log.h> #include <asm/pci.h> #include "bios_emul.h" diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 07d8f1f279..acc15cf2e0 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -8,8 +8,10 @@ */ #include <common.h> +#include <bootstage.h> #include <command.h> #include <hang.h> +#include <log.h> #include <dm/device.h> #include <dm/root.h> #include <errno.h> @@ -205,8 +207,8 @@ static int boot_jump_linux(bootm_headers_t *images) images->os.arch == IH_ARCH_X86_64); } -int do_bootm_linux(int flag, int argc, char * const argv[], - bootm_headers_t *images) +int do_bootm_linux(int flag, int argc, char *const argv[], + bootm_headers_t *images) { /* No need for those on x86 */ if (flag & BOOTM_STATE_OS_BD_T || flag & BOOTM_STATE_OS_CMDLINE) diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c index 9fce021c79..baaf3d13ad 100644 --- a/arch/x86/lib/cmd_boot.c +++ b/arch/x86/lib/cmd_boot.c @@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR; unsigned long do_go_exec(ulong (*entry)(int, char * const []), - int argc, char * const argv[]) + int argc, char *const argv[]) { unsigned long ret = 0; char **argv_tmp; diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index c996fc588d..331c1b7e5a 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.c @@ -5,6 +5,7 @@ #include <common.h> #include <malloc.h> +#include <net.h> #include <vbe.h> #include <acpi/acpi_s3.h> #include <asm/coreboot_tables.h> diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 267527eb34..cf32b3e512 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -7,6 +7,8 @@ #include <cpu_func.h> #include <dm.h> #include <errno.h> +#include <init.h> +#include <log.h> #include <rtc.h> #include <acpi/acpi_s3.h> #include <asm/cmos_layout.h> diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index 15e82de2fe..ad5a0f79ad 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -6,6 +6,7 @@ #include <common.h> #include <handoff.h> #include <init.h> +#include <log.h> #include <asm/fsp/fsp_support.h> #include <asm/e820.h> #include <asm/mrccache.h> diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index 98b762209f..70224c1a48 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -5,6 +5,8 @@ #include <common.h> #include <dm.h> +#include <init.h> +#include <log.h> #include <vbe.h> #include <video.h> #include <asm/fsp/fsp_support.h> diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp/fsp_support.c index ee228117d1..fd4d98ef62 100644 --- a/arch/x86/lib/fsp/fsp_support.c +++ b/arch/x86/lib/fsp/fsp_support.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <log.h> #include <asm/fsp/fsp_support.h> #include <asm/post.h> diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c index 0a726807c2..43d32b7abe 100644 --- a/arch/x86/lib/fsp1/fsp_common.c +++ b/arch/x86/lib/fsp1/fsp_common.c @@ -6,6 +6,8 @@ #include <common.h> #include <dm.h> #include <errno.h> +#include <init.h> +#include <log.h> #include <malloc.h> #include <rtc.h> #include <acpi/acpi_s3.h> diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c index 5ef89744b9..e3f9e30f6a 100644 --- a/arch/x86/lib/fsp1/fsp_dram.c +++ b/arch/x86/lib/fsp1/fsp_dram.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <init.h> #include <asm/fsp/fsp_support.h> int dram_init(void) diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c index c7a2c73846..d84c632f14 100644 --- a/arch/x86/lib/fsp1/fsp_support.c +++ b/arch/x86/lib/fsp1/fsp_support.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <log.h> #include <asm/fsp1/fsp_support.h> #include <asm/post.h> diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c index 3869c53c5f..1c82b81831 100644 --- a/arch/x86/lib/fsp2/fsp_dram.c +++ b/arch/x86/lib/fsp2/fsp_dram.c @@ -6,6 +6,8 @@ #include <common.h> #include <handoff.h> +#include <init.h> +#include <log.h> #include <spl.h> #include <acpi/acpi_s3.h> #include <asm/arch/cpu.h> diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c index c7dc2ea257..8c577902b2 100644 --- a/arch/x86/lib/fsp2/fsp_init.c +++ b/arch/x86/lib/fsp2/fsp_init.c @@ -6,9 +6,11 @@ #include <common.h> #include <binman.h> #include <binman_sym.h> +#include <bootstage.h> #include <cbfs.h> #include <dm.h> #include <init.h> +#include <log.h> #include <spi.h> #include <spl.h> #include <spi_flash.h> diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c index bf30c47989..1a758147b0 100644 --- a/arch/x86/lib/fsp2/fsp_meminit.c +++ b/arch/x86/lib/fsp2/fsp_meminit.c @@ -8,6 +8,8 @@ #include <common.h> #include <binman.h> +#include <bootstage.h> +#include <log.h> #include <asm/mrccache.h> #include <asm/fsp/fsp_infoheader.h> #include <asm/fsp2/fsp_api.h> @@ -79,10 +81,10 @@ int fsp_memory_init(bool s3wake, bool use_spi_flash) return log_msg_ret("Could not setup config", ret); debug("SDRAM init..."); - bootstage_start(BOOTSTATE_ID_ACCUM_FSP_M, "fsp-m"); + bootstage_start(BOOTSTAGE_ID_ACCUM_FSP_M, "fsp-m"); func = (fsp_memory_init_func)(hdr->img_base + hdr->fsp_mem_init); ret = func(&upd, &hob); - bootstage_accum(BOOTSTATE_ID_ACCUM_FSP_M); + bootstage_accum(BOOTSTAGE_ID_ACCUM_FSP_M); if (ret) return log_msg_ret("SDRAM init fail\n", ret); diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c index d7ce43e1eb..45c0c7d90b 100644 --- a/arch/x86/lib/fsp2/fsp_silicon_init.c +++ b/arch/x86/lib/fsp2/fsp_silicon_init.c @@ -10,7 +10,9 @@ #include <common.h> #include <binman.h> +#include <bootstage.h> #include <dm.h> +#include <log.h> #include <asm/arch/fsp/fsp_configs.h> #include <asm/arch/fsp/fsp_s_upd.h> #include <asm/fsp/fsp_infoheader.h> @@ -42,10 +44,10 @@ int fsp_silicon_init(bool s3wake, bool use_spi_flash) if (ret) return log_msg_ret("Could not setup config", ret); log_debug("Silicon init..."); - bootstage_start(BOOTSTATE_ID_ACCUM_FSP_S, "fsp-s"); + bootstage_start(BOOTSTAGE_ID_ACCUM_FSP_S, "fsp-s"); func = (fsp_silicon_init_func)(hdr->img_base + hdr->fsp_silicon_init); ret = func(&upd); - bootstage_accum(BOOTSTATE_ID_ACCUM_FSP_S); + bootstage_accum(BOOTSTAGE_ID_ACCUM_FSP_S); if (ret) return log_msg_ret("Silicon init fail\n", ret); log_debug("done\n"); diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c index 0a04b443f7..3f2ca840dc 100644 --- a/arch/x86/lib/fsp2/fsp_support.c +++ b/arch/x86/lib/fsp2/fsp_support.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> +#include <log.h> #include <spi_flash.h> #include <asm/fsp/fsp_support.h> #include <asm/fsp2/fsp_internal.h> diff --git a/arch/x86/lib/i8259.c b/arch/x86/lib/i8259.c index 358cd1e70d..a0e3c09257 100644 --- a/arch/x86/lib/i8259.c +++ b/arch/x86/lib/i8259.c @@ -14,6 +14,7 @@ */ #include <common.h> +#include <log.h> #include <asm/io.h> #include <asm/i8259.h> #include <asm/ibmpc.h> diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index b23b8fd402..a81e429110 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -30,6 +30,7 @@ */ #include <common.h> +#include <command.h> #include <irq_func.h> #include <asm/interrupt.h> @@ -127,7 +128,7 @@ void do_irq(int hw_irq) #endif #if defined(CONFIG_CMD_IRQ) -int do_irqinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_irqinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { #if !CONFIG_IS_ENABLED(X86_64) int irq; diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index b5ad1135a6..1c49c41b31 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -10,6 +10,7 @@ #include <dm.h> #include <errno.h> #include <fdtdec.h> +#include <log.h> #include <asm/cpu.h> #include <asm/irq.h> #include <asm/ioapic.h> diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c index d1c44f290c..21c71e036e 100644 --- a/arch/x86/lib/mrccache.c +++ b/arch/x86/lib/mrccache.c @@ -10,6 +10,7 @@ #include <dm.h> #include <errno.h> #include <fdtdec.h> +#include <log.h> #include <malloc.h> #include <net.h> #include <spi.h> diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c index c3c709ec07..4578046169 100644 --- a/arch/x86/lib/physmem.c +++ b/arch/x86/lib/physmem.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <log.h> #include <physmem.h> #include <asm/cpu.h> #include <linux/compiler.h> diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c index 5868d5b60a..482599478b 100644 --- a/arch/x86/lib/pinctrl_ich6.c +++ b/arch/x86/lib/pinctrl_ich6.c @@ -7,6 +7,7 @@ #include <dm.h> #include <errno.h> #include <fdtdec.h> +#include <log.h> #include <pch.h> #include <pci.h> #include <asm/cpu.h> diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c index 17bd2fcb9b..eb6a7d96de 100644 --- a/arch/x86/lib/pirq_routing.c +++ b/arch/x86/lib/pirq_routing.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <log.h> #include <pci.h> #include <asm/pci.h> #include <asm/pirq_routing.h> diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c index 08fbe99039..3cd7b1f536 100644 --- a/arch/x86/lib/pmu.c +++ b/arch/x86/lib/pmu.c @@ -8,6 +8,7 @@ #include <syscon.h> #include <asm/cpu.h> #include <asm/pmu.h> +#include <linux/delay.h> #include <linux/errno.h> #include <linux/io.h> diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 4d09e4de42..ecbd0927e0 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -15,6 +15,7 @@ */ #include <common.h> +#include <log.h> #include <relocate.h> #include <asm/u-boot-x86.h> #include <asm/sections.h> diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c index a6f8297e72..d29d701631 100644 --- a/arch/x86/lib/scu.c +++ b/arch/x86/lib/scu.c @@ -15,6 +15,8 @@ #include <syscon.h> #include <asm/cpu.h> #include <asm/scu.h> +#include <linux/bitops.h> +#include <linux/delay.h> #include <linux/errno.h> #include <linux/io.h> #include <linux/kernel.h> diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 212b4d596d..b6f9a70ba7 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -8,7 +8,10 @@ #include <debug_uart.h> #include <dm.h> #include <hang.h> +#include <image.h> +#include <init.h> #include <irq_func.h> +#include <log.h> #include <malloc.h> #include <spl.h> #include <syscon.h> diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c index 34804b53cc..6f7eb43a17 100644 --- a/arch/x86/lib/tpl.c +++ b/arch/x86/lib/tpl.c @@ -7,6 +7,9 @@ #include <debug_uart.h> #include <dm.h> #include <hang.h> +#include <image.h> +#include <init.h> +#include <log.h> #include <spl.h> #include <asm/cpu.h> #include <asm/mtrr.h> diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index ffc09630b7..64d14e8911 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -13,6 +13,7 @@ */ #include <common.h> +#include <command.h> #include <env.h> #include <irq_func.h> #include <malloc.h> @@ -310,7 +311,7 @@ void __setup_pcat_compatibility(void) { } -int do_zboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +int do_zboot(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct boot_params *base_ptr; void *bzImage_addr = NULL; |