Commit 67f99f970f2bc1fae6aece1669b8b8bcb504cff1

Authored by Bin Meng
1 parent 5d89b37f71

x86: kconfig: Imply ENABLE_MRC_CACHE in the platform Kconfig

Platform knows whether MRC cache is implemented, but using it can
be a choice of a specific board.

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

Showing 17 changed files with 5 additions and 12 deletions Side-by-side Diff

arch/x86/cpu/baytrail/Kconfig
... ... @@ -10,6 +10,7 @@
10 10 select ARCH_MISC_INIT if !EFI
11 11 imply ENV_IS_IN_SPI_FLASH
12 12 imply HAVE_INTEL_ME if !EFI
  13 + imply ENABLE_MRC_CACHE
13 14  
14 15 if INTEL_BAYTRAIL
15 16 config INTERNAL_UART
arch/x86/cpu/broadwell/Kconfig
... ... @@ -8,6 +8,7 @@
8 8 select CACHE_MRC_BIN
9 9 select ARCH_EARLY_INIT_R
10 10 imply HAVE_INTEL_ME
  11 + imply ENABLE_MRC_CACHE
11 12  
12 13 if INTEL_BROADWELL
13 14  
arch/x86/cpu/ivybridge/Kconfig
... ... @@ -9,6 +9,7 @@
9 9 bool
10 10 select CACHE_MRC_BIN if HAVE_MRC
11 11 imply HAVE_INTEL_ME
  12 + imply ENABLE_MRC_CACHE
12 13  
13 14 if NORTHBRIDGE_INTEL_IVYBRIDGE
14 15  
arch/x86/cpu/quark/Kconfig
... ... @@ -9,6 +9,7 @@
9 9 select HAVE_RMU
10 10 select ARCH_EARLY_INIT_R
11 11 select ARCH_MISC_INIT
  12 + imply ENABLE_MRC_CACHE
12 13  
13 14 if INTEL_QUARK
14 15  
configs/bayleybay_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_DEFAULT_DEVICE_TREE="bayleybay"
4 4 CONFIG_TARGET_BAYLEYBAY=y
5 5 CONFIG_INTERNAL_UART=y
6   -CONFIG_ENABLE_MRC_CACHE=y
7 6 CONFIG_SMP=y
8 7 CONFIG_HAVE_VGA_BIOS=y
9 8 CONFIG_VGA_BIOS_ADDR=0xfffa0000
configs/chromebook_link64_defconfig
... ... @@ -11,7 +11,6 @@
11 11 CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
12 12 CONFIG_TARGET_CHROMEBOOK_LINK64=y
13 13 CONFIG_DEBUG_UART=y
14   -CONFIG_ENABLE_MRC_CACHE=y
15 14 CONFIG_HAVE_MRC=y
16 15 CONFIG_SMP=y
17 16 CONFIG_HAVE_VGA_BIOS=y
configs/chromebook_link_defconfig
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
5 5 CONFIG_TARGET_CHROMEBOOK_LINK=y
6 6 CONFIG_DEBUG_UART=y
7   -CONFIG_ENABLE_MRC_CACHE=y
8 7 CONFIG_HAVE_MRC=y
9 8 CONFIG_SMP=y
10 9 CONFIG_HAVE_VGA_BIOS=y
configs/chromebook_samus_defconfig
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_DEFAULT_DEVICE_TREE="chromebook_samus"
5 5 CONFIG_TARGET_CHROMEBOOK_SAMUS=y
6 6 CONFIG_DEBUG_UART=y
7   -CONFIG_ENABLE_MRC_CACHE=y
8 7 CONFIG_HAVE_MRC=y
9 8 CONFIG_HAVE_REFCODE=y
10 9 CONFIG_SMP=y
configs/chromebox_panther_defconfig
... ... @@ -2,7 +2,6 @@
2 2 CONFIG_VENDOR_GOOGLE=y
3 3 CONFIG_DEFAULT_DEVICE_TREE="chromebox_panther"
4 4 CONFIG_TARGET_CHROMEBOX_PANTHER=y
5   -CONFIG_ENABLE_MRC_CACHE=y
6 5 CONFIG_HAVE_MRC=y
7 6 CONFIG_HAVE_VGA_BIOS=y
8 7 CONFIG_FIT=y
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845"
5 5 CONFIG_INTERNAL_UART=y
6 6 CONFIG_DEBUG_UART=y
7   -CONFIG_ENABLE_MRC_CACHE=y
8 7 CONFIG_SMP=y
9 8 CONFIG_HAVE_VGA_BIOS=y
10 9 CONFIG_GENERATE_PIRQ_TABLE=y
configs/conga-qeval20-qa3-e3845_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_TARGET_CONGA_QEVAL20_QA3_E3845=y
4 4 CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845"
5 5 CONFIG_DEBUG_UART=y
6   -CONFIG_ENABLE_MRC_CACHE=y
7 6 CONFIG_SMP=y
8 7 CONFIG_HAVE_VGA_BIOS=y
9 8 CONFIG_GENERATE_PIRQ_TABLE=y
configs/cougarcanyon2_defconfig
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_VENDOR_INTEL=y
3 3 CONFIG_DEFAULT_DEVICE_TREE="cougarcanyon2"
4 4 CONFIG_TARGET_COUGARCANYON2=y
  5 +# CONFIG_ENABLE_MRC_CACHE is not set
5 6 CONFIG_ENV_IS_IN_SPI_FLASH=y
6 7 CONFIG_CONSOLE_MUX=y
7 8 CONFIG_SYS_CONSOLE_INFO_QUIET=y
configs/dfi-bt700-q7x-151_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_DEFAULT_DEVICE_TREE="dfi-bt700-q7x-151"
4 4 CONFIG_TARGET_DFI_BT700=y
5 5 CONFIG_DEBUG_UART=y
6   -CONFIG_ENABLE_MRC_CACHE=y
7 6 CONFIG_SMP=y
8 7 CONFIG_HAVE_VGA_BIOS=y
9 8 CONFIG_GENERATE_PIRQ_TABLE=y
configs/galileo_defconfig
... ... @@ -2,7 +2,6 @@
2 2 CONFIG_VENDOR_INTEL=y
3 3 CONFIG_DEFAULT_DEVICE_TREE="galileo"
4 4 CONFIG_TARGET_GALILEO=y
5   -CONFIG_ENABLE_MRC_CACHE=y
6 5 CONFIG_GENERATE_PIRQ_TABLE=y
7 6 CONFIG_GENERATE_MP_TABLE=y
8 7 CONFIG_GENERATE_ACPI_TABLE=y
configs/minnowmax_defconfig
... ... @@ -4,7 +4,6 @@
4 4 CONFIG_TARGET_MINNOWMAX=y
5 5 CONFIG_INTERNAL_UART=y
6 6 CONFIG_DEBUG_UART=y
7   -CONFIG_ENABLE_MRC_CACHE=y
8 7 CONFIG_SMP=y
9 8 CONFIG_HAVE_VGA_BIOS=y
10 9 CONFIG_GENERATE_PIRQ_TABLE=y
configs/som-db5800-som-6867_defconfig
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_TARGET_SOM_DB5800_SOM_6867=y
4 4 CONFIG_DEFAULT_DEVICE_TREE="baytrail_som-db5800-som-6867"
5 5 CONFIG_DEBUG_UART=y
6   -CONFIG_ENABLE_MRC_CACHE=y
7 6 CONFIG_SMP=y
8 7 CONFIG_HAVE_VGA_BIOS=y
9 8 CONFIG_GENERATE_PIRQ_TABLE=y
configs/theadorable-x86-dfi-bt700_defconfig
... ... @@ -2,7 +2,6 @@
2 2 CONFIG_VENDOR_DFI=y
3 3 CONFIG_DEFAULT_DEVICE_TREE="theadorable-x86-dfi-bt700"
4 4 CONFIG_TARGET_DFI_BT700=y
5   -CONFIG_ENABLE_MRC_CACHE=y
6 5 CONFIG_SMP=y
7 6 CONFIG_HAVE_VGA_BIOS=y
8 7 CONFIG_VGA_BIOS_ADDR=0xfffa0000