Merge branch 'master' of git://git.denx.de/u-boot-x86

[u-boot] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b52a80e1c2017215766723bc3bbce1e04657bf49..a995e32bb98cfc3dd1f5dc2a9efb4ed3b044516f 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -11,6 +11,9 @@ choice
 config VENDOR_COREBOOT
        bool "coreboot"
 
 config VENDOR_COREBOOT
        bool "coreboot"
 

+config VENDOR_EFI
+       bool "efi"
+

 config VENDOR_EMULATION
        bool "emulation"
 
 config VENDOR_EMULATION
        bool "emulation"
 


@@ -24,6 +27,7 @@ endchoice
 
 # board-specific options below
 source "board/coreboot/Kconfig"
 
 # board-specific options below
 source "board/coreboot/Kconfig"

+source "board/efi/Kconfig"

 source "board/emulation/Kconfig"
 source "board/google/Kconfig"
 source "board/intel/Kconfig"
 source "board/emulation/Kconfig"
 source "board/google/Kconfig"
 source "board/intel/Kconfig"


@@ -89,6 +93,9 @@ config SYS_X86_START16
        depends on X86_RESET_VECTOR
        default 0xfffff800
 
        depends on X86_RESET_VECTOR
        default 0xfffff800
 

+config DM_PCI_COMPAT
+       default y       # Until we finish moving over to the new API
+

 config BOARD_ROMSIZE_KB_512
        bool
 config BOARD_ROMSIZE_KB_1024
 config BOARD_ROMSIZE_KB_512
        bool
 config BOARD_ROMSIZE_KB_1024


@@ -188,16 +195,9 @@ config X86_RAMTEST
          to work correctly. It is not exhaustive but can save time by
          detecting obvious failures.
 
          to work correctly. It is not exhaustive but can save time by
          detecting obvious failures.
 

-config MARK_GRAPHICS_MEM_WRCOMB
-       bool "Mark graphics memory as write-combining"
-       default n
-       help
-         The graphics performance may increase if the graphics
-         memory is set as write-combining cache type. This option
-         enables marking the graphics memory as write-combining.
-

 config HAVE_FSP
        bool "Add an Firmware Support Package binary"
 config HAVE_FSP
        bool "Add an Firmware Support Package binary"

+       depends on !EFI

        help
          Select this option to add an Firmware Support Package binary to
          the resulting U-Boot image. It is a binary blob which U-Boot uses
        help
          Select this option to add an Firmware Support Package binary to
          the resulting U-Boot image. It is a binary blob which U-Boot uses


@@ -232,9 +232,33 @@ config FSP_TEMP_RAM_ADDR
        depends on HAVE_FSP
        default 0x2000000
        help
        depends on HAVE_FSP
        default 0x2000000
        help

-         Stack top address which is used in FspInit after DRAM is ready and
+         Stack top address which is used in fsp_init() after DRAM is ready and

          CAR is disabled.
 
          CAR is disabled.
 

+config FSP_SYS_MALLOC_F_LEN
+       hex
+       depends on HAVE_FSP
+       default 0x100000
+       help
+         Additional size of malloc() pool before relocation.
+
+config FSP_USE_UPD
+       bool
+       depends on HAVE_FSP
+       default y
+       help
+         Most FSPs use UPD data region for some FSP customization. But there
+         are still some FSPs that might not even have UPD. For such FSPs,
+         override this to n in their platform Kconfig files.
+
+config ENABLE_MRC_CACHE
+       bool "Enable MRC cache"
+       depends on !EFI && !SYS_COREBOOT
+       help
+         Enable this feature to cause MRC data to be cached in NV storage
+         to be used for speeding up boot time on future reboots and/or
+         power cycles.
+

 config SMP
        bool "Enable Symmetric Multiprocessing"
        default n
 config SMP
        bool "Enable Symmetric Multiprocessing"
        default n


@@ -267,27 +291,30 @@ config AP_STACK_SIZE
          the memory used by this initialisation process. Typically 4KB is
          enough space.
 
          the memory used by this initialisation process. Typically 4KB is
          enough space.
 

-config TSC_CALIBRATION_BYPASS
-       bool "Bypass Time-Stamp Counter (TSC) calibration"
-       default n
+config HAVE_VGA_BIOS
+       bool "Add a VGA BIOS image"

        help
        help

-         By default U-Boot automatically calibrates Time-Stamp Counter (TSC)
-         running frequency via Model-Specific Register (MSR) and Programmable
-         Interval Timer (PIT). If the calibration does not work on your board,
-         select this option and provide a hardcoded TSC running frequency with
-         CONFIG_TSC_FREQ_IN_MHZ below.
+         Select this option if you have a VGA BIOS image that you would
+         like to add to your ROM.

 
 

-         Normally this option should be turned on in a simulation environment
-         like qemu.
+config VGA_BIOS_FILE
+       string "VGA BIOS image filename"
+       depends on HAVE_VGA_BIOS
+       default "vga.bin"
+       help
+         The filename of the VGA BIOS image in the board directory.

 
 

-config TSC_FREQ_IN_MHZ
-       int "Time-Stamp Counter (TSC) running frequency in MHz"
-       depends on TSC_CALIBRATION_BYPASS
-       default 1000
+config VGA_BIOS_ADDR
+       hex "VGA BIOS image location"
+       depends on HAVE_VGA_BIOS
+       default 0xfff90000

        help
        help

-         The running frequency in MHz of Time-Stamp Counter (TSC).
+         The location of VGA BIOS image in the SPI flash. For example, base
+         address of 0xfff90000 indicates that the image will be put at offset
+         0x90000 from the beginning of a 1MB flash device.

 
 menu "System tables"
 
 menu "System tables"

+       depends on !EFI && !SYS_COREBOOT

 
 config GENERATE_PIRQ_TABLE
        bool "Generate a PIRQ table"
 
 config GENERATE_PIRQ_TABLE
        bool "Generate a PIRQ table"


@@ -322,6 +349,35 @@ config GENERATE_MP_TABLE
          multiprocessing as well as symmetric I/O interrupt handling with
          the local APIC and I/O APIC.
 
          multiprocessing as well as symmetric I/O interrupt handling with
          the local APIC and I/O APIC.
 

+config GENERATE_ACPI_TABLE
+       bool "Generate an ACPI (Advanced Configuration and Power Interface) table"
+       default n
+       help
+         The Advanced Configuration and Power Interface (ACPI) specification
+         provides an open standard for device configuration and management
+         by the operating system. It defines platform-independent interfaces
+         for configuration and power management monitoring.
+
+config QEMU_ACPI_TABLE
+       bool "Load ACPI table from QEMU fw_cfg interface"
+       depends on GENERATE_ACPI_TABLE && QEMU
+       default y
+       help
+         By default, U-Boot generates its own ACPI tables. This option, if
+         enabled, disables U-Boot's version and loads ACPI tables generated
+         by QEMU.
+
+config GENERATE_SMBIOS_TABLE
+       bool "Generate an SMBIOS (System Management BIOS) table"
+       default y
+       help
+         The System Management BIOS (SMBIOS) specification addresses how
+         motherboard and system vendors present management information about
+         their products in a standard format by extending the BIOS interface
+         on Intel architecture systems.
+
+         Check http://www.dmtf.org/standards/smbios for details.
+

 endmenu
 
 config MAX_PIRQ_LINKS
 endmenu
 
 config MAX_PIRQ_LINKS


@@ -355,4 +411,37 @@ config PCIE_ECAM_BASE
          assigned to PCI devices - i.e. the memory and prefetch regions, as
          passed to pci_set_region().
 
          assigned to PCI devices - i.e. the memory and prefetch regions, as
          passed to pci_set_region().
 

+config PCIE_ECAM_SIZE
+       hex
+       default 0x10000000
+       help
+         This is the size of memory-mapped address of PCI configuration space,
+         which is only available through the Enhanced Configuration Access
+         Mechanism (ECAM) with PCI Express. Each bus consumes 1 MiB memory,
+         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.
+
+config I8042_KEYB
+       default y
+
+config DM_KEYBOARD
+       default y
+
+source "arch/x86/lib/efi/Kconfig"
+

 endmenu
 endmenu