diff --git a/src/board/system76/addw1/board.mk b/src/board/system76/addw1/board.mk
index f337d40f5..9f0e94751 100644
--- 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
 
diff --git a/src/board/system76/addw2/board.mk b/src/board/system76/addw2/board.mk
index 98b41ff3a..c2519c64e 100644
--- 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
 
diff --git a/src/board/system76/addw3/board.mk b/src/board/system76/addw3/board.mk
index 264499ec7..1884df588 100644
--- 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
diff --git a/src/board/system76/addw4/board.mk b/src/board/system76/addw4/board.mk
index 897624536..3f7573b3b 100644
--- 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
 
diff --git a/src/board/system76/bonw14/board.mk b/src/board/system76/bonw14/board.mk
index dadf0066a..d6b118cd3 100644
--- 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
 
diff --git a/src/board/system76/bonw15-b/board.mk b/src/board/system76/bonw15-b/board.mk
index f4467ce19..a054c3507 100644
--- 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
diff --git a/src/board/system76/bonw15/board.mk b/src/board/system76/bonw15/board.mk
index 6ef4b761a..260b3c6c9 100644
--- 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
diff --git a/src/board/system76/common/acpi.c b/src/board/system76/common/acpi.c
index ac8dbe368..d9bec01ca 100644
--- a/src/board/system76/common/acpi.c
+++ b/src/board/system76/common/acpi.c
@@ -7,11 +7,14 @@
 #include <board/gpio.h>
 #include <board/kbled.h>
 #include <board/lid.h>
-#include <board/peci.h>
 #include <board/pwm.h>
 #include <common/debug.h>
 #include <common/macro.h>
 
+#if CONFIG_PLATFORM_INTEL
+#include <board/peci.h>
+#endif
+
 #ifndef HAVE_LED_AIRPLANE_N
 #define HAVE_LED_AIRPLANE_N 1
 #endif // HAVE_LED_AIRPLANE_N
@@ -113,7 +116,9 @@ uint8_t acpi_read(uint8_t addr) {
             }
             break;
 
+#if CONFIG_PLATFORM_INTEL
         ACPI_8(0x07, peci_temp);
+#endif
 
         // Handle AC adapter and battery present
         case 0x10:
diff --git a/src/board/system76/common/common.mk b/src/board/system76/common/common.mk
index 4a25c9a4a..11017e590 100644
--- a/src/board/system76/common/common.mk
+++ b/src/board/system76/common/common.mk
@@ -14,10 +14,8 @@ board-common-y += keymap.c
 board-common-y += lid.c
 board-common-y += main.c
 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 +40,17 @@ CFLAGS+=-DLEVEL=4
 # Uncomment to enable I2C debug on 0x76
 #CFLAGS+=-DI2C_DEBUGGER=0x76
 
+ifeq ($(CONFIG_PLATFORM_INTEL),y)
+board-common-y += peci.c
+board-common-y += power/intel.c
+CFLAGS += -DCONFIG_PLATFORM_INTEL=1
+else ifeq ($(CONFIG_PLATFORM_AMD),y)
+board-common-y += power/amd.c
+CFLAGS += -DCONFIG_PLATFORM_AMD=1
+else
+$(error PLATFORM not specified)
+endif
+
 ifeq ($(CONFIG_SECURITY),y)
 CFLAGS+=-DCONFIG_SECURITY=1
 endif
diff --git a/src/board/system76/common/fan.c b/src/board/system76/common/fan.c
index 03576dbb4..238b75cbf 100644
--- a/src/board/system76/common/fan.c
+++ b/src/board/system76/common/fan.c
@@ -2,12 +2,15 @@
 
 #include <board/fan.h>
 #include <board/dgpu.h>
-#include <board/peci.h>
 #include <board/power.h>
 #include <common/debug.h>
 #include <common/macro.h>
 #include <ec/pwm.h>
 
+#if CONFIG_PLATFORM_INTEL
+#include <board/peci.h>
+#endif
+
 bool fan_max = false;
 
 uint8_t fan1_pwm_actual = 0;
@@ -195,11 +198,16 @@ static uint16_t fan_get_tach1_rpm(void) {
 }
 
 void fan_event(void) {
+#if CONFIG_PLATFORM_INTEL
 #if CONFIG_HAVE_DGPU
     int16_t sys_temp = MAX(peci_temp, dgpu_temp);
 #else
     int16_t sys_temp = peci_temp;
 #endif
+#elif CONFIG_PLATFORM_AMD
+    // TODO: AMD SB-TSI temp
+    int16_t sys_temp = 50;
+#endif
 
     // Fan update interval is 100ms (main.c). The event changes PWM duty
     // by 1 every interval to give a smoothing effect.
diff --git a/src/board/system76/common/include/board/power.h b/src/board/system76/common/include/board/power.h
index ee372da94..bddfa47a6 100644
--- a/src/board/system76/common/include/board/power.h
+++ b/src/board/system76/common/include/board/power.h
@@ -17,7 +17,6 @@ void power_init(void);
 void power_on(void);
 void power_off(void);
 void power_cpu_reset(void);
-
 void power_event(void);
 
 #endif // _BOARD_POWER_H
diff --git a/src/board/system76/common/main.c b/src/board/system76/common/main.c
index 9f7ec48dd..4d2c24b52 100644
--- a/src/board/system76/common/main.c
+++ b/src/board/system76/common/main.c
@@ -18,7 +18,6 @@
 #include <board/kbscan.h>
 #include <board/keymap.h>
 #include <board/lid.h>
-#include <board/peci.h>
 #include <board/pmc.h>
 #include <board/power.h>
 #include <board/ps2.h>
@@ -31,6 +30,10 @@
 #include <common/version.h>
 #include <ec/ec.h>
 
+#if CONFIG_PLATFORM_INTEL
+#include <board/peci.h>
+#endif
+
 #ifdef PARALLEL_DEBUG
 #include <board/parallel.h>
 #endif // PARALLEL_DEBUG
@@ -73,7 +76,9 @@ void init(void) {
         kbscan_init();
     }
     keymap_init();
+#if CONFIG_PLATFORM_INTEL
     peci_init();
+#endif
     pmc_init();
     pwm_init();
     smbus_init();
@@ -140,7 +145,9 @@ void main(void) {
             if ((time - last_time_250ms) >= INTERVAL_250MS) {
                 last_time_250ms = time;
 
+#if CONFIG_PLATFORM_INTEL
                 peci_read_temp();
+#endif
                 dgpu_read_temp();
             }
 
diff --git a/src/board/system76/common/power/amd.c b/src/board/system76/common/power/amd.c
new file mode 100644
index 000000000..52e8c0cd3
--- /dev/null
+++ b/src/board/system76/common/power/amd.c
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include <board/power.h>
+
+enum PowerState power_state = POWER_STATE_OFF;
+
+void update_power_state(void) {}
+void power_init(void) {}
+void power_on(void) {}
+void power_off(void) {}
+void power_cpu_reset(void) {}
+void power_event(void) {}
diff --git a/src/board/system76/common/power.c b/src/board/system76/common/power/intel.c
similarity index 99%
rename from src/board/system76/common/power.c
rename to src/board/system76/common/power/intel.c
index 5be58ee94..b64a76021 100644
--- a/src/board/system76/common/power.c
+++ b/src/board/system76/common/power/intel.c
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <board/power.h>
+
 #include <arch/delay.h>
 #include <arch/time.h>
 #include <board/acpi.h>
@@ -12,7 +14,6 @@
 #include <board/kbled.h>
 #include <board/lid.h>
 #include <board/peci.h>
-#include <board/power.h>
 #include <board/pmc.h>
 #include <board/pnp.h>
 #include <board/wireless.h>
diff --git a/src/board/system76/darp10-b/board.mk b/src/board/system76/darp10-b/board.mk
index 5cc773831..97eb0d106 100644
--- 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
diff --git a/src/board/system76/darp10/board.mk b/src/board/system76/darp10/board.mk
index cedd2a616..e98ea400a 100644
--- 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
diff --git a/src/board/system76/darp5/board.mk b/src/board/system76/darp5/board.mk
index a53a2adab..8c9c35181 100644
--- 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
 
diff --git a/src/board/system76/darp6/board.mk b/src/board/system76/darp6/board.mk
index f68b5f55d..776f80980 100644
--- 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
 
diff --git a/src/board/system76/darp7/board.mk b/src/board/system76/darp7/board.mk
index 41d3ca8de..cc8aa50e3 100644
--- 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
diff --git a/src/board/system76/darp8/board.mk b/src/board/system76/darp8/board.mk
index a23351ce8..4a7960512 100644
--- 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
diff --git a/src/board/system76/darp9/board.mk b/src/board/system76/darp9/board.mk
index bf1da6e9d..f40ab5a1d 100644
--- 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
diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk
index 2ab9d5769..b75dd7ad8 100644
--- 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
 
diff --git a/src/board/system76/galp4/board.mk b/src/board/system76/galp4/board.mk
index 67dda9b41..efdcd7c02 100644
--- 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
 
diff --git a/src/board/system76/galp5/board.mk b/src/board/system76/galp5/board.mk
index 9fc38b6a5..8ac1eaf88 100644
--- 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
diff --git a/src/board/system76/galp6/board.mk b/src/board/system76/galp6/board.mk
index 4fdf5de53..5d408012c 100644
--- 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
diff --git a/src/board/system76/galp7/board.mk b/src/board/system76/galp7/board.mk
index 074bbcf0b..4f73c3df0 100644
--- 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
diff --git a/src/board/system76/gaze15/board.mk b/src/board/system76/gaze15/board.mk
index 4506b0e8a..a971de33c 100644
--- 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
 
diff --git a/src/board/system76/gaze16-3050/board.mk b/src/board/system76/gaze16-3050/board.mk
index 730676a4f..91c722697 100644
--- 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
diff --git a/src/board/system76/gaze16-3060-b/board.mk b/src/board/system76/gaze16-3060-b/board.mk
index 9b96f007a..194163223 100644
--- 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
diff --git a/src/board/system76/gaze16-3060/board.mk b/src/board/system76/gaze16-3060/board.mk
index 59825d935..74fd6cb0d 100644
--- 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
diff --git a/src/board/system76/gaze17-3050/board.mk b/src/board/system76/gaze17-3050/board.mk
index e78957ac4..1798df81d 100644
--- 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
diff --git a/src/board/system76/gaze17-3060-b/board.mk b/src/board/system76/gaze17-3060-b/board.mk
index 5bab43714..31bb08648 100644
--- 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
diff --git a/src/board/system76/gaze17-3060/board.mk b/src/board/system76/gaze17-3060/board.mk
index 05b4df52e..2e4ce1277 100644
--- 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
diff --git a/src/board/system76/gaze18/board.mk b/src/board/system76/gaze18/board.mk
index 7bbdbd96a..9d2875b95 100644
--- 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
diff --git a/src/board/system76/lemp10/board.mk b/src/board/system76/lemp10/board.mk
index 1ad67c98f..55ab6b49d 100644
--- 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
diff --git a/src/board/system76/lemp11/board.mk b/src/board/system76/lemp11/board.mk
index 63525e4c8..cfa7c2de5 100644
--- 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
diff --git a/src/board/system76/lemp12/board.mk b/src/board/system76/lemp12/board.mk
index b60c25af3..78071325d 100644
--- 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
diff --git a/src/board/system76/lemp13-b/board.mk b/src/board/system76/lemp13-b/board.mk
index a4a46f461..b9fd40fd4 100644
--- 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
diff --git a/src/board/system76/lemp13/board.mk b/src/board/system76/lemp13/board.mk
index b571acb4e..9333dc13c 100644
--- 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
diff --git a/src/board/system76/lemp9/board.mk b/src/board/system76/lemp9/board.mk
index 98e43091c..916fab6a8 100644
--- 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
 
diff --git a/src/board/system76/oryp10/board.mk b/src/board/system76/oryp10/board.mk
index 06e98e608..9abcddcc3 100644
--- 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
diff --git a/src/board/system76/oryp11/board.mk b/src/board/system76/oryp11/board.mk
index 59c9b70b2..21086d05f 100644
--- 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
diff --git a/src/board/system76/oryp12/board.mk b/src/board/system76/oryp12/board.mk
index 24c62b328..51c619128 100644
--- 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
 
diff --git a/src/board/system76/oryp5/board.mk b/src/board/system76/oryp5/board.mk
index 561e9428b..e034f1ddf 100644
--- 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
 
diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index d163a3c08..09fd10de9 100644
--- 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
 
diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk
index d163a3c08..09fd10de9 100644
--- 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
 
diff --git a/src/board/system76/oryp8/board.mk b/src/board/system76/oryp8/board.mk
index 908c6f7fd..0707f1150 100644
--- 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
diff --git a/src/board/system76/oryp9/board.mk b/src/board/system76/oryp9/board.mk
index 8287f6b15..674139ba8 100644
--- 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
diff --git a/src/board/system76/serw13/board.mk b/src/board/system76/serw13/board.mk
index 143194f65..81fd7c4c9 100644
--- 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