summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2009-08-21 18:08:49 +0000
committerRonald G. Minnich <rminnich@gmail.com>2009-08-21 18:08:49 +0000
commitebed2dc72056228761e02c5e767f84a1b4187964 (patch)
tree774124aa2dce185f2b4ec4303cd39a58f06d8224 /src/cpu
parent0b028a450f4f966541c3de243f8063cbcd3e7bd2 (diff)
downloadcoreboot-ebed2dc72056228761e02c5e767f84a1b4187964.tar.xz
Change the intel cpu makefile.inc so that it fits the model better.
- intel/Makefile.inc only mentions sockets - those sockets are conditionally included - makefile.inc in socket directories are almost all unconditionally included - Get rid of if where possible, use -$(CONFIG_VARIABLE) instead as per Kconfig standards in linux kernel See the Kconfig.tex documentation for questions. Signed-off-by: Ronald G. Minnich <rminnich@gmail.com> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4561 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/intel/Makefile.inc5
-rw-r--r--src/cpu/intel/socket_PGA370/Makefile.inc25
-rw-r--r--src/cpu/intel/socket_mFCPGA478/Makefile.inc34
-rw-r--r--src/cpu/intel/speedstep/Makefile.inc6
4 files changed, 32 insertions, 38 deletions
diff --git a/src/cpu/intel/Makefile.inc b/src/cpu/intel/Makefile.inc
index afe5cd3c79..d986c6350d 100644
--- a/src/cpu/intel/Makefile.inc
+++ b/src/cpu/intel/Makefile.inc
@@ -2,9 +2,8 @@
# Therefore:
# ONLY include Makefile.inc from socket directories!
-subdirs-y += speedstep
-subdirs-y += socket_mFCPGA478
-subdirs-y += socket_PGA370
+subdirs-$(CONFIG_CPU_INTEL_SOCKET_MFCPGA478) += socket_mFCPGA478
+subdirs-$(CONFIG_CPU_INTEL_SOCKET_PGA370) += socket_PGA370
#socket_mPGA478
#socket_mPGA479M
diff --git a/src/cpu/intel/socket_PGA370/Makefile.inc b/src/cpu/intel/socket_PGA370/Makefile.inc
index 46a851a3d5..b56585e889 100644
--- a/src/cpu/intel/socket_PGA370/Makefile.inc
+++ b/src/cpu/intel/socket_PGA370/Makefile.inc
@@ -18,17 +18,16 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-ifeq ($(CONFIG_CPU_INTEL_SOCKET_PGA370),y)
- obj-y += socket_PGA370.o
- subdirs-y += ../model_6xx
- subdirs-y += ../../x86/tsc
- subdirs-y += ../../x86/mtrr
- subdirs-y += ../../x86/fpu
- subdirs-y += ../../x86/mmx
- subdirs-y += ../../x86/sse
- subdirs-y += ../../x86/lapic
- subdirs-y += ../../x86/cache
- subdirs-y += ../../x86/smm
- subdirs-y += ../microcode
-endif
+obj-y += socket_PGA370.o
+subdirs-y += ../model_6xx
+subdirs-y += ../../x86/tsc
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/fpu
+subdirs-y += ../../x86/mmx
+subdirs-y += ../../x86/sse
+subdirs-y += ../../x86/lapic
+subdirs-y += ../../x86/cache
+subdirs-y += ../../x86/smm
+subdirs-y += ../microcode
+
diff --git a/src/cpu/intel/socket_mFCPGA478/Makefile.inc b/src/cpu/intel/socket_mFCPGA478/Makefile.inc
index 808dd4ffd1..5da270215a 100644
--- a/src/cpu/intel/socket_mFCPGA478/Makefile.inc
+++ b/src/cpu/intel/socket_mFCPGA478/Makefile.inc
@@ -1,17 +1,17 @@
-ifeq ($(CONFIG_CPU_INTEL_SOCKET_MFCPGA478),y)
- obj-y += socket_mFCPGA478.o
- subdirs-y += ../model_69x
- subdirs-y += ../model_6dx
- subdirs-y += ../model_6ex
- subdirs-y += ../model_6fx
- subdirs-y += ../../x86/tsc
- subdirs-y += ../../x86/mtrr
- subdirs-y += ../../x86/fpu
- subdirs-y += ../../x86/mmx
- subdirs-y += ../../x86/sse
- subdirs-y += ../../x86/lapic
- subdirs-y += ../../x86/cache
- subdirs-y += ../../x86/smm
- subdirs-y += ../microcode
- subdirs-y += ../hyperthreading
-endif
+obj-y += socket_mFCPGA478.o
+subdirs-y += ../model_69x
+subdirs-y += ../model_6dx
+subdirs-y += ../model_6ex
+subdirs-y += ../model_6fx
+subdirs-y += ../../x86/tsc
+subdirs-y += ../../x86/mtrr
+subdirs-y += ../../x86/fpu
+subdirs-y += ../../x86/mmx
+subdirs-y += ../../x86/sse
+subdirs-y += ../../x86/lapic
+subdirs-y += ../../x86/cache
+subdirs-y += ../../x86/smm
+subdirs-y += ../microcode
+subdirs-y += ../hyperthreading
+subdirs-y += ../speedstep
+
diff --git a/src/cpu/intel/speedstep/Makefile.inc b/src/cpu/intel/speedstep/Makefile.inc
index 4351d68c21..1c948af316 100644
--- a/src/cpu/intel/speedstep/Makefile.inc
+++ b/src/cpu/intel/speedstep/Makefile.inc
@@ -1,5 +1 @@
-ifeq ($(CONFIG_HAVE_ACPI_TABLES), y)
-ifeq ($(CONFIG_CPU_INTEL_SOCKET_MFCPGA478), y)
- obj-y += acpi.o
-endif
-endif
+obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi.o