diff options
| author | Tom Rini <[email protected]> | 2020-09-01 11:02:54 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-09-01 11:02:54 -0400 |
| commit | 502f0489f125bfa52a9e0cc70bf8efb1117dfe05 (patch) | |
| tree | 64d087622c51919c67cfe02b4fbf52594f1d7c37 /arch | |
| parent | 23e333a5c083a000d0cabc53f7c0d261bae9e5ca (diff) | |
| parent | 1150a0b6bd70084eb5c8b9ecfc60100cb7a768e2 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Fix parsing of "mtrr list" command
- Introduce USE_EARLY_BOARD_INIT option and remove dead codes for most
x86 boards
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 3 | ||||
| -rw-r--r-- | arch/x86/cpu/start.S | 3 | ||||
| -rw-r--r-- | arch/x86/include/asm/acpi_nhlt.h | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a34b108fffa..76276c60274 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -203,6 +203,9 @@ config SPL_X86_32BIT_INIT help This is enabled when 32-bit init is in SPL +config USE_EARLY_BOARD_INIT + bool + config RESET_SEG_START hex depends on X86_RESET_VECTOR diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 4ad515ce085..3b6ed37bc07 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -88,6 +88,7 @@ _start: /* Clear the interrupt vectors */ lidt blank_idt_ptr +#ifdef CONFIG_USE_EARLY_BOARD_INIT /* * Critical early platform init - generally not used, we prefer init * to happen later when we have a console, in case something goes @@ -96,6 +97,8 @@ _start: jmp early_board_init .globl early_board_init_ret early_board_init_ret: +#endif + post_code(POST_START) /* Initialise Cache-As-RAM */ diff --git a/arch/x86/include/asm/acpi_nhlt.h b/arch/x86/include/asm/acpi_nhlt.h index 47203213818..2c44196317b 100644 --- a/arch/x86/include/asm/acpi_nhlt.h +++ b/arch/x86/include/asm/acpi_nhlt.h @@ -139,14 +139,6 @@ void nhlt_next_instance(struct nhlt *nhlt, int link_type); /* * Serialize NHLT object to ACPI table. Take in the beginning address of where - * the table will reside and return the address of the next ACPI table. On - * error 0 will be returned. The NHLT object is no longer valid after this - * function is called. - */ -uintptr_t nhlt_serialise(struct nhlt *nhlt, uintptr_t acpi_addr); - -/* - * Serialize NHLT object to ACPI table. Take in the beginning address of where * the table will reside oem_id and oem_table_id and return the address of the * next ACPI table. On error 0 will be returned. The NHLT object is no longer * valid after this function is called. |