boot: Move boot.h from vboot to boot.
It doesn't have anything to do with verified boot directly, so lets move it to
the generic boot directory.
Change-Id: I9e207316f4793985ca7bea3829e3a46fa8918f1b
diff --git a/src/arch/arm/fit.c b/src/arch/arm/fit.c
index 7d47a9b..725e22c 100644
--- a/src/arch/arm/fit.c
+++ b/src/arch/arm/fit.c
@@ -26,8 +26,8 @@
#include "base/cleanup.h"
#include "base/device_tree.h"
#include "base/xalloc.h"
+#include "boot/boot.h"
#include "boot/fit.h"
-#include "vboot/boot.h"
int boot(void *image, char *cmd_line, void *params, void *loader)
{
diff --git a/src/arch/arm/v8/boot.c b/src/arch/arm/v8/boot.c
index 48d7ccd..d6994fd 100644
--- a/src/arch/arm/v8/boot.c
+++ b/src/arch/arm/v8/boot.c
@@ -30,7 +30,7 @@
#include "base/physmem.h"
#include "base/ranges.h"
#include "base/timestamp.h"
-#include "vboot/boot.h"
+#include "boot/boot.h"
static const size_t MaxKernelSize = 64 * MiB;
diff --git a/src/arch/x86/zeropage.c b/src/arch/x86/zeropage.c
index c393d29..73c10fd 100644
--- a/src/arch/x86/zeropage.c
+++ b/src/arch/x86/zeropage.c
@@ -30,9 +30,9 @@
#include "base/fwdb.h"
#include "base/physmem.h"
#include "base/timestamp.h"
+#include "boot/boot.h"
#include "boot/magenta.h"
#include "drivers/framebuffer/framebuffer.h"
-#include "vboot/boot.h"
static void * const ParamsBuff = (void *)(uintptr_t)0x1000;
static void * const CmdLineBuff = (void *)(uintptr_t)0x2000;
diff --git a/src/arch/x86/zimage.c b/src/arch/x86/zimage.c
index 61c3afb..80a1a6c 100644
--- a/src/arch/x86/zimage.c
+++ b/src/arch/x86/zimage.c
@@ -25,7 +25,7 @@
#include <string.h>
#include "arch/x86/zeropage.h"
-#include "vboot/boot.h"
+#include "boot/boot.h"
int boot(void *kernel, char *cmd_line, void *params, void *loader)
{
diff --git a/src/vboot/boot.h b/src/boot/boot.h
similarity index 100%
rename from src/vboot/boot.h
rename to src/boot/boot.h
diff --git a/src/boot/dummy.c b/src/boot/dummy.c
index 775654e..487ac7a 100644
--- a/src/boot/dummy.c
+++ b/src/boot/dummy.c
@@ -20,7 +20,7 @@
* MA 02111-1307 USA
*/
-#include "vboot/boot.h"
+#include "boot/boot.h"
int boot(void *kernel, void *cmd_line, void *params, void *loader)
{
diff --git a/src/net/netboot/netboot.c b/src/net/netboot/netboot.c
index 8f2ca1d..ad97ee1 100644
--- a/src/net/netboot/netboot.c
+++ b/src/net/netboot/netboot.c
@@ -25,6 +25,7 @@
#include <string.h>
#include "base/algorithm.h"
+#include "boot/boot.h"
#include "drivers/net/net.h"
#include "net/netboot/dhcp.h"
#include "net/netboot/netboot.h"
@@ -32,7 +33,6 @@
#include "net/netboot/tftp.h"
#include "net/uip/arp.h"
#include "net/uip/uip.h"
-#include "vboot/boot.h"
static void print_ip_addr(const uip_ipaddr_t *ip)
{
diff --git a/src/vboot/stages.c b/src/vboot/stages.c
index da1f197..afe403e 100644
--- a/src/vboot/stages.c
+++ b/src/vboot/stages.c
@@ -28,13 +28,13 @@
#include "base/xalloc.h"
#include "base/power.h"
#include "base/timestamp.h"
+#include "boot/boot.h"
#include "boot/commandline.h"
#include "drivers/blockdev/blockdev.h"
#include "drivers/board/board.h"
#include "drivers/keyboard/keyboard.h"
#include "module/module.h"
#include "module/symbols.h"
-#include "vboot/boot.h"
#include "vboot/stages.h"
#include "vboot/crossystem/crossystem.h"
#include "vboot/util/commonparams.h"
