From aaf005eb3ddaff2fece7f53a2199ef92ef808639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Fri, 14 Nov 2014 17:26:50 +0200
Subject: sandy/ivybridge: Use DYNAMIC_CBMEM with native raminit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I76577cc3739f23d392d077db5a5edfdbdbe8fb1e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7466
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
---
 src/mainboard/lenovo/t520/Kconfig         | 1 -
 src/mainboard/lenovo/t530/Kconfig         | 1 -
 src/mainboard/lenovo/x220/Kconfig         | 1 -
 src/mainboard/lenovo/x230/Kconfig         | 1 -
 src/northbridge/intel/sandybridge/Kconfig | 2 ++
 5 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index ae88dc4c8e..b31052f55c 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select HAVE_SMI_HANDLER
 	select INTEL_INT15
-	select EARLY_CBMEM_INIT
 	select VGA
 	select INTEL_EDID
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 916dee023e..cd4999691c 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select HAVE_SMI_HANDLER
 	select INTEL_INT15
-	select EARLY_CBMEM_INIT
 	select VGA
 	select INTEL_EDID
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index 132148ffb1..51965e86d5 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select HAVE_SMI_HANDLER
 	select INTEL_INT15
-	select EARLY_CBMEM_INIT
 	select VGA
 	select INTEL_EDID
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index acdc87d0c0..597db4d09a 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select HAVE_SMI_HANDLER
 	select INTEL_INT15
-	select EARLY_CBMEM_INIT
 	select VGA
 	select INTEL_EDID
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index 47592c65a5..647b4fbfc2 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -31,6 +31,7 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE
 	select CACHE_MRC_BIN
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
+	select DYNAMIC_CBMEM
 	select CPU_INTEL_MODEL_206AX
 	select HAVE_DEBUG_RAM_SETUP
 	select PER_DEVICE_ACPI_TABLES
@@ -49,6 +50,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE
 	select CACHE_MRC_BIN
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
+	select DYNAMIC_CBMEM
 	select CPU_INTEL_MODEL_306AX
 	select HAVE_DEBUG_RAM_SETUP
 	select PER_DEVICE_ACPI_TABLES
-- 
cgit v1.2.3