3 files changed, 28 insertions, 11 deletions

diff --git a/src/soc/intel/tigerlake/include/soc/iomap.h b/src/soc/intel/tigerlake/include/soc/iomap.h
index 72ac25fdc3..2e61477dd4 100644
--- a/src/soc/intel/tigerlake/include/soc/iomap.h
+++ b/src/soc/intel/tigerlake/include/soc/iomap.h
@@ -34,11 +34,19 @@
 #define PCH_TRACE_HUB_BASE_ADDRESS	0xfc800000
 #define PCH_TRACE_HUB_BASE_SIZE	0x00800000
 
-#define EARLY_I2C_BASE_ADDRESS	0xfe040000
-#define EARLY_I2C_BASE(x)	(EARLY_I2C_BASE_ADDRESS + (0x1000 * (x)))
+#define UART_BASE_SIZE		0x1000
 
-#define MCH_BASE_ADDRESS	0xfed10000
-#define MCH_BASE_SIZE		0x8000
+#define UART_BASE_0_ADDRESS	0xfe03e000
+/* Both UART BAR 0 and 1 are 4KB in size */
+#define UART_BASE_0_ADDR(x)	(UART_BASE_0_ADDRESS + (2 * \
+					UART_BASE_SIZE * (x)))
+#define UART_BASE(x)		UART_BASE_0_ADDR(x)
+
+#define EARLY_I2C_BASE_ADDRESS	0xfe020000
+#define EARLY_I2C_BASE(x)	(EARLY_I2C_BASE_ADDRESS + (0x2000 * (x)))
+
+#define MCH_BASE_ADDRESS	0xfedc0000
+#define MCH_BASE_SIZE		0x20000
 
 #define DMI_BASE_ADDRESS	0xfeda0000
 #define DMI_BASE_SIZE		0x1000
@@ -49,7 +57,7 @@
 #define EDRAM_BASE_ADDRESS	0xfed80000
 #define EDRAM_BASE_SIZE		0x4000
 
-#define REG_BASE_ADDRESS	0xfc000000
+#define REG_BASE_ADDRESS	0xfb000000
 #define REG_BASE_SIZE		0x1000
 
 #define HPET_BASE_ADDRESS	0xfed00000
@@ -58,13 +66,13 @@
 #define PCH_PWRM_BASE_SIZE	0x10000
 
 #define SPI_BASE_ADDRESS	0xfe010000
-#define EARLY_GSPI_BASE_ADDRESS 0xfe011000
+#define EARLY_GSPI_BASE_ADDRESS 0xfe030000
 
 #define GPIO_BASE_SIZE		0x10000
 
 #define HECI1_BASE_ADDRESS	0xfeda2000
 
-#define VTD_BASE_ADDRESS	0xFED90000
+#define VTD_BASE_ADDRESS	0xfed90000
 #define VTD_BASE_SIZE		0x00004000
 
 #define ABOVE_4GB_MEM_BASE_ADDRESS	(256ULL * GiB)
diff --git a/src/soc/intel/tigerlake/include/soc/romstage.h b/src/soc/intel/tigerlake/include/soc/romstage.h
index 046e856920..98ed6bc158 100644
--- a/src/soc/intel/tigerlake/include/soc/romstage.h
+++ b/src/soc/intel/tigerlake/include/soc/romstage.h
@@ -22,4 +22,12 @@ void mainboard_memory_init_params(FSPM_UPD *mupd);
 void systemagent_early_init(void);
 void pch_init(void);
 
+/* Board type */
+enum board_type {
+	BOARD_TYPE_MOBILE  = 0,
+	BOARD_TYPE_DESKTOP = 1,
+	BOARD_TYPE_ULT_ULX = 5,
+	BOARD_TYPE_SERVER  = 7
+};
+
 #endif /* _SOC_ROMSTAGE_H_ */
diff --git a/src/soc/intel/tigerlake/include/soc/serialio.h b/src/soc/intel/tigerlake/include/soc/serialio.h
index cdf55157ff..04c0efe19b 100644
--- a/src/soc/intel/tigerlake/include/soc/serialio.h
+++ b/src/soc/intel/tigerlake/include/soc/serialio.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2018 Intel Corp.
+ * Copyright (C) 2019 Intel Corp.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,19 +30,20 @@ enum {
 	PchSerialIoIndexI2C2,
 	PchSerialIoIndexI2C3,
 	PchSerialIoIndexI2C4,
-	PchSerialIoIndexI2C5
+	PchSerialIoIndexI2C5,
 };
 
 enum {
 	PchSerialIoIndexGSPI0,
 	PchSerialIoIndexGSPI1,
-	PchSerialIoIndexGSPI2
+	PchSerialIoIndexGSPI2,
+	PchSerialIoIndexGSPI3,
 };
 
 enum {
 	PchSerialIoIndexUART0,
 	PchSerialIoIndexUART1,
-	PchSerialIoIndexUART2
+	PchSerialIoIndexUART2,
 };
 
 #endif