diff options
| -rw-r--r-- | src/cpu/intel/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/cpu/intel/socket_PGA370/Makefile.inc | 25 | ||||
| -rw-r--r-- | src/cpu/intel/socket_mFCPGA478/Makefile.inc | 34 | ||||
| -rw-r--r-- | src/cpu/intel/speedstep/Makefile.inc | 6 |
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 |