The Primary to Sideband Bridge (P2SB) is not specific to Apollo Lake, so
move its driver to a common location within arch/x86.
Signed-off-by: Wolfgang Wallner <wolfgang.wall...@br-automation.com>
---
This commit follows a similar rational as the recent moving of the ITSS
driver from Apollo Lake to the intel_common directory, and it also depends
on those patches (which are currently in u-boot-x86).
arch/x86/Kconfig | 7 +++++++
arch/x86/cpu/apollolake/Kconfig | 1 +
arch/x86/cpu/apollolake/Makefile | 1 -
arch/x86/cpu/intel_common/Makefile | 1 +
arch/x86/cpu/{apollolake => intel_common}/p2sb.c | 0
5 files changed, 9 insertions(+), 1 deletion(-)
rename arch/x86/cpu/{apollolake => intel_common}/p2sb.c (100%)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b733d2264e..b3fbf306f7 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -715,6 +715,13 @@ config HAVE_ITSS
Select this to include the driver for the Interrupt Timer
Subsystem (ITSS) which is found on several Intel devices.
+config HAVE_P2SB
+ bool "Enable P2SB"
+ help
+ Select this to include the driver for the Primary to
+ Sideband Bridge (P2SB) which is found on several Intel
+ devices.
+
menu "System tables"
depends on !EFI && !SYS_COREBOOT
diff --git a/arch/x86/cpu/apollolake/Kconfig b/arch/x86/cpu/apollolake/Kconfig
index a760e0ac68..145b8cbdf5 100644
--- a/arch/x86/cpu/apollolake/Kconfig
+++ b/arch/x86/cpu/apollolake/Kconfig
@@ -40,6 +40,7 @@ config INTEL_APOLLOLAKE
imply INTEL_GPIO
imply SMP
imply HAVE_ITSS
+ imply HAVE_P2SB
if INTEL_APOLLOLAKE
diff --git a/arch/x86/cpu/apollolake/Makefile b/arch/x86/cpu/apollolake/Makefile
index f99f2c6473..578e15c4bf 100644
--- a/arch/x86/cpu/apollolake/Makefile
+++ b/arch/x86/cpu/apollolake/Makefile
@@ -20,7 +20,6 @@ endif
obj-y += hostbridge.o
obj-y += lpc.o
-obj-y += p2sb.o
obj-y += pch.o
obj-y += pmc.o
obj-y += uart.o
diff --git a/arch/x86/cpu/intel_common/Makefile
b/arch/x86/cpu/intel_common/Makefile
index e22c70781d..1736bd2b53 100644
--- a/arch/x86/cpu/intel_common/Makefile
+++ b/arch/x86/cpu/intel_common/Makefile
@@ -28,6 +28,7 @@ endif
endif
obj-y += pch.o
obj-$(CONFIG_HAVE_ITSS) += itss.o
+obj-$(CONFIG_HAVE_P2SB) += p2sb.o
ifdef CONFIG_SPL
ifndef CONFIG_SPL_BUILD
diff --git a/arch/x86/cpu/apollolake/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
similarity index 100%
rename from arch/x86/cpu/apollolake/p2sb.c
rename to arch/x86/cpu/intel_common/p2sb.c
--
2.25.0
