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

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

src/cpu/intel/socket_PGA370/Makefile.inc

@@ -18,7 +18,6 @@
 ## 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
@@ -30,5 +29,5 @@ ifeq ($(CONFIG_CPU_INTEL_SOCKET_PGA370),y)
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 subdirs-y += ../microcode
-endif
+
 

src/cpu/intel/socket_mFCPGA478/Makefile.inc

@@ -1,4 +1,3 @@
-ifeq ($(CONFIG_CPU_INTEL_SOCKET_MFCPGA478),y)
 obj-y += socket_mFCPGA478.o
 subdirs-y += ../model_69x
 subdirs-y += ../model_6dx
@@ -14,4 +13,5 @@ ifeq ($(CONFIG_CPU_INTEL_SOCKET_MFCPGA478),y)
 subdirs-y += ../../x86/smm
 subdirs-y += ../microcode
 subdirs-y += ../hyperthreading
-endif
+subdirs-y += ../speedstep
+

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