Add config for host platform

Introduce a new config to determine the host platform and use it to conditionally include power sequence logic. Signed-off-by: Tim Crawford <tcrawford@system76.com>
2024-08-27 07:47:09 -06:00
parent ae63a9e3fb
commit 2c6977bc6b
44 changed files with 128 additions and 57 deletions
--- a/src/board/system76/addw1/board.mk
+++ b/src/board/system76/addw1/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT8587E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102

--- a/src/board/system76/addw2/board.mk
+++ b/src/board/system76/addw2/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102

--- a/src/board/system76/addw3/board.mk
+++ b/src/board/system76/addw3/board.mk
@@ -7,7 +7,8 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
 CONFIG_BUS_ESPI=y

 # Enable firmware security
--- a/src/board/system76/addw4/board.mk
+++ b/src/board/system76/addw4/board.mk
@@ -7,7 +7,8 @@ EC = ite
 CONFIG_EC_ITE_IT5570E = y
 CONFIG_EC_FLASH_SIZE_256K = y

-# Enable eSPI
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
 CONFIG_BUS_ESPI = y
 CONFIG_PECI_OVER_ESPI = y

--- a/src/board/system76/bonw14/board.mk
+++ b/src/board/system76/bonw14/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102_nkey

--- a/src/board/system76/bonw15-b/board.mk
+++ b/src/board/system76/bonw15-b/board.mk
@@ -10,7 +10,8 @@ EC = ite
 CONFIG_EC_ITE_IT5570E = y
 CONFIG_EC_FLASH_SIZE_256K = y

-# Enable eSPI
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
 CONFIG_BUS_ESPI = y

 # Enable firmware security
--- a/src/board/system76/bonw15/board.mk
+++ b/src/board/system76/bonw15/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/common/common.mk
+++ b/src/board/system76/common/common.mk
@@ -17,7 +17,6 @@ board-common-y += parallel.c
 board-common-y += peci.c
 board-common-y += pmc.c
 board-common-y += pnp.c
-board-common-y += power.c
 board-common-y += ps2.c
 board-common-y += pwm.c
 board-common-y += scratch.c
@@ -42,6 +41,13 @@ CFLAGS+=-DLEVEL=4
 # Uncomment to enable I2C debug on 0x76
 #CFLAGS+=-DI2C_DEBUGGER=0x76

+ifeq ($(CONFIG_PLATFORM_INTEL),y)
+board-common-y += power/intel.c
+CFLAGS += -DCONFIG_PLATFORM_INTEL=1
+else
+$(error PLATFORM not specified)
+endif
+
 ifeq ($(CONFIG_SECURITY),y)
 CFLAGS+=-DCONFIG_SECURITY=1
 endif
--- a/src/board/system76/common/power/intel.c
+++ b/src/board/system76/common/power/intel.c
--- a/src/board/system76/darp10-b/board.mk
+++ b/src/board/system76/darp10-b/board.mk
@@ -7,7 +7,8 @@ EC = ite
 CONFIG_EC_ITE_IT5570E = y
 CONFIG_EC_FLASH_SIZE_256K = y

-# Enable eSPI
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
 CONFIG_BUS_ESPI = y

 # Enable firmware security
--- a/src/board/system76/darp10/board.mk
+++ b/src/board/system76/darp10/board.mk
@@ -7,7 +7,8 @@ EC = ite
 CONFIG_EC_ITE_IT5570E = y
 CONFIG_EC_FLASH_SIZE_256K = y

-# Enable eSPI
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
 CONFIG_BUS_ESPI = y

 # Enable firmware security
--- a/src/board/system76/darp5/board.mk
+++ b/src/board/system76/darp5/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT8587E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102

--- a/src/board/system76/darp6/board.mk
+++ b/src/board/system76/darp6/board.mk
@@ -10,6 +10,9 @@ EC=ite
 CONFIG_EC_ITE_IT8587E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102

--- a/src/board/system76/darp7/board.mk
+++ b/src/board/system76/darp7/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/darp8/board.mk
+++ b/src/board/system76/darp8/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/darp9/board.mk
+++ b/src/board/system76/darp9/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/galp3-c/board.mk
+++ b/src/board/system76/galp3-c/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT8587E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=14in_86

--- a/src/board/system76/galp4/board.mk
+++ b/src/board/system76/galp4/board.mk
@@ -10,6 +10,9 @@ EC=ite
 CONFIG_EC_ITE_IT8587E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=14in_86

--- a/src/board/system76/galp5/board.mk
+++ b/src/board/system76/galp5/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=14in_83
--- a/src/board/system76/galp6/board.mk
+++ b/src/board/system76/galp6/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/galp7/board.mk
+++ b/src/board/system76/galp7/board.mk
@@ -10,8 +10,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/gaze15/board.mk
+++ b/src/board/system76/gaze15/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102

--- a/src/board/system76/gaze16-3050/board.mk
+++ b/src/board/system76/gaze16-3050/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/gaze16-3060-b/board.mk
+++ b/src/board/system76/gaze16-3060-b/board.mk
@@ -10,8 +10,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/gaze16-3060/board.mk
+++ b/src/board/system76/gaze16-3060/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/gaze17-3050/board.mk
+++ b/src/board/system76/gaze17-3050/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/gaze17-3060-b/board.mk
+++ b/src/board/system76/gaze17-3060-b/board.mk
@@ -10,8 +10,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/gaze17-3060/board.mk
+++ b/src/board/system76/gaze17-3060/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/gaze18/board.mk
+++ b/src/board/system76/gaze18/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/lemp10/board.mk
+++ b/src/board/system76/lemp10/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=14in_83
--- a/src/board/system76/lemp11/board.mk
+++ b/src/board/system76/lemp11/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=14in_83
--- a/src/board/system76/lemp12/board.mk
+++ b/src/board/system76/lemp12/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/lemp13-b/board.mk
+++ b/src/board/system76/lemp13-b/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_256K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y
 CONFIG_PECI_OVER_ESPI = y

 # Enable firmware security
--- a/src/board/system76/lemp13/board.mk
+++ b/src/board/system76/lemp13/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_256K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y
 CONFIG_PECI_OVER_ESPI = y

 # Enable firmware security
--- a/src/board/system76/lemp9/board.mk
+++ b/src/board/system76/lemp9/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=14in_83

--- a/src/board/system76/oryp10/board.mk
+++ b/src/board/system76/oryp10/board.mk
@@ -10,8 +10,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/oryp11/board.mk
+++ b/src/board/system76/oryp11/board.mk
@@ -7,10 +7,10 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
-# Use PECI over eSPI
-CONFIG_PECI_OVER_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y
+CONFIG_PECI_OVER_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/oryp12/board.mk
+++ b/src/board/system76/oryp12/board.mk
@@ -7,7 +7,8 @@ EC = ite
 CONFIG_EC_ITE_IT5570E = y
 CONFIG_EC_FLASH_SIZE_256K = y

-# Enable eSPI
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
 CONFIG_BUS_ESPI = y
 CONFIG_PECI_OVER_ESPI = y

--- a/src/board/system76/oryp5/board.mk
+++ b/src/board/system76/oryp5/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT8587E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102

--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102

--- a/src/board/system76/oryp7/board.mk
+++ b/src/board/system76/oryp7/board.mk
@@ -7,6 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+
 # Include keyboard
 KEYBOARD=15in_102

--- a/src/board/system76/oryp8/board.mk
+++ b/src/board/system76/oryp8/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Include keyboard
 KEYBOARD=15in_102
--- a/src/board/system76/oryp9/board.mk
+++ b/src/board/system76/oryp9/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y
--- a/src/board/system76/serw13/board.mk
+++ b/src/board/system76/serw13/board.mk
@@ -7,8 +7,9 @@ EC=ite
 CONFIG_EC_ITE_IT5570E=y
 CONFIG_EC_FLASH_SIZE_128K = y

-# Enable eSPI
-CONFIG_BUS_ESPI=y
+# Intel-based host
+CONFIG_PLATFORM_INTEL = y
+CONFIG_BUS_ESPI = y

 # Enable firmware security
 CONFIG_SECURITY=y