[v2] r4561 - in trunk/coreboot-v2/src/cpu/intel: . socket_PGA370 socket_mFCPGA478 speedstep

Author: rminnich
Date: 2009-08-21 20:08:49 +0200 (Fri, 21 Aug 2009)
New Revision: 4561

Modified:
   trunk/coreboot-v2/src/cpu/intel/Makefile.inc
   trunk/coreboot-v2/src/cpu/intel/socket_PGA370/Makefile.inc
   trunk/coreboot-v2/src/cpu/intel/socket_mFCPGA478/Makefile.inc
   trunk/coreboot-v2/src/cpu/intel/speedstep/Makefile.inc
Log:
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 
Acked-by: Patrick Georgi

Modified: trunk/coreboot-v2/src/cpu/intel/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/Makefile.inc	2009-08-21 14:59:14 UTC (rev 4560)
+++ trunk/coreboot-v2/src/cpu/intel/Makefile.inc	2009-08-21 18:08:49 UTC (rev 4561)
@@ -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

Modified: trunk/coreboot-v2/src/cpu/intel/socket_PGA370/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/socket_PGA370/Makefile.inc	2009-08-21 14:59:14 UTC (rev 4560)
+++ trunk/coreboot-v2/src/cpu/intel/socket_PGA370/Makefile.inc	2009-08-21 18:08:49 UTC (rev 4561)
@@ -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

+

Modified: trunk/coreboot-v2/src/cpu/intel/socket_mFCPGA478/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/socket_mFCPGA478/Makefile.inc	2009-08-21 14:59:14 UTC (rev 4560)
+++ trunk/coreboot-v2/src/cpu/intel/socket_mFCPGA478/Makefile.inc	2009-08-21 18:08:49 UTC (rev 4561)
@@ -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
+

Modified: trunk/coreboot-v2/src/cpu/intel/speedstep/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/speedstep/Makefile.inc	2009-08-21 14:59:14 UTC (rev 4560)
+++ trunk/coreboot-v2/src/cpu/intel/speedstep/Makefile.inc	2009-08-21 18:08:49 UTC (rev 4561)
@@ -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