libpayload: Move coreboot_tables.h and sysinfo.h into base/coreboot.

Change-Id: I4303f0675fb8bfb4ddf0d9e62e12912e5863d88e
diff --git a/src/arch/arm/handoff/coreboot.c b/src/arch/arm/handoff/coreboot.c
index 215f198..c86e4ac 100644
--- a/src/arch/arm/handoff/coreboot.c
+++ b/src/arch/arm/handoff/coreboot.c
@@ -25,10 +25,11 @@
  * SUCH DAMAGE.
  */
 
-#include <coreboot_tables.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <sysinfo.h>
+
+#include "base/coreboot/sysinfo.h"
+#include "base/coreboot/tables.h"
 
 static void cb_parse_dma(void *ptr)
 {
diff --git a/src/arch/arm/v7/handoff/coreboot.c b/src/arch/arm/v7/handoff/coreboot.c
index 47e807b..0ad3e20 100644
--- a/src/arch/arm/v7/handoff/coreboot.c
+++ b/src/arch/arm/v7/handoff/coreboot.c
@@ -26,9 +26,9 @@
  */
 
 #include <stdint.h>
-#include <sysinfo.h>
 
 #include "arch/arm/handoff/handoff.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/memory.h"
 
 extern uint32_t handoff_parameter;
diff --git a/src/arch/arm/v8/handoff/coreboot.c b/src/arch/arm/v8/handoff/coreboot.c
index f527ef1..28d25fd 100644
--- a/src/arch/arm/v8/handoff/coreboot.c
+++ b/src/arch/arm/v8/handoff/coreboot.c
@@ -28,9 +28,9 @@
 #include <arch/mmu.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <sysinfo.h>
 
 #include "arch/arm/handoff/handoff.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/memory.h"
 
 extern uint64_t handoff_parameter;
diff --git a/src/arch/arm/v8/includes/arch/mmu.h b/src/arch/arm/v8/includes/arch/mmu.h
index 54c3132..96a70ea 100644
--- a/src/arch/arm/v8/includes/arch/mmu.h
+++ b/src/arch/arm/v8/includes/arch/mmu.h
@@ -32,7 +32,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <sysinfo.h>
+
+#include "base/coreboot/sysinfo.h"
 
 struct mmu_memrange {
 	uint64_t base;
diff --git a/src/arch/x86/ia32/handoff/coreboot.c b/src/arch/x86/ia32/handoff/coreboot.c
index 1917c07..10f04d6 100644
--- a/src/arch/x86/ia32/handoff/coreboot.c
+++ b/src/arch/x86/ia32/handoff/coreboot.c
@@ -25,10 +25,9 @@
  * SUCH DAMAGE.
  */
 
-#include <coreboot_tables.h>
-#include <sysinfo.h>
-
 #include "arch/x86/ia32/handoff/handoff.h"
+#include "base/coreboot/sysinfo.h"
+#include "base/coreboot/tables.h"
 #include "base/fwdb.h"
 #include "base/memory.h"
 #include "vboot/util/vboot_handoff.h"
diff --git a/src/arch/x86/ia32/handoff/module.c b/src/arch/x86/ia32/handoff/module.c
index 17b4fd6..af6d972 100644
--- a/src/arch/x86/ia32/handoff/module.c
+++ b/src/arch/x86/ia32/handoff/module.c
@@ -25,9 +25,9 @@
  * SUCH DAMAGE.
  */
 
-#include <sysinfo.h>
 
 #include "arch/x86/ia32/handoff/handoff.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/fwdb.h"
 #include "base/memory.h"
 
diff --git a/src/base/coreboot/cbfs.c b/src/base/coreboot/cbfs.c
index d166a8c..3ee9164 100644
--- a/src/base/coreboot/cbfs.c
+++ b/src/base/coreboot/cbfs.c
@@ -28,9 +28,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <sysinfo.h>
 
 #include "base/coreboot/cbfs.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/lzma/lzma.h"
 
 #define DEBUG(x...)
diff --git a/src/base/coreboot/sysinfo.c b/src/base/coreboot/sysinfo.c
index 05f1c9d..8675b0d 100644
--- a/src/base/coreboot/sysinfo.c
+++ b/src/base/coreboot/sysinfo.c
@@ -27,8 +27,8 @@
  */
 
 #include <assert.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "base/fwdb.h"
 
 struct sysinfo_t *get_sysinfo(void)
diff --git a/src/libpayload/include/sysinfo.h b/src/base/coreboot/sysinfo.h
similarity index 93%
rename from src/libpayload/include/sysinfo.h
rename to src/base/coreboot/sysinfo.h
index dc1daf5..60c05b6 100644
--- a/src/libpayload/include/sysinfo.h
+++ b/src/base/coreboot/sysinfo.h
@@ -25,10 +25,12 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _SYSINFO_H
-#define _SYSINFO_H
+#ifndef __BASE_COREBOOT_SYSINFO_H__
+#define __BASE_COREBOOT_SYSINFO_H__
 
-#include <coreboot_tables.h>
+#include <stdint.h>
+
+#include "base/coreboot/tables.h"
 
 struct sysinfo_t {
 	uint32_t vbnv_start;
@@ -71,4 +73,4 @@
  */
 int cb_parse_header(void *addr, int len, struct sysinfo_t *info);
 
-#endif
+#endif /* __BASE_COREBOOT_SYSINFO_H__ */
diff --git a/src/libpayload/include/coreboot_tables.h b/src/base/coreboot/tables.h
similarity index 97%
rename from src/libpayload/include/coreboot_tables.h
rename to src/base/coreboot/tables.h
index 647d701..f43a931 100644
--- a/src/libpayload/include/coreboot_tables.h
+++ b/src/base/coreboot/tables.h
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _COREBOOT_TABLES_H
-#define _COREBOOT_TABLES_H
+#ifndef __BASE_COREBOOT_TABLES_H__
+#define __BASE_COREBOOT_TABLES_H__
 
 #include <stdint.h>
 
@@ -353,4 +353,4 @@
 	(void *)(((uint8_t *) (_rec)) + sizeof(*(_rec)) \
 		+ (sizeof((_rec)->map[0]) * (_idx)))
 
-#endif
+#endif /* __BASE_COREBOOT_TABLES_H__ */
diff --git a/src/base/timestamp.c b/src/base/timestamp.c
index da0979d..963524e 100644
--- a/src/base/timestamp.c
+++ b/src/base/timestamp.c
@@ -17,8 +17,8 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "base/fwdb.h"
 #include "base/init_funcs.h"
 #include "base/time.h"
diff --git a/src/boot/coreboot.c b/src/boot/coreboot.c
index a77961c..f8bb57a 100644
--- a/src/boot/coreboot.c
+++ b/src/boot/coreboot.c
@@ -21,10 +21,10 @@
  */
 
 #include <assert.h>
-#include <coreboot_tables.h>
 #include <stdint.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
+#include "base/coreboot/tables.h"
 #include "base/device_tree.h"
 #include "base/fwdb.h"
 #include "base/init_funcs.h"
diff --git a/src/boot/fit.c b/src/boot/fit.c
index 7e803fe..4269df3 100644
--- a/src/boot/fit.c
+++ b/src/boot/fit.c
@@ -24,9 +24,9 @@
 #include <endian.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <sysinfo.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/memory.h"
 #include "base/ranges.h"
 #include "base/xalloc.h"
diff --git a/src/boot/ramoops.c b/src/boot/ramoops.c
index 14e68ed..e1245ff 100644
--- a/src/boot/ramoops.c
+++ b/src/boot/ramoops.c
@@ -23,8 +23,8 @@
 #include <endian.h>
 #include <stdint.h>
 #include <string.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "base/device_tree.h"
 #include "base/init_funcs.h"
 #include "base/list.h"
diff --git a/src/drivers/board/foster/board.c b/src/drivers/board/foster/board.c
index 837b390..9f0b099 100644
--- a/src/drivers/board/foster/board.c
+++ b/src/drivers/board/foster/board.c
@@ -22,9 +22,9 @@
 
 #include <assert.h>
 #include <stdint.h>
-#include <sysinfo.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "boot/fit.h"
 #include "drivers/blockdev/tegra_mmc.h"
diff --git a/src/drivers/board/nyan_big/board.c b/src/drivers/board/nyan_big/board.c
index f77e209..6c28174 100644
--- a/src/drivers/board/nyan_big/board.c
+++ b/src/drivers/board/nyan_big/board.c
@@ -24,9 +24,9 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sysinfo.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "base/xalloc.h"
 #include "boot/fit.h"
diff --git a/src/drivers/board/nyan_blaze/board.c b/src/drivers/board/nyan_blaze/board.c
index d092f2c..d163dd4 100644
--- a/src/drivers/board/nyan_blaze/board.c
+++ b/src/drivers/board/nyan_blaze/board.c
@@ -24,9 +24,9 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sysinfo.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "base/xalloc.h"
 #include "boot/fit.h"
diff --git a/src/drivers/board/rambi/board.c b/src/drivers/board/rambi/board.c
index afa67c6..eee10cb 100644
--- a/src/drivers/board/rambi/board.c
+++ b/src/drivers/board/rambi/board.c
@@ -21,8 +21,8 @@
  */
 
 #include <pci.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "base/die.h"
 #include "base/init_funcs.h"
 #include "drivers/blockdev/blockdev.h"
diff --git a/src/drivers/board/rush/board.c b/src/drivers/board/rush/board.c
index 1a344d4..6a415f9 100644
--- a/src/drivers/board/rush/board.c
+++ b/src/drivers/board/rush/board.c
@@ -23,9 +23,9 @@
 #include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <sysinfo.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "base/time.h"
 #include "base/xalloc.h"
diff --git a/src/drivers/board/rush_ryu/board.c b/src/drivers/board/rush_ryu/board.c
index be179af..add219a 100644
--- a/src/drivers/board/rush_ryu/board.c
+++ b/src/drivers/board/rush_ryu/board.c
@@ -21,9 +21,9 @@
  */
 
 #include <assert.h>
-#include <sysinfo.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "boot/fit.h"
 #include "drivers/blockdev/tegra_mmc.h"
diff --git a/src/drivers/board/rush_ryu/keyboard.c b/src/drivers/board/rush_ryu/keyboard.c
index 5a98319..19cdb40 100644
--- a/src/drivers/board/rush_ryu/keyboard.c
+++ b/src/drivers/board/rush_ryu/keyboard.c
@@ -22,9 +22,9 @@
  */
 
 #include <assert.h>
-#include <sysinfo.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/die.h"
 #include "drivers/board/board_helpers.h"
 #include "drivers/gpio/fwdb.h"
diff --git a/src/drivers/board/samus/board.c b/src/drivers/board/samus/board.c
index 30aa2f1..1bf1f66 100644
--- a/src/drivers/board/samus/board.c
+++ b/src/drivers/board/samus/board.c
@@ -22,8 +22,8 @@
 
 #include <pci.h>
 #include <stdint.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "base/io.h"
 #include "base/list.h"
diff --git a/src/drivers/board/samus/vboot.c b/src/drivers/board/samus/vboot.c
index b5dff3a..e26527e 100644
--- a/src/drivers/board/samus/vboot.c
+++ b/src/drivers/board/samus/vboot.c
@@ -22,8 +22,8 @@
 
 #include <pci.h>
 #include <stdint.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "drivers/board/board.h"
 #include "drivers/board/board_helpers.h"
 #include "drivers/gpio/fwdb.h"
diff --git a/src/drivers/board/smaug/board.c b/src/drivers/board/smaug/board.c
index 03a3177..79251ae 100644
--- a/src/drivers/board/smaug/board.c
+++ b/src/drivers/board/smaug/board.c
@@ -21,9 +21,9 @@
  */
 
 #include <assert.h>
-#include <sysinfo.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "boot/fit.h"
 #include "drivers/blockdev/tegra_mmc.h"
diff --git a/src/drivers/board/smaug/emc.c b/src/drivers/board/smaug/emc.c
index 6b2d2b4..f5d277a 100644
--- a/src/drivers/board/smaug/emc.c
+++ b/src/drivers/board/smaug/emc.c
@@ -21,10 +21,10 @@
  */
 
 #include <stdio.h>
-#include <sysinfo.h>
 
-#include "base/init_funcs.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/device_tree.h"
+#include "base/init_funcs.h"
 #include "base/xalloc.h"
 
 static int emc_device_tree(DeviceTreeFixup *fixup, DeviceTree *tree)
diff --git a/src/drivers/board/strago/board.c b/src/drivers/board/strago/board.c
index bc3b3db..01d1836 100755
--- a/src/drivers/board/strago/board.c
+++ b/src/drivers/board/strago/board.c
@@ -21,8 +21,8 @@
  */
 
 #include <pci.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "drivers/blockdev/blockdev.h"
 #include "drivers/blockdev/sdhci.h"
diff --git a/src/drivers/board/veyron/board.c b/src/drivers/board/veyron/board.c
index 16a5d09..8608af0 100644
--- a/src/drivers/board/veyron/board.c
+++ b/src/drivers/board/veyron/board.c
@@ -17,8 +17,7 @@
  * MA 02111-1307 USA
  */
 
-#include <sysinfo.h>
-
+#include "base/coreboot/sysinfo.h"
 #include "base/init_funcs.h"
 #include "base/io.h"
 #include "boot/fit.h"
diff --git a/src/drivers/console/cbmem.c b/src/drivers/console/cbmem.c
index 75b605c..5376e29 100644
--- a/src/drivers/console/cbmem.c
+++ b/src/drivers/console/cbmem.c
@@ -27,8 +27,8 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "base/fwdb.h"
 #include "base/init_funcs.h"
 #include "drivers/console/cbmem.h"
diff --git a/src/drivers/flash/spi.c b/src/drivers/flash/spi.c
index 6274c1c..e487507 100644
--- a/src/drivers/flash/spi.c
+++ b/src/drivers/flash/spi.c
@@ -24,9 +24,9 @@
 #include <assert.h>
 #include <endian.h>
 #include <stdio.h>
-#include <sysinfo.h>
 
 #include "base/container_of.h"
+#include "base/coreboot/sysinfo.h"
 #include "base/time.h"
 #include "base/xalloc.h"
 #include "drivers/bus/spi/spi.h"
diff --git a/src/libpayload/drivers/video/graphics.c b/src/libpayload/drivers/video/graphics.c
index 7968383..5d258ef 100644
--- a/src/libpayload/drivers/video/graphics.c
+++ b/src/libpayload/drivers/video/graphics.c
@@ -27,10 +27,10 @@
 
 #include <cbgfx.h>
 #include <stdio.h>
-#include <sysinfo.h>
 #include "bitmap.h"
 
 #include "base/coreboot/cbfs.h"
+#include "base/coreboot/sysinfo.h"
 
 /*
  * 'canvas' is the drawing area located in the center of the screen. It's a
diff --git a/src/module/handoff/coreboot.c b/src/module/handoff/coreboot.c
index 488bbc4..7710bd9 100644
--- a/src/module/handoff/coreboot.c
+++ b/src/module/handoff/coreboot.c
@@ -27,11 +27,11 @@
  */
 
 #include <assert.h>
-#include <coreboot_tables.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <sysinfo.h>
 
+#include "base/coreboot/sysinfo.h"
+#include "base/coreboot/tables.h"
 #include "base/fwdb.h"
 #include "base/memory.h"
 #include "base/timestamp.h"
diff --git a/src/vboot/callbacks/nvstorage_cmos.c b/src/vboot/callbacks/nvstorage_cmos.c
index 67c08e3..a6745a1 100644
--- a/src/vboot/callbacks/nvstorage_cmos.c
+++ b/src/vboot/callbacks/nvstorage_cmos.c
@@ -21,9 +21,9 @@
  */
 
 #include <stdio.h>
-#include <sysinfo.h>
 #include <vboot_api.h>
 
+#include "base/coreboot/sysinfo.h"
 #include "drivers/misc/cmos.h"
 
 VbError_t VbExNvStorageRead(uint8_t* buf)
diff --git a/src/vboot/crossystem/acpi.c b/src/vboot/crossystem/acpi.c
index 64ca1b4..17bfc6e 100644
--- a/src/vboot/crossystem/acpi.c
+++ b/src/vboot/crossystem/acpi.c
@@ -24,11 +24,11 @@
 #include <gbb_header.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <sysinfo.h>
 #include <vboot_api.h>
 #include <vboot_struct.h>
 
 #include "base/algorithm.h"
+#include "base/coreboot/sysinfo.h"
 #include "vboot/board.h"
 #include "vboot/crossystem/crossystem.h"
 #include "vboot/firmware_id.h"