video: tegra: Correct a Kconfig warning with VIDCONSOLE_AS_LCD

[u-boot] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 467fe251d8f7a3776cc1591590e4a738c8ccce86..49e173c820eda127cfea4eaf1d87f4a64d96ce8b 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -4,19 +4,19 @@ menu "x86 architecture"
 config SYS_ARCH
        default "x86"
 
 config SYS_ARCH
        default "x86"
 

-config USE_PRIVATE_LIBGCC
-       default y
-
-config SYS_VSNPRINTF
-       default y
-

 choice
        prompt "Mainboard vendor"
 choice
        prompt "Mainboard vendor"

-       default VENDOR_COREBOOT
+       default VENDOR_EMULATION

 
 config VENDOR_COREBOOT
        bool "coreboot"
 
 
 config VENDOR_COREBOOT
        bool "coreboot"
 

+config VENDOR_EFI
+       bool "efi"
+
+config VENDOR_EMULATION
+       bool "emulation"
+

 config VENDOR_GOOGLE
        bool "Google"
 
 config VENDOR_GOOGLE
        bool "Google"
 


@@ -27,6 +27,8 @@ 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/google/Kconfig"
 source "board/intel/Kconfig"
 


@@ -34,6 +36,7 @@ source "board/intel/Kconfig"
 source "arch/x86/cpu/baytrail/Kconfig"
 source "arch/x86/cpu/coreboot/Kconfig"
 source "arch/x86/cpu/ivybridge/Kconfig"
 source "arch/x86/cpu/baytrail/Kconfig"
 source "arch/x86/cpu/coreboot/Kconfig"
 source "arch/x86/cpu/ivybridge/Kconfig"

+source "arch/x86/cpu/qemu/Kconfig"

 source "arch/x86/cpu/quark/Kconfig"
 source "arch/x86/cpu/queensbay/Kconfig"
 
 source "arch/x86/cpu/quark/Kconfig"
 source "arch/x86/cpu/queensbay/Kconfig"
 


@@ -70,6 +73,21 @@ config X86_RESET_VECTOR
        bool
        default n
 
        bool
        default n
 

+config RESET_SEG_START
+       hex
+       depends on X86_RESET_VECTOR
+       default 0xffff0000
+
+config RESET_SEG_SIZE
+       hex
+       depends on X86_RESET_VECTOR
+       default 0x10000
+
+config RESET_VEC_LOC
+       hex
+       depends on X86_RESET_VECTOR
+       default 0xfffffff0
+

 config SYS_X86_START16
        hex
        depends on X86_RESET_VECTOR
 config SYS_X86_START16
        hex
        depends on X86_RESET_VECTOR


@@ -174,157 +192,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.
-
-menu "Display"
-
-config FRAMEBUFFER_SET_VESA_MODE
-       prompt "Set framebuffer graphics resolution"
-       bool
-       help
-         Set VESA/native framebuffer mode (needed for bootsplash and graphical framebuffer console)
-
-choice
-       prompt "framebuffer graphics resolution"
-       default FRAMEBUFFER_VESA_MODE_117
-       depends on FRAMEBUFFER_SET_VESA_MODE
-       help
-         This option sets the resolution used for the coreboot framebuffer (and
-         bootsplash screen).
-
-config FRAMEBUFFER_VESA_MODE_100
-       bool "640x400 256-color"
-
-config FRAMEBUFFER_VESA_MODE_101
-       bool "640x480 256-color"
-
-config FRAMEBUFFER_VESA_MODE_102
-       bool "800x600 16-color"
-
-config FRAMEBUFFER_VESA_MODE_103
-       bool "800x600 256-color"
-
-config FRAMEBUFFER_VESA_MODE_104
-       bool "1024x768 16-color"
-
-config FRAMEBUFFER_VESA_MODE_105
-       bool "1024x7686 256-color"
-
-config FRAMEBUFFER_VESA_MODE_106
-       bool "1280x1024 16-color"
-
-config FRAMEBUFFER_VESA_MODE_107
-       bool "1280x1024 256-color"
-
-config FRAMEBUFFER_VESA_MODE_108
-       bool "80x60 text"
-
-config FRAMEBUFFER_VESA_MODE_109
-       bool "132x25 text"
-
-config FRAMEBUFFER_VESA_MODE_10A
-       bool "132x43 text"
-
-config FRAMEBUFFER_VESA_MODE_10B
-       bool "132x50 text"
-
-config FRAMEBUFFER_VESA_MODE_10C
-       bool "132x60 text"
-
-config FRAMEBUFFER_VESA_MODE_10D
-       bool "320x200 32k-color (1:5:5:5)"
-
-config FRAMEBUFFER_VESA_MODE_10E
-       bool "320x200 64k-color (5:6:5)"
-
-config FRAMEBUFFER_VESA_MODE_10F
-       bool "320x200 16.8M-color (8:8:8)"
-
-config FRAMEBUFFER_VESA_MODE_110
-       bool "640x480 32k-color (1:5:5:5)"
-
-config FRAMEBUFFER_VESA_MODE_111
-       bool "640x480 64k-color (5:6:5)"
-
-config FRAMEBUFFER_VESA_MODE_112
-       bool "640x480 16.8M-color (8:8:8)"
-
-config FRAMEBUFFER_VESA_MODE_113
-       bool "800x600 32k-color (1:5:5:5)"
-
-config FRAMEBUFFER_VESA_MODE_114
-       bool "800x600 64k-color (5:6:5)"
-
-config FRAMEBUFFER_VESA_MODE_115
-       bool "800x600 16.8M-color (8:8:8)"
-
-config FRAMEBUFFER_VESA_MODE_116
-       bool "1024x768 32k-color (1:5:5:5)"
-
-config FRAMEBUFFER_VESA_MODE_117
-       bool "1024x768 64k-color (5:6:5)"
-
-config FRAMEBUFFER_VESA_MODE_118
-       bool "1024x768 16.8M-color (8:8:8)"
-
-config FRAMEBUFFER_VESA_MODE_119
-       bool "1280x1024 32k-color (1:5:5:5)"
-
-config FRAMEBUFFER_VESA_MODE_11A
-       bool "1280x1024 64k-color (5:6:5)"
-
-config FRAMEBUFFER_VESA_MODE_11B
-       bool "1280x1024 16.8M-color (8:8:8)"
-
-config FRAMEBUFFER_VESA_MODE_USER
-       bool "Manually select VESA mode"
-
-endchoice
-
-# Map the config names to an integer (KB).
-config FRAMEBUFFER_VESA_MODE
-       prompt "VESA mode" if FRAMEBUFFER_VESA_MODE_USER
-       hex
-       default 0x100 if FRAMEBUFFER_VESA_MODE_100
-       default 0x101 if FRAMEBUFFER_VESA_MODE_101
-       default 0x102 if FRAMEBUFFER_VESA_MODE_102
-       default 0x103 if FRAMEBUFFER_VESA_MODE_103
-       default 0x104 if FRAMEBUFFER_VESA_MODE_104
-       default 0x105 if FRAMEBUFFER_VESA_MODE_105
-       default 0x106 if FRAMEBUFFER_VESA_MODE_106
-       default 0x107 if FRAMEBUFFER_VESA_MODE_107
-       default 0x108 if FRAMEBUFFER_VESA_MODE_108
-       default 0x109 if FRAMEBUFFER_VESA_MODE_109
-       default 0x10A if FRAMEBUFFER_VESA_MODE_10A
-       default 0x10B if FRAMEBUFFER_VESA_MODE_10B
-       default 0x10C if FRAMEBUFFER_VESA_MODE_10C
-       default 0x10D if FRAMEBUFFER_VESA_MODE_10D
-       default 0x10E if FRAMEBUFFER_VESA_MODE_10E
-       default 0x10F if FRAMEBUFFER_VESA_MODE_10F
-       default 0x110 if FRAMEBUFFER_VESA_MODE_110
-       default 0x111 if FRAMEBUFFER_VESA_MODE_111
-       default 0x112 if FRAMEBUFFER_VESA_MODE_112
-       default 0x113 if FRAMEBUFFER_VESA_MODE_113
-       default 0x114 if FRAMEBUFFER_VESA_MODE_114
-       default 0x115 if FRAMEBUFFER_VESA_MODE_115
-       default 0x116 if FRAMEBUFFER_VESA_MODE_116
-       default 0x117 if FRAMEBUFFER_VESA_MODE_117
-       default 0x118 if FRAMEBUFFER_VESA_MODE_118
-       default 0x119 if FRAMEBUFFER_VESA_MODE_119
-       default 0x11A if FRAMEBUFFER_VESA_MODE_11A
-       default 0x11B if FRAMEBUFFER_VESA_MODE_11B
-       default 0x117 if FRAMEBUFFER_VESA_MODE_USER
-
-endmenu
-

 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


@@ -356,32 +226,92 @@ config FSP_ADDR
 
 config FSP_TEMP_RAM_ADDR
        hex
 
 config FSP_TEMP_RAM_ADDR
        hex

+       depends on HAVE_FSP

        default 0x2000000
        help
        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 TSC_CALIBRATION_BYPASS
-       bool "Bypass Time-Stamp Counter (TSC) calibration"
+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
        help
        default n
        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.
+         Enable use of more than one CPU in U-Boot and the Operating System
+         when loaded. Each CPU will be started up and information can be
+         obtained using the 'cpu' command. If this option is disabled, then
+         only one CPU will be enabled regardless of the number of CPUs
+         available.
+
+config MAX_CPUS
+       int "Maximum number of CPUs permitted"
+       depends on SMP
+       default 4
+       help
+         When using multi-CPU chips it is possible for U-Boot to start up
+         more than one CPU. The stack memory used by all of these CPUs is
+         pre-allocated so at present U-Boot wants to know the maximum
+         number of CPUs that may be present. Set this to at least as high
+         as the number of CPUs in your system (it uses about 4KB of RAM for
+         each CPU).
+
+config AP_STACK_SIZE
+       hex
+       depends on SMP
+       default 0x1000
+       help
+         Each additional CPU started by U-Boot requires its own stack. This
+         option sets the stack size used by each CPU and directly affects
+         the memory used by this initialisation process. Typically 4KB is
+         enough space.

 
 

-         Normally this option should be turned on in a simulation environment
-         like qemu.
+config HAVE_VGA_BIOS
+       bool "Add a VGA BIOS image"
+       help
+         Select this option if you have a VGA BIOS image that you would
+         like to add to your ROM.
+
+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"


@@ -407,6 +337,44 @@ config GENERATE_SFI_TABLE
 
          For more information, see http://simplefirmware.org
 
 
          For more information, see http://simplefirmware.org
 

+config GENERATE_MP_TABLE
+       bool "Generate an MP (Multi-Processor) table"
+       default n
+       help
+         Generate an MP (Multi-Processor) table for this board. The MP table
+         provides a way for the operating system to support for symmetric
+         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


@@ -440,13 +408,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 BOOTSTAGE
+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
        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 BOOTSTAGE_REPORT
+config I8042_KEYB

        default y
 
        default y
 

-config CMD_BOOTSTAGE
+config DM_KEYBOARD

        default y
 
        default y
 

+source "arch/x86/lib/efi/Kconfig"
+

 endmenu
 endmenu