From 5934b507d5dcac9063ce180e0fa46be4cc01d69c Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 12 Apr 2010 15:28:34 +0000 Subject: [PATCH] Move the CPU specific includes from src/arch/i386/Makefile.inc to the respective CPU directories. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5411 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/Makefile.inc | 54 ++------------------- src/cpu/amd/model_gx1/Makefile.inc | 3 ++ src/cpu/amd/model_lx/Makefile.inc | 2 + src/cpu/amd/socket_754/Makefile.inc | 2 + src/cpu/amd/socket_939/Makefile.inc | 2 + src/cpu/amd/socket_940/Makefile.inc | 2 + src/cpu/amd/socket_AM2/Makefile.inc | 2 + src/cpu/amd/socket_AM2r2/Makefile.inc | 2 + src/cpu/amd/socket_F/Makefile.inc | 2 + src/cpu/amd/socket_F_1207/Makefile.inc | 2 + src/cpu/amd/socket_S1G1/Makefile.inc | 1 + src/cpu/intel/bga956/Makefile.inc | 2 + src/cpu/intel/model_106cx/Makefile.inc | 2 + src/cpu/intel/model_6ex/Makefile.inc | 2 + src/cpu/intel/socket_mFCBGA479/Makefile.inc | 2 + src/cpu/via/model_c7/Makefile.inc | 2 + src/cpu/x86/car/cache_as_ram.lds | 29 ----------- 17 files changed, 35 insertions(+), 78 deletions(-) delete mode 100644 src/cpu/x86/car/cache_as_ram.lds diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc index adc2d92aca..62ccfcd30d 100644 --- a/src/arch/i386/Makefile.inc +++ b/src/arch/i386/Makefile.inc @@ -117,61 +117,17 @@ ldscripts += $(src)/arch/i386/lib/id.lds 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) diff --git a/src/cpu/amd/model_gx1/Makefile.inc b/src/cpu/amd/model_gx1/Makefile.inc index 04659c41c7..f6332082c3 100644 --- a/src/cpu/amd/model_gx1/Makefile.inc +++ b/src/cpu/amd/model_gx1/Makefile.inc @@ -23,3 +23,6 @@ subdirs-y += ../../x86/lapic 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 diff --git a/src/cpu/amd/model_lx/Makefile.inc b/src/cpu/amd/model_lx/Makefile.inc index 1857c89e81..66dcd31ffe 100644 --- a/src/cpu/amd/model_lx/Makefile.inc +++ b/src/cpu/amd/model_lx/Makefile.inc @@ -6,3 +6,5 @@ subdirs-y += ../../x86/smm 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 diff --git a/src/cpu/amd/socket_754/Makefile.inc b/src/cpu/amd/socket_754/Makefile.inc index 5cc64c7a6a..917c73e94d 100644 --- a/src/cpu/amd/socket_754/Makefile.inc +++ b/src/cpu/amd/socket_754/Makefile.inc @@ -8,3 +8,5 @@ subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc diff --git a/src/cpu/amd/socket_939/Makefile.inc b/src/cpu/amd/socket_939/Makefile.inc index 6c18e86a0e..6963a2237d 100644 --- a/src/cpu/amd/socket_939/Makefile.inc +++ b/src/cpu/amd/socket_939/Makefile.inc @@ -8,3 +8,5 @@ subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc diff --git a/src/cpu/amd/socket_940/Makefile.inc b/src/cpu/amd/socket_940/Makefile.inc index 07bf83d3ff..edcecca881 100644 --- a/src/cpu/amd/socket_940/Makefile.inc +++ b/src/cpu/amd/socket_940/Makefile.inc @@ -8,3 +8,5 @@ subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc diff --git a/src/cpu/amd/socket_AM2/Makefile.inc b/src/cpu/amd/socket_AM2/Makefile.inc index 03aab49dc1..d58cacaadd 100644 --- a/src/cpu/amd/socket_AM2/Makefile.inc +++ b/src/cpu/amd/socket_AM2/Makefile.inc @@ -9,3 +9,5 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc diff --git a/src/cpu/amd/socket_AM2r2/Makefile.inc b/src/cpu/amd/socket_AM2r2/Makefile.inc index 873a7e2ba8..80ae498993 100644 --- a/src/cpu/amd/socket_AM2r2/Makefile.inc +++ b/src/cpu/amd/socket_AM2r2/Makefile.inc @@ -9,3 +9,5 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm subdirs-y += ../../x86/mtrr + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc diff --git a/src/cpu/amd/socket_F/Makefile.inc b/src/cpu/amd/socket_F/Makefile.inc index e39f45d779..0be473e4ed 100644 --- a/src/cpu/amd/socket_F/Makefile.inc +++ b/src/cpu/amd/socket_F/Makefile.inc @@ -9,3 +9,5 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc diff --git a/src/cpu/amd/socket_F_1207/Makefile.inc b/src/cpu/amd/socket_F_1207/Makefile.inc index 1ca8a1d3f6..ae60d0de35 100644 --- a/src/cpu/amd/socket_F_1207/Makefile.inc +++ b/src/cpu/amd/socket_F_1207/Makefile.inc @@ -9,3 +9,5 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm + +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc diff --git a/src/cpu/amd/socket_S1G1/Makefile.inc b/src/cpu/amd/socket_S1G1/Makefile.inc index 4fadc9b038..f255b543d3 100644 --- a/src/cpu/amd/socket_S1G1/Makefile.inc +++ b/src/cpu/amd/socket_S1G1/Makefile.inc @@ -10,3 +10,4 @@ subdirs-y += ../../x86/pae subdirs-y += ../../x86/smm subdirs-y += ../../x86/mtrr +cpu_incs += $(src)/cpu/amd/car/cache_as_ram.inc diff --git a/src/cpu/intel/bga956/Makefile.inc b/src/cpu/intel/bga956/Makefile.inc index 8a33d49c93..f4dc9d1a82 100644 --- a/src/cpu/intel/bga956/Makefile.inc +++ b/src/cpu/intel/bga956/Makefile.inc @@ -8,3 +8,5 @@ subdirs-y += ../../x86/smm 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 diff --git a/src/cpu/intel/model_106cx/Makefile.inc b/src/cpu/intel/model_106cx/Makefile.inc index a943f73c41..2c991ff7b4 100644 --- a/src/cpu/intel/model_106cx/Makefile.inc +++ b/src/cpu/intel/model_106cx/Makefile.inc @@ -1 +1,3 @@ driver-y += model_106cx_init.o + +cpu_incs += $(src)/cpu/intel/model_106cx/cache_as_ram.inc diff --git a/src/cpu/intel/model_6ex/Makefile.inc b/src/cpu/intel/model_6ex/Makefile.inc index e4676ea0bf..f9a3c53f5a 100644 --- a/src/cpu/intel/model_6ex/Makefile.inc +++ b/src/cpu/intel/model_6ex/Makefile.inc @@ -1 +1,3 @@ driver-y += model_6ex_init.o + +cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc diff --git a/src/cpu/intel/socket_mFCBGA479/Makefile.inc b/src/cpu/intel/socket_mFCBGA479/Makefile.inc index 4bdbab5e99..af503c8c4a 100644 --- a/src/cpu/intel/socket_mFCBGA479/Makefile.inc +++ b/src/cpu/intel/socket_mFCBGA479/Makefile.inc @@ -6,3 +6,5 @@ subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm subdirs-y += ../microcode + +cpu_incs += $(src)/cpu/x86/car/cache_as_ram.inc diff --git a/src/cpu/via/model_c7/Makefile.inc b/src/cpu/via/model_c7/Makefile.inc index 06fcb129dc..a3a42e347b 100644 --- a/src/cpu/via/model_c7/Makefile.inc +++ b/src/cpu/via/model_c7/Makefile.inc @@ -6,3 +6,5 @@ subdirs-y += ../../x86/smm subdirs-y += ../../intel/microcode driver-y += model_c7_init.o + +cpu_incs += $(src)/cpu/via/car/cache_as_ram.inc diff --git a/src/cpu/x86/car/cache_as_ram.lds b/src/cpu/x86/car/cache_as_ram.lds deleted file mode 100644 index 48d77fa3aa..0000000000 --- a/src/cpu/x86/car/cache_as_ram.lds +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2004 Stefan Reinauer - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -SECTIONS { - .init . : { - _init = .; - *(.init.text); - *(.init.rodata); - *(.init.rodata.*); - . = ALIGN(16); - _einit = .; - } -}