GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ronald G. Minnich 2009-08-21 18:08:49 +00:00
parent 0b028a450f
commit ebed2dc720
4 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cpu/intel/Makefile.inc
View File

@ -2,9 +2,8 @@
# Therefore: # Therefore:
# ONLY include Makefile.inc from socket directories! # ONLY include Makefile.inc from socket directories!
subdirs-y += speedstep subdirs-$(CONFIG_CPU_INTEL_SOCKET_MFCPGA478) += socket_mFCPGA478
subdirs-y += socket_mFCPGA478 subdirs-$(CONFIG_CPU_INTEL_SOCKET_PGA370) += socket_PGA370
subdirs-y += socket_PGA370
#socket_mPGA478 #socket_mPGA478
#socket_mPGA479M #socket_mPGA479M

25
src/cpu/intel/socket_PGA370/Makefile.inc
View File

@ -18,17 +18,16 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
ifeq ($(CONFIG_CPU_INTEL_SOCKET_PGA370),y) obj-y += socket_PGA370.o
obj-y += socket_PGA370.o subdirs-y += ../model_6xx
subdirs-y += ../model_6xx subdirs-y += ../../x86/tsc
subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr
subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/fpu
subdirs-y += ../../x86/fpu subdirs-y += ../../x86/mmx
subdirs-y += ../../x86/mmx subdirs-y += ../../x86/sse
subdirs-y += ../../x86/sse subdirs-y += ../../x86/lapic
subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache
subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm
subdirs-y += ../../x86/smm subdirs-y += ../microcode
subdirs-y += ../microcode
endif

34
src/cpu/intel/socket_mFCPGA478/Makefile.inc
View File

@ -1,17 +1,17 @@
ifeq ($(CONFIG_CPU_INTEL_SOCKET_MFCPGA478),y) obj-y += socket_mFCPGA478.o
obj-y += socket_mFCPGA478.o subdirs-y += ../model_69x
subdirs-y += ../model_69x subdirs-y += ../model_6dx
subdirs-y += ../model_6dx subdirs-y += ../model_6ex
subdirs-y += ../model_6ex subdirs-y += ../model_6fx
subdirs-y += ../model_6fx subdirs-y += ../../x86/tsc
subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr
subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/fpu
subdirs-y += ../../x86/fpu subdirs-y += ../../x86/mmx
subdirs-y += ../../x86/mmx subdirs-y += ../../x86/sse
subdirs-y += ../../x86/sse subdirs-y += ../../x86/lapic
subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache
subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm
subdirs-y += ../../x86/smm subdirs-y += ../microcode
subdirs-y += ../microcode subdirs-y += ../hyperthreading
subdirs-y += ../hyperthreading subdirs-y += ../speedstep
endif

6
src/cpu/intel/speedstep/Makefile.inc
View File

@ -1,5 +1 @@
ifeq ($(CONFIG_HAVE_ACPI_TABLES), y) obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi.o
ifeq ($(CONFIG_CPU_INTEL_SOCKET_MFCPGA478), y)
obj-y += acpi.o
endif
endif