Now that coreboot doesn't need the start16 code, remove it. We need to remove the CONFIG_SYS_X86_RESET_VECTOR option from coreboot.h also.
Signed-off-by: Simon Glass sjg@chromium.org --- Changes in v6: - Rename option to CONFIG_X86_NO_RESET_VECTOR
Changes in v5: - Revert back to v2, using CONFIG_NO_RESET_CODE
Changes in v4: - Remove CONFIG_SYS_X86_RESET_VECTOR from coreboot.h
Changes in v3: None Changes in v2: - Add new patch to remove coreboot start16 code.
board/chromebook-x86/coreboot/coreboot_start16.S | 13 ------------- include/configs/coreboot.h | 2 +- 2 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/board/chromebook-x86/coreboot/coreboot_start16.S b/board/chromebook-x86/coreboot/coreboot_start16.S index 9ad06df..6b3d92d 100644 --- a/board/chromebook-x86/coreboot/coreboot_start16.S +++ b/board/chromebook-x86/coreboot/coreboot_start16.S @@ -22,19 +22,6 @@ * MA 02111-1307 USA */
-/* - * 16bit initialization code. - * This code have to map the area of the boot flash - * that is used by U-boot to its final destination. - */ - -.text -.section .start16, "ax" -.code16 -.globl board_init16 -board_init16: - jmp board_init16_ret - .section .bios, "ax" .code16 .globl realmode_reset diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index cc95e2b..057caae 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -37,7 +37,7 @@ #define CONFIG_SYS_COREBOOT #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_LAST_STAGE_INIT - +#define CONFIG_X86_NO_RESET_VECTOR
/*----------------------------------------------------------------------- * Watchdog Configuration