From 772a154d39025e5f7f30102cca9f935e9b35cb1c Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Fri, 10 May 2019 16:48:14 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32737 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/cpu/intel/Makefile.inc | 1 - src/cpu/intel/model_206ax/Kconfig | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/cpu/intel') diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc index 73a8bf8474..3f897407cf 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 f045e9aac5..dbb8982121 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 -- cgit v1.2.3