From: Bin Meng Date: Fri, 23 Oct 2015 02:13:31 +0000 (-0700) Subject: x86: Move CONFIG_8259_PIC and CONFIG_8254_TIMER to Kconfig X-Git-Tag: v2016.01-rc1~4^2~10 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1eb39a509354ae3c199c739bfb2d3a0d442e2cac;p=u-boot x86: Move CONFIG_8259_PIC and CONFIG_8254_TIMER to Kconfig Add Kconfig options for 8259 and 8254. Signed-off-by: Bin Meng Acked-by: Simon Glass --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f92082d476..8914be34e6 100644 --- 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 58d2f427de..ab9fa0b082 100644 --- 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