summaryrefslogtreecommitdiffstats
path: root/src/cpu
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2019-05-10 16:48:14 +0200
committerNico Huber <nico.h@gmx.de>2019-05-12 15:03:03 +0000
commit772a154d39025e5f7f30102cca9f935e9b35cb1c (patch)
tree18ed0dd7b83f580f6587403938e967e618b3cff6 /src/cpu
parent47953d0ae066ad05a62e3dc5ae560e3a6796d035 (diff)
downloadcoreboot-772a154d39025e5f7f30102cca9f935e9b35cb1c.tar.gz
coreboot-772a154d39025e5f7f30102cca9f935e9b35cb1c.tar.bz2
coreboot-772a154d39025e5f7f30102cca9f935e9b35cb1c.zip
nb/intel/snb: Drop NORTHBRIDGE_INTEL_IVYBRIDGE
We keep the support, though. Just now that `libgfxinit` is fixed, we don't need the distinction anymore. Causally, we also don't need CPU_INTEL_MODEL_306AX any more. TEST=Played tint on kontron/ktqm77. Score 606 Change-Id: Id1e33c77f44a66baacba375cbb2aeb71effb7b76 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32737 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/intel/Makefile.inc1
-rw-r--r--src/cpu/intel/model_206ax/Kconfig5
2 files changed, 1 insertions, 5 deletions
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc
index 73a8bf8474d4..3f897407cf43 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/src/cpu/intel/Makefile.inc
@@ -12,7 +12,6 @@ subdirs-$(CONFIG_CPU_INTEL_SOCKET_P) += socket_p
subdirs-$(CONFIG_CPU_INTEL_SOCKET_MPGA604) += socket_mPGA604
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_NEHALEM) += model_2065x
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += model_206ax
-subdirs-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += model_206ax
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_HASWELL) += haswell
subdirs-$(CONFIG_NORTHBRIDGE_INTEL_FSP_RANGELEY) += fsp_model_406dx
subdirs-$(CONFIG_CPU_INTEL_SLOT_1) += slot_1
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index f045e9aac510..dbb898212152 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -1,10 +1,7 @@
config CPU_INTEL_MODEL_206AX
bool
-config CPU_INTEL_MODEL_306AX
- bool
-
-if CPU_INTEL_MODEL_206AX || CPU_INTEL_MODEL_306AX
+if CPU_INTEL_MODEL_206AX
config CPU_SPECIFIC_OPTIONS
def_bool y