x86: Move P2SB from Apollo Lake to a more generic location

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.wallner@br-automation.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b733d2264efa1595c839e2fd73d6f8cb919909ff..b3fbf306f79bac5bd0697316e04f94cd19a88aaa 100644 (file)
--- 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 a760e0ac68ea27aa6813a52580634095e1ceab49..145b8cbdf5b947512f770633729c4f52b165612a 100644 (file)
--- 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 f99f2c6473971cf474c64da4063e226c99abbefb..578e15c4bf70533d978fdd0a874dbf38fb3a20fd 100644 (file)
--- 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 e22c70781d60644ef5661c1ee29de3b1e411b08d..1736bd2b530e1820490169d80fb2ab46ace136aa 100644 (file)
--- 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