summaryrefslogtreecommitdiffstats
path: root/src/soc/intel/cannonlake/bootblock
diff options
context:
space:
mode:
authorDinesh Gehlot <digehlot@google.com>2023-01-17 05:12:07 +0000
committerElyes Haouas <ehaouas@noos.fr>2023-01-18 05:15:59 +0000
commit8a2c904616722f51f5d3a500ba41b7e21b4735e2 (patch)
treefa3ae71d1ce0338753eed7b23bd43feb64f065f7 /src/soc/intel/cannonlake/bootblock
parent5e2602ae4817eba77e7893ab41681fd0a74f6558 (diff)
downloadcoreboot-8a2c904616722f51f5d3a500ba41b7e21b4735e2.tar.gz
coreboot-8a2c904616722f51f5d3a500ba41b7e21b4735e2.tar.bz2
coreboot-8a2c904616722f51f5d3a500ba41b7e21b4735e2.zip
soc/intel/cannonlake: Use common gpio.h include
Replace the intelblocks/gpio.h, soc/gpio.h and soc/gpio_defs.h includes with the common gpio.h which includes soc/gpio.h which includes intelblocks/gpio.h which includes soc/gpio_defs.h. This patch also fixes alphabetic ordering of included headers. BUG=b:261778357 TEST=Able to build and boot. Signed-off-by: Dinesh Gehlot <digehlot@google.com> Change-Id: I349a2b24ecdee347548b5c7b292c5075e6150a19 Reviewed-on: https://review.coreboot.org/c/coreboot/+/72033 Reviewed-by: Elyes Haouas <ehaouas@noos.fr> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Diffstat (limited to 'src/soc/intel/cannonlake/bootblock')
-rw-r--r--src/soc/intel/cannonlake/bootblock/bootblock.c2
-rw-r--r--src/soc/intel/cannonlake/bootblock/pch.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/soc/intel/cannonlake/bootblock/bootblock.c b/src/soc/intel/cannonlake/bootblock/bootblock.c
index a138ec4ba7cb..45140509829d 100644
--- a/src/soc/intel/cannonlake/bootblock/bootblock.c
+++ b/src/soc/intel/cannonlake/bootblock/bootblock.c
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h>
+#include <gpio.h>
#include <intelblocks/fast_spi.h>
-#include <intelblocks/gpio.h>
#include <intelblocks/gspi.h>
#include <intelblocks/systemagent.h>
#include <intelblocks/tco.h>
diff --git a/src/soc/intel/cannonlake/bootblock/pch.c b/src/soc/intel/cannonlake/bootblock/pch.c
index 8ec4782690f0..9df4ac35b9bf 100644
--- a/src/soc/intel/cannonlake/bootblock/pch.c
+++ b/src/soc/intel/cannonlake/bootblock/pch.c
@@ -4,8 +4,8 @@
#include <device/mmio.h>
#include <device/device.h>
#include <device/pci_ops.h>
+#include <gpio.h>
#include <intelblocks/fast_spi.h>
-#include <intelblocks/gpio.h>
#include <intelblocks/gspi.h>
#include <intelblocks/lpc_lib.h>
#include <intelblocks/p2sb.h>
@@ -13,7 +13,6 @@
#include <intelblocks/pmclib.h>
#include <intelblocks/rtc.h>
#include <soc/bootblock.h>
-#include <soc/gpio.h>
#include <soc/iomap.h>
#include <soc/lpc.h>
#include <soc/p2sb.h>