Author: oxygene Date: Mon Apr 12 17:28:34 2010 New Revision: 5411 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5411
Log: Move the CPU specific includes from src/arch/i386/Makefile.inc to the respective CPU directories.
Signed-off-by: Patrick Georgi patrick.georgi@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Deleted: trunk/src/cpu/x86/car/cache_as_ram.lds Modified: trunk/src/arch/i386/Makefile.inc trunk/src/cpu/amd/model_gx1/Makefile.inc trunk/src/cpu/amd/model_lx/Makefile.inc trunk/src/cpu/amd/socket_754/Makefile.inc trunk/src/cpu/amd/socket_939/Makefile.inc trunk/src/cpu/amd/socket_940/Makefile.inc trunk/src/cpu/amd/socket_AM2/Makefile.inc trunk/src/cpu/amd/socket_AM2r2/Makefile.inc trunk/src/cpu/amd/socket_F/Makefile.inc trunk/src/cpu/amd/socket_F_1207/Makefile.inc trunk/src/cpu/amd/socket_S1G1/Makefile.inc trunk/src/cpu/intel/bga956/Makefile.inc trunk/src/cpu/intel/model_106cx/Makefile.inc trunk/src/cpu/intel/model_6ex/Makefile.inc trunk/src/cpu/intel/socket_mFCBGA479/Makefile.inc trunk/src/cpu/via/model_c7/Makefile.inc
Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/arch/i386/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -117,61 +117,17 @@ endif
crt0s += $(src)/cpu/x86/fpu_enable.inc -ifeq ($(CONFIG_CPU_AMD_GX1),y) -crt0s += $(src)/cpu/amd/model_gx1/cpu_setup.inc -crt0s += $(src)/cpu/amd/model_gx1/gx_setup.inc -endif ifeq ($(CONFIG_SSE),y) crt0s += $(src)/cpu/x86/sse_enable.inc endif
-ifeq ($(CONFIG_CPU_AMD_LX),y) -crt0s += $(src)/cpu/amd/model_lx/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_AMD_SOCKET_F),y) -crt0s += $(src)/cpu/amd/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_AMD_SOCKET_F_1207),y) -crt0s += $(src)/cpu/amd/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_AMD_SOCKET_AM2R2),y) -crt0s += $(src)/cpu/amd/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_AMD_SOCKET_AM2),y) -crt0s += $(src)/cpu/amd/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_AMD_SOCKET_S1G1),y) -crt0s += $(src)/cpu/amd/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_AMD_SOCKET_754),y) -crt0s += $(src)/cpu/amd/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_AMD_SOCKET_939),y) -crt0s += $(src)/cpu/amd/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_AMD_SOCKET_940),y) -crt0s += $(src)/cpu/amd/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_INTEL_ATOM_230),y) -crt0s += $(src)/cpu/intel/model_106cx/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_INTEL_CORE),y) -crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc -endif -# Use Intel Core (not Core 2) code for CAR init, any CPU might be used. -ifeq ($(CONFIG_CPU_INTEL_SOCKET_BGA956),y) -crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_INTEL_SOCKET_MFCBGA479),y) -crt0s += $(src)/cpu/x86/car/cache_as_ram.inc -endif -ifeq ($(CONFIG_CPU_VIA_C7),y) -crt0s += $(src)/cpu/via/car/cache_as_ram.inc -endif -# who else could use this? +crt0s += $(cpu_incs) + +# +# FIXME move to CPU_INTEL_SOCKET_MPGA604 +# ifeq ($(CONFIG_BOARD_TYAN_S2735),y) crt0s += $(src)/cpu/x86/car/cache_as_ram.inc -ldscripts += $(src)/cpu/x86/car/cache_as_ram.lds endif
ifeq ($(CONFIG_LLSHELL),y)
Modified: trunk/src/cpu/amd/model_gx1/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/model_gx1/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/model_gx1/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -23,3 +23,6 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm driver-y += model_gx1_init.o + +cpu_incs += $(src)/cpu/amd/model_gx1/cpu_setup.inc +cpu_incs += $(src)/cpu/amd/model_gx1/gx_setup.inc
Modified: trunk/src/cpu/amd/model_lx/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/model_lx/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/model_lx/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -6,3 +6,5 @@ driver-y += model_lx_init.o obj-y += cpubug.o obj-y += vsmsetup.o + +cpu_incs += $(src)/cpu/amd/model_lx/cache_as_ram.inc
Modified: trunk/src/cpu/amd/socket_754/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_754/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/socket_754/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -8,3 +8,5 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc
Modified: trunk/src/cpu/amd/socket_939/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_939/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/socket_939/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -8,3 +8,5 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc
Modified: trunk/src/cpu/amd/socket_940/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_940/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/socket_940/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -8,3 +8,5 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc
Modified: trunk/src/cpu/amd/socket_AM2/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_AM2/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/socket_AM2/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -9,3 +9,5 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc
Modified: trunk/src/cpu/amd/socket_AM2r2/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_AM2r2/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/socket_AM2r2/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -9,3 +9,5 @@ subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm subdirs-y += ../../x86/mtrr + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc
Modified: trunk/src/cpu/amd/socket_F/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_F/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/socket_F/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -9,3 +9,5 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc
Modified: trunk/src/cpu/amd/socket_F_1207/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_F_1207/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/socket_F_1207/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -9,3 +9,5 @@ subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc
Modified: trunk/src/cpu/amd/socket_S1G1/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_S1G1/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/amd/socket_S1G1/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -10,3 +10,4 @@ subdirs-y += ../../x86/smm subdirs-y += ../../x86/mtrr
+cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc
Modified: trunk/src/cpu/intel/bga956/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/bga956/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/intel/bga956/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -8,3 +8,5 @@ subdirs-y += ../microcode subdirs-y += ../hyperthreading
+# Use Intel Core (not Core 2) code for CAR init, any CPU might be used. +cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc
Modified: trunk/src/cpu/intel/model_106cx/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_106cx/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/intel/model_106cx/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -1 +1,3 @@ driver-y += model_106cx_init.o + +cpu_incs += $(src)/cpu/intel/model_106cx/cache_as_ram.inc
Modified: trunk/src/cpu/intel/model_6ex/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_6ex/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/intel/model_6ex/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -1 +1,3 @@ driver-y += model_6ex_init.o + +cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc
Modified: trunk/src/cpu/intel/socket_mFCBGA479/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_mFCBGA479/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/intel/socket_mFCBGA479/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -6,3 +6,5 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm subdirs-y += ../microcode + +cpu_incs += $(src)/cpu/x86/car/cache_as_ram.inc
Modified: trunk/src/cpu/via/model_c7/Makefile.inc ============================================================================== --- trunk/src/cpu/via/model_c7/Makefile.inc Mon Apr 12 12:22:20 2010 (r5410) +++ trunk/src/cpu/via/model_c7/Makefile.inc Mon Apr 12 17:28:34 2010 (r5411) @@ -6,3 +6,5 @@ subdirs-y += ../../intel/microcode
driver-y += model_c7_init.o + +cpu_incs += $(src)/cpu/via/car/cache_as_ram.inc