From: Simon Glass <sjg@chromium.org>
Date: Tue, 27 Nov 2012 21:08:12 +0000 (+0000)
Subject: x86: Remove coreboot start16 code
X-Git-Tag: v2013.01-rc2~103^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd23e6923f371b16b9ee9f115d15c9dd46c2f558;p=platform%2Fkernel%2Fu-boot.git

x86: Remove coreboot start16 code

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>
---

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 8d3c21f..12d1016 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