diff mbox

[U-Boot,v2,6/8] x86: Move CONFIG_8259_PIC and CONFIG_8254_TIMER to Kconfig

Message ID 1445566413-20821-7-git-send-email-bmeng.cn@gmail.com
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Bin Meng Oct. 23, 2015, 2:13 a.m. UTC
Add Kconfig options for 8259 and 8254.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

---

Changes in v2:
- Add help for the Kconfig options

 arch/x86/Kconfig             | 15 +++++++++++++++
 include/configs/x86-common.h |  2 --
 2 files changed, 15 insertions(+), 2 deletions(-)

Comments

Simon Glass Oct. 23, 2015, 2:31 a.m. UTC | #1
On 22 October 2015 at 20:13, Bin Meng <bmeng.cn@gmail.com> wrote:
> Add Kconfig options for 8259 and 8254.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>
> ---
>
> Changes in v2:
> - Add help for the Kconfig options
>
>  arch/x86/Kconfig             | 15 +++++++++++++++
>  include/configs/x86-common.h |  2 --
>  2 files changed, 15 insertions(+), 2 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass Oct. 30, 2015, 10:30 p.m. UTC | #2
Applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f92082d..8914be3 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 58d2f42..ab9fa0b 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