From 68a58ca58785415eb66df443830bb0ff065a9a74 Mon Sep 17 00:00:00 2001
From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Date: Thu, 21 May 2015 13:04:49 +0300
Subject: [PATCH] kconf: Add an option to select PCI on x86 architecture

By default it is set to 'n'. This will be useful to enable the PCI layer
code if required. On quark boark, it is selected by default as UART
driver needs it currently.

Change-Id: I7aa38e73c431c66ebbd8092aff0a14d5fb9268d5
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
---
 arch/x86/generic_pc/defs.objs                 | 8 ++++++++
 arch/x86/quark/defs.objs                      | 7 ++++++-
 config/quark/bsp.kconf                        | 1 +
 make/target/kconfig/arch/x86/Intel-core.kconf | 8 ++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/arch/x86/generic_pc/defs.objs b/arch/x86/generic_pc/defs.objs
index 380d3c05df5..cf1faec9d1c 100644
--- a/arch/x86/generic_pc/defs.objs
+++ b/arch/x86/generic_pc/defs.objs
@@ -53,6 +53,14 @@ bsp_drivers_SRC = $(strip \
 	drivers/console/uart_console.c \
 )
 
+ifeq (${CONFIG_PCI},y)
+  bsp_drivers_SRC += $(strip \
+	drivers/pci/pci_config.c \
+	drivers/pci/pci_interface.c \
+	drivers/pci/pci.c \
+  )
+endif
+
 ifeq (${CONFIG_MICROKERNEL},y)
   bsp_kernel_SRC += $(strip \
   )
diff --git a/arch/x86/quark/defs.objs b/arch/x86/quark/defs.objs
index 5dfa45ad3ab..0d869acddff 100644
--- a/arch/x86/quark/defs.objs
+++ b/arch/x86/quark/defs.objs
@@ -54,10 +54,15 @@ bsp_drivers_SRC = $(strip \
 	arch/${vARCH}/interrupt_controller/loApicIntr.c \
 	drivers/serial/ns16550.c \
 	drivers/console/uart_console.c \
+)
+
+ifeq (${CONFIG_PCI},y)
+  bsp_drivers_SRC += $(strip \
 	drivers/pci/pci_config.c \
 	drivers/pci/pci_interface.c \
 	drivers/pci/pci.c \
-)
+  )
+endif
 
 ifeq (${CONFIG_MICROKERNEL},y)
   bsp_kernel_SRC += $(strip \
diff --git a/config/quark/bsp.kconf b/config/quark/bsp.kconf
index a8615b5b41a..a77858f2e74 100644
--- a/config/quark/bsp.kconf
+++ b/config/quark/bsp.kconf
@@ -48,6 +48,7 @@ config	BSP_QUARK
 	select CPU_MINUTEIA
 	select IOAPIC
 	select HPET_TIMER
+	select PCI
 	select EOI_HANDLER_SUPPORTED
 	select BOOTLOADER_UNKNOWN
 	select EXTRA_SERIAL_PORT
diff --git a/make/target/kconfig/arch/x86/Intel-core.kconf b/make/target/kconfig/arch/x86/Intel-core.kconf
index 82d22000747..26ce77aab94 100644
--- a/make/target/kconfig/arch/x86/Intel-core.kconf
+++ b/make/target/kconfig/arch/x86/Intel-core.kconf
@@ -262,6 +262,14 @@ config PIT
 	help
 	  This option selects legacy i8253 timer as system timer.
 
+config PCI
+	bool
+	# omit prompt to signify a "hidden" option
+	default n
+	help
+	  This options enables support of PCI bus enumeration for device
+	  drivers.
+
 config	EXTRA_SERIAL_PORT
 	bool
 	# omit prompt to signify a "hidden" option