diff mbox

[U-Boot,1/4] x86: ivybridge: Remove NORTHBRIDGE_INTEL_SANDYBRIDGE

Message ID 1448441129-23142-1-git-send-email-bmeng.cn@gmail.com
State Superseded
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng Nov. 25, 2015, 8:45 a.m. UTC
NORTHBRIDGE_INTEL_SANDYBRIDGE is for sandybridge, not ivybridge.

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

 arch/x86/cpu/ivybridge/Kconfig | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

Comments

Simon Glass Nov. 25, 2015, 4:52 p.m. UTC | #1
On 25 November 2015 at 01:45, Bin Meng <bmeng.cn@gmail.com> wrote:
> NORTHBRIDGE_INTEL_SANDYBRIDGE is for sandybridge, not ivybridge.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/cpu/ivybridge/Kconfig | 33 +--------------------------------
>  1 file changed, 1 insertion(+), 32 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>
diff mbox

Patch

diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig
index 0e249a4..d20c038 100644
--- a/arch/x86/cpu/ivybridge/Kconfig
+++ b/arch/x86/cpu/ivybridge/Kconfig
@@ -5,37 +5,11 @@ 
 #
 # SPDX-License-Identifier:	GPL-2.0
 
-
-config NORTHBRIDGE_INTEL_SANDYBRIDGE
-	bool
-	select CACHE_MRC_BIN
-	select CPU_INTEL_MODEL_206AX
-
 config NORTHBRIDGE_INTEL_IVYBRIDGE
 	bool
 	select CACHE_MRC_BIN
 	select CPU_INTEL_MODEL_306AX
 
-if NORTHBRIDGE_INTEL_SANDYBRIDGE
-
-config VGA_BIOS_ID
-	string
-	default "8086,0106"
-
-config CACHE_MRC_SIZE_KB
-	int
-	default 256
-
-config DCACHE_RAM_BASE
-	hex
-	default 0xff7f0000
-
-config DCACHE_RAM_SIZE
-	hex
-	default 0x10000
-
-endif
-
 if NORTHBRIDGE_INTEL_IVYBRIDGE
 
 config VGA_BIOS_ID
@@ -58,10 +32,6 @@  config DCACHE_RAM_SIZE
 	hex
 	default 0x20000
 
-endif
-
-if NORTHBRIDGE_INTEL_SANDYBRIDGE || NORTHBRIDGE_INTEL_IVYBRIDGE
-
 config HAVE_MRC
         bool "Add a System Agent binary"
         help
@@ -83,8 +53,7 @@  config DCACHE_RAM_MRC_VAR_SIZE
 config MRC_FILE
 	string "Intel System Agent path and filename"
 	depends on HAVE_MRC
-	default "systemagent-ivybridge.bin" if NORTHBRIDGE_INTEL_IVYBRIDGE
-	default "systemagent-sandybridge.bin" if NORTHBRIDGE_INTEL_SANDYBRIDGE
+	default "systemagent-ivybridge.bin"
 	help
 	  The path and filename of the file to use as System Agent
 	  binary.