x86: Move CONFIG_8259_PIC and CONFIG_8254_TIMER to Kconfig

Add Kconfig options for 8259 and 8254.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f92082d4766c8f11d558b3983a4cc5986c7c3730..8914be34e687fb7d733021e5a7fcb138b7566f47 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -420,6 +420,21 @@ config PCIE_ECAM_SIZE
          so a default 0x10000000 size covers all of the 256 buses which is the
          maximum number of PCI buses as defined by the PCI specification.
 
+config I8259_PIC
+       bool
+       default y
+       help
+         Intel 8259 ISA compatible chipset incorporates two 8259 (master and
+         slave) interrupt controllers. Include this to have U-Boot set up
+         the interrupt correctly.
+
+config I8254_TIMER
+       bool
+       default y
+       help
+         Intel 8254 timer contains three counters which have fixed uses.
+         Include this to have U-Boot set up the timer correctly.
+
 source "arch/x86/lib/efi/Kconfig"
 
 endmenu

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 58d2f427dee19f733e7f9f63d5aeef44a3cbdde4..ab9fa0b082172146a273cfdc5521c365d9b1b7d6 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -155,8 +155,6 @@
  */
 
 #define CONFIG_SYS_X86_TSC_TIMER
-#define CONFIG_I8259_PIC
-#define CONFIG_I8254_TIMER
 
 #define CONFIG_SYS_STACK_SIZE                  (32 * 1024)
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE