diff options
Diffstat (limited to 'src/cpu')
59 files changed, 83 insertions, 81 deletions
diff --git a/src/cpu/amd/dualcore/Makefile.inc b/src/cpu/amd/dualcore/Makefile.inc index 8b6d688300..f9571d1c3c 100644 --- a/src/cpu/amd/dualcore/Makefile.inc +++ b/src/cpu/amd/dualcore/Makefile.inc @@ -1,2 +1,2 @@ # This is a leaf Makefile, no conditionals. If it is included it will be used. -obj-y += amd_sibling.o +ramstage-y += amd_sibling.c diff --git a/src/cpu/amd/microcode/Makefile.inc b/src/cpu/amd/microcode/Makefile.inc index 26513df8f7..6631019f38 100644 --- a/src/cpu/amd/microcode/Makefile.inc +++ b/src/cpu/amd/microcode/Makefile.inc @@ -1 +1 @@ -obj-y += microcode.o +ramstage-y += microcode.c diff --git a/src/cpu/amd/model_10xxx/Makefile.inc b/src/cpu/amd/model_10xxx/Makefile.inc index db3debce2e..5b0a89de49 100644 --- a/src/cpu/amd/model_10xxx/Makefile.inc +++ b/src/cpu/amd/model_10xxx/Makefile.inc @@ -1,5 +1,5 @@ # no conditionals here. If you include this file from a socket, then you get all the binaries. -driver-y += model_10xxx_init.o -obj-y += update_microcode.o -obj-y += apic_timer.o -obj-y += processor_name.o +driver-y += model_10xxx_init.c +ramstage-y += update_microcode.c +ramstage-y += apic_timer.c +ramstage-y += processor_name.c diff --git a/src/cpu/amd/model_fxx/Makefile.inc b/src/cpu/amd/model_fxx/Makefile.inc index d7490e8fa9..948e235889 100644 --- a/src/cpu/amd/model_fxx/Makefile.inc +++ b/src/cpu/amd/model_fxx/Makefile.inc @@ -1,6 +1,6 @@ # no conditionals here. If you include this file from a socket, then you get all the binaries. -driver-y += model_fxx_init.o -obj-y += apic_timer.o -obj-y += model_fxx_update_microcode.o -obj-y += processor_name.o -obj-y += powernow_acpi.o +driver-y += model_fxx_init.c +ramstage-y += apic_timer.c +ramstage-y += model_fxx_update_microcode.c +ramstage-y += processor_name.c +ramstage-y += powernow_acpi.c diff --git a/src/cpu/amd/model_gx1/Makefile.inc b/src/cpu/amd/model_gx1/Makefile.inc index f6332082c3..bf543a4665 100644 --- a/src/cpu/amd/model_gx1/Makefile.inc +++ b/src/cpu/amd/model_gx1/Makefile.inc @@ -22,7 +22,7 @@ subdirs-y += ../../x86/tsc subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm -driver-y += model_gx1_init.o +driver-y += model_gx1_init.c 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_gx2/Makefile.inc b/src/cpu/amd/model_gx2/Makefile.inc index 50fdc5445c..5e6d9ca366 100644 --- a/src/cpu/amd/model_gx2/Makefile.inc +++ b/src/cpu/amd/model_gx2/Makefile.inc @@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm -driver-y += model_gx2_init.o -obj-y += cpubug.o +driver-y += model_gx2_init.c +ramstage-y += cpubug.c cpu_incs += $(src)/cpu/amd/model_gx2/cache_as_ram.inc diff --git a/src/cpu/amd/model_lx/Makefile.inc b/src/cpu/amd/model_lx/Makefile.inc index 4752378d41..3455d1e5d6 100644 --- a/src/cpu/amd/model_lx/Makefile.inc +++ b/src/cpu/amd/model_lx/Makefile.inc @@ -3,7 +3,7 @@ subdirs-y += ../../x86/lapic subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm -driver-y += model_lx_init.o -obj-y += cpubug.o +driver-y += model_lx_init.c +ramstage-y += cpubug.c cpu_incs += $(src)/cpu/amd/model_lx/cache_as_ram.inc diff --git a/src/cpu/amd/mtrr/Makefile.inc b/src/cpu/amd/mtrr/Makefile.inc index 2978a397ac..5ed435a5ed 100644 --- a/src/cpu/amd/mtrr/Makefile.inc +++ b/src/cpu/amd/mtrr/Makefile.inc @@ -1 +1 @@ -obj-y += amd_mtrr.o +ramstage-y += amd_mtrr.c diff --git a/src/cpu/amd/quadcore/Makefile.inc b/src/cpu/amd/quadcore/Makefile.inc index d53dc3dd07..c390b4e295 100644 --- a/src/cpu/amd/quadcore/Makefile.inc +++ b/src/cpu/amd/quadcore/Makefile.inc @@ -1 +1 @@ -obj-y += amd_sibling.o +ramstage-y += amd_sibling.c diff --git a/src/cpu/amd/sc520/Makefile.inc b/src/cpu/amd/sc520/Makefile.inc index 9bc9e13420..03f9e0f9bf 100644 --- a/src/cpu/amd/sc520/Makefile.inc +++ b/src/cpu/amd/sc520/Makefile.inc @@ -1 +1 @@ -obj-y += sc520.o +ramstage-y += sc520.c diff --git a/src/cpu/amd/socket_754/Makefile.inc b/src/cpu/amd/socket_754/Makefile.inc index 917c73e94d..a08ffabdc0 100644 --- a/src/cpu/amd/socket_754/Makefile.inc +++ b/src/cpu/amd/socket_754/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_754.o +ramstage-y += socket_754.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_939/Makefile.inc b/src/cpu/amd/socket_939/Makefile.inc index 6963a2237d..290ea9a6f7 100644 --- a/src/cpu/amd/socket_939/Makefile.inc +++ b/src/cpu/amd/socket_939/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_939.o +ramstage-y += socket_939.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_940/Makefile.inc b/src/cpu/amd/socket_940/Makefile.inc index edcecca881..a0fee959b4 100644 --- a/src/cpu/amd/socket_940/Makefile.inc +++ b/src/cpu/amd/socket_940/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_940.o +ramstage-y += socket_940.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_AM2/Makefile.inc b/src/cpu/amd/socket_AM2/Makefile.inc index d58cacaadd..4345b7c9ed 100644 --- a/src/cpu/amd/socket_AM2/Makefile.inc +++ b/src/cpu/amd/socket_AM2/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_AM2.o +ramstage-y += socket_AM2.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_AM2r2/Makefile.inc b/src/cpu/amd/socket_AM2r2/Makefile.inc index 80ae498993..d02f792c1a 100644 --- a/src/cpu/amd/socket_AM2r2/Makefile.inc +++ b/src/cpu/amd/socket_AM2r2/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_AM2r2.o +ramstage-y += socket_AM2r2.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_AM3/Makefile.inc b/src/cpu/amd/socket_AM3/Makefile.inc index 9799b7fb4d..78f9cc2365 100644 --- a/src/cpu/amd/socket_AM3/Makefile.inc +++ b/src/cpu/amd/socket_AM3/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_AM3.o +ramstage-y += socket_AM3.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_ASB2/Makefile.inc b/src/cpu/amd/socket_ASB2/Makefile.inc index 580cbbce2d..f55152a374 100644 --- a/src/cpu/amd/socket_ASB2/Makefile.inc +++ b/src/cpu/amd/socket_ASB2/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_ASB2.o +ramstage-y += socket_ASB2.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_F/Makefile.inc b/src/cpu/amd/socket_F/Makefile.inc index 0be473e4ed..9440312003 100644 --- a/src/cpu/amd/socket_F/Makefile.inc +++ b/src/cpu/amd/socket_F/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_F.o +ramstage-y += socket_F.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_F_1207/Makefile.inc b/src/cpu/amd/socket_F_1207/Makefile.inc index ae60d0de35..5cdd1ea230 100644 --- a/src/cpu/amd/socket_F_1207/Makefile.inc +++ b/src/cpu/amd/socket_F_1207/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_F_1207.o +ramstage-y += socket_F_1207.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_S1G1/Makefile.inc b/src/cpu/amd/socket_S1G1/Makefile.inc index f255b543d3..eb3ac5776a 100644 --- a/src/cpu/amd/socket_S1G1/Makefile.inc +++ b/src/cpu/amd/socket_S1G1/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_S1G1.o +ramstage-y += socket_S1G1.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/intel/bga956/Makefile.inc b/src/cpu/intel/bga956/Makefile.inc index f4dc9d1a82..a0ace125b9 100644 --- a/src/cpu/intel/bga956/Makefile.inc +++ b/src/cpu/intel/bga956/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += bga956.o +ramstage-y += bga956.c subdirs-y += ../model_1067x subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff --git a/src/cpu/intel/ep80579/Makefile.inc b/src/cpu/intel/ep80579/Makefile.inc index b4c407dbbf..7aaedba7e0 100644 --- a/src/cpu/intel/ep80579/Makefile.inc +++ b/src/cpu/intel/ep80579/Makefile.inc @@ -1,5 +1,5 @@ -obj-y += ep80579.o -driver-y += ep80579_init.o +ramstage-y += ep80579.c +driver-y += ep80579_init.c subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic diff --git a/src/cpu/intel/hyperthreading/Makefile.inc b/src/cpu/intel/hyperthreading/Makefile.inc index 34cf8eee99..8adbad9e21 100644 --- a/src/cpu/intel/hyperthreading/Makefile.inc +++ b/src/cpu/intel/hyperthreading/Makefile.inc @@ -1 +1 @@ -obj-y += intel_sibling.o +ramstage-y += intel_sibling.c diff --git a/src/cpu/intel/microcode/Makefile.inc b/src/cpu/intel/microcode/Makefile.inc index 26513df8f7..6631019f38 100644 --- a/src/cpu/intel/microcode/Makefile.inc +++ b/src/cpu/intel/microcode/Makefile.inc @@ -1 +1 @@ -obj-y += microcode.o +ramstage-y += microcode.c diff --git a/src/cpu/intel/model_1067x/Makefile.inc b/src/cpu/intel/model_1067x/Makefile.inc index a1db11072c..b2b760641d 100644 --- a/src/cpu/intel/model_1067x/Makefile.inc +++ b/src/cpu/intel/model_1067x/Makefile.inc @@ -1,3 +1,3 @@ -driver-y += model_1067x_init.o +driver-y += model_1067x_init.c subdirs-y += ../../x86/name diff --git a/src/cpu/intel/model_106cx/Makefile.inc b/src/cpu/intel/model_106cx/Makefile.inc index 890a529cc3..edcd01c765 100644 --- a/src/cpu/intel/model_106cx/Makefile.inc +++ b/src/cpu/intel/model_106cx/Makefile.inc @@ -1,4 +1,4 @@ -driver-y += model_106cx_init.o +driver-y += model_106cx_init.c subdirs-y += ../../x86/name cpu_incs += $(src)/cpu/intel/model_106cx/cache_as_ram.inc diff --git a/src/cpu/intel/model_68x/Makefile.inc b/src/cpu/intel/model_68x/Makefile.inc index 810ef19972..5b5f1665ce 100644 --- a/src/cpu/intel/model_68x/Makefile.inc +++ b/src/cpu/intel/model_68x/Makefile.inc @@ -18,6 +18,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += model_68x_init.o +driver-y += model_68x_init.c subdirs-y += ../../x86/name diff --git a/src/cpu/intel/model_69x/Makefile.inc b/src/cpu/intel/model_69x/Makefile.inc index 4756e33787..329bfebb6e 100644 --- a/src/cpu/intel/model_69x/Makefile.inc +++ b/src/cpu/intel/model_69x/Makefile.inc @@ -1 +1 @@ -driver-y += model_69x_init.o +driver-y += model_69x_init.c diff --git a/src/cpu/intel/model_6bx/Makefile.inc b/src/cpu/intel/model_6bx/Makefile.inc index c10aff170d..4632815b52 100644 --- a/src/cpu/intel/model_6bx/Makefile.inc +++ b/src/cpu/intel/model_6bx/Makefile.inc @@ -1,2 +1,2 @@ -driver-y += model_6bx_init.o +driver-y += model_6bx_init.c subdirs-y += ../../x86/name diff --git a/src/cpu/intel/model_6dx/Makefile.inc b/src/cpu/intel/model_6dx/Makefile.inc index bbadb50170..47525be88a 100644 --- a/src/cpu/intel/model_6dx/Makefile.inc +++ b/src/cpu/intel/model_6dx/Makefile.inc @@ -1 +1 @@ -driver-y += model_6dx_init.o +driver-y += model_6dx_init.c diff --git a/src/cpu/intel/model_6ex/Makefile.inc b/src/cpu/intel/model_6ex/Makefile.inc index 8ad1e3910f..0053ae788c 100644 --- a/src/cpu/intel/model_6ex/Makefile.inc +++ b/src/cpu/intel/model_6ex/Makefile.inc @@ -1,4 +1,4 @@ -driver-y += model_6ex_init.o +driver-y += model_6ex_init.c subdirs-y += ../../x86/name cpu_incs += $(src)/cpu/intel/model_6ex/cache_as_ram.inc diff --git a/src/cpu/intel/model_6fx/Makefile.inc b/src/cpu/intel/model_6fx/Makefile.inc index 0e32754d7f..3743547289 100644 --- a/src/cpu/intel/model_6fx/Makefile.inc +++ b/src/cpu/intel/model_6fx/Makefile.inc @@ -1,2 +1,2 @@ -driver-y += model_6fx_init.o +driver-y += model_6fx_init.c subdirs-y += ../../x86/name diff --git a/src/cpu/intel/model_6xx/Makefile.inc b/src/cpu/intel/model_6xx/Makefile.inc index ddbb7a5d8b..157ca90968 100644 --- a/src/cpu/intel/model_6xx/Makefile.inc +++ b/src/cpu/intel/model_6xx/Makefile.inc @@ -1 +1 @@ -driver-y += model_6xx_init.o +driver-y += model_6xx_init.c diff --git a/src/cpu/intel/model_f0x/Makefile.inc b/src/cpu/intel/model_f0x/Makefile.inc index 0a19a21aba..55efa1445a 100644 --- a/src/cpu/intel/model_f0x/Makefile.inc +++ b/src/cpu/intel/model_f0x/Makefile.inc @@ -1 +1 @@ -driver-y += model_f0x_init.o +driver-y += model_f0x_init.c diff --git a/src/cpu/intel/model_f1x/Makefile.inc b/src/cpu/intel/model_f1x/Makefile.inc index 14c62b6983..e3a02e9abe 100644 --- a/src/cpu/intel/model_f1x/Makefile.inc +++ b/src/cpu/intel/model_f1x/Makefile.inc @@ -1 +1 @@ -driver-y += model_f1x_init.o +driver-y += model_f1x_init.c diff --git a/src/cpu/intel/model_f2x/Makefile.inc b/src/cpu/intel/model_f2x/Makefile.inc index f83605675d..c393343ba1 100644 --- a/src/cpu/intel/model_f2x/Makefile.inc +++ b/src/cpu/intel/model_f2x/Makefile.inc @@ -1 +1 @@ -driver-y += model_f2x_init.o +driver-y += model_f2x_init.c diff --git a/src/cpu/intel/model_f3x/Makefile.inc b/src/cpu/intel/model_f3x/Makefile.inc index 13dda61538..b2f2138738 100644 --- a/src/cpu/intel/model_f3x/Makefile.inc +++ b/src/cpu/intel/model_f3x/Makefile.inc @@ -1 +1 @@ -driver-y += model_f3x_init.o +driver-y += model_f3x_init.c diff --git a/src/cpu/intel/model_f4x/Makefile.inc b/src/cpu/intel/model_f4x/Makefile.inc index 7e50d29122..0a38adf70c 100644 --- a/src/cpu/intel/model_f4x/Makefile.inc +++ b/src/cpu/intel/model_f4x/Makefile.inc @@ -1 +1 @@ -driver-y += model_f4x_init.o +driver-y += model_f4x_init.c diff --git a/src/cpu/intel/slot_1/Makefile.inc b/src/cpu/intel/slot_1/Makefile.inc index 169265664c..e51f416dab 100644 --- a/src/cpu/intel/slot_1/Makefile.inc +++ b/src/cpu/intel/slot_1/Makefile.inc @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += slot_1.o +ramstage-y += slot_1.c subdirs-y += ../model_6xx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff --git a/src/cpu/intel/slot_2/Makefile.inc b/src/cpu/intel/slot_2/Makefile.inc index c203fcaefe..67a866dbfe 100644 --- a/src/cpu/intel/slot_2/Makefile.inc +++ b/src/cpu/intel/slot_2/Makefile.inc @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += slot_2.o +ramstage-y += slot_2.c subdirs-y += ../model_6xx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff --git a/src/cpu/intel/socket_441/Makefile.inc b/src/cpu/intel/socket_441/Makefile.inc index bd34d7aa22..9ba1f62704 100644 --- a/src/cpu/intel/socket_441/Makefile.inc +++ b/src/cpu/intel/socket_441/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_441.o +ramstage-y += socket_441.c subdirs-y += ../model_106cx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff --git a/src/cpu/intel/socket_FC_PGA370/Makefile.inc b/src/cpu/intel/socket_FC_PGA370/Makefile.inc index 5a2b63ae92..b10d1422cc 100644 --- a/src/cpu/intel/socket_FC_PGA370/Makefile.inc +++ b/src/cpu/intel/socket_FC_PGA370/Makefile.inc @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += socket_FC_PGA370.o +ramstage-y += socket_FC_PGA370.c subdirs-y += ../model_68x subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff --git a/src/cpu/intel/socket_PGA370/Makefile.inc b/src/cpu/intel/socket_PGA370/Makefile.inc index 9454d6b258..c857bcee45 100644 --- a/src/cpu/intel/socket_PGA370/Makefile.inc +++ b/src/cpu/intel/socket_PGA370/Makefile.inc @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += socket_PGA370.o +ramstage-y += socket_PGA370.c subdirs-y += ../model_6xx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff --git a/src/cpu/intel/socket_mFCBGA479/Makefile.inc b/src/cpu/intel/socket_mFCBGA479/Makefile.inc index 9f7ca6637c..e8d6f29f5c 100644 --- a/src/cpu/intel/socket_mFCBGA479/Makefile.inc +++ b/src/cpu/intel/socket_mFCBGA479/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_mFCBGA479.o +ramstage-y += socket_mFCBGA479.c subdirs-y += ../model_6bx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff --git a/src/cpu/intel/socket_mFCPGA478/Makefile.inc b/src/cpu/intel/socket_mFCPGA478/Makefile.inc index f8783eea0c..74433a278a 100644 --- a/src/cpu/intel/socket_mFCPGA478/Makefile.inc +++ b/src/cpu/intel/socket_mFCPGA478/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_mFCPGA478.o +ramstage-y += socket_mFCPGA478.c subdirs-y += ../model_69x subdirs-y += ../model_6dx subdirs-y += ../model_6ex diff --git a/src/cpu/intel/socket_mPGA478/Makefile.inc b/src/cpu/intel/socket_mPGA478/Makefile.inc index ad7cb04edc..ba2f13ca75 100644 --- a/src/cpu/intel/socket_mPGA478/Makefile.inc +++ b/src/cpu/intel/socket_mPGA478/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_mPGA478.o +ramstage-y += socket_mPGA478.c subdirs-y += ../model_69x subdirs-y += ../model_6dx subdirs-y += ../../x86/tsc diff --git a/src/cpu/intel/socket_mPGA479M/Makefile.inc b/src/cpu/intel/socket_mPGA479M/Makefile.inc index 2cf418fd11..260d1c88b1 100644 --- a/src/cpu/intel/socket_mPGA479M/Makefile.inc +++ b/src/cpu/intel/socket_mPGA479M/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_mPGA479M.o +ramstage-y += socket_mPGA479M.c subdirs-y += ../model_69x subdirs-y += ../model_6dx subdirs-y += ../model_f2x @@ -10,4 +10,4 @@ subdirs-y += ../../x86/smm subdirs-y += ../microcode subdirs-y += ../hyperthreading -cpu_incs += $(src)/cpu/intel/car/cache_as_ram.inc
\ No newline at end of file +cpu_incs += $(src)/cpu/intel/car/cache_as_ram.inc diff --git a/src/cpu/intel/socket_mPGA603/Makefile.inc b/src/cpu/intel/socket_mPGA603/Makefile.inc index 0e43697d98..8bafa7743a 100644 --- a/src/cpu/intel/socket_mPGA603/Makefile.inc +++ b/src/cpu/intel/socket_mPGA603/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_mPGA603_400Mhz.o +ramstage-y += socket_mPGA603_400Mhz.c subdirs-y += ../model_f0x subdirs-y += ../model_f1x subdirs-y += ../model_f2x diff --git a/src/cpu/intel/socket_mPGA604/Makefile.inc b/src/cpu/intel/socket_mPGA604/Makefile.inc index a51765ba71..1404e84bbc 100644 --- a/src/cpu/intel/socket_mPGA604/Makefile.inc +++ b/src/cpu/intel/socket_mPGA604/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += socket_mPGA604.o +ramstage-y += socket_mPGA604.c subdirs-y += ../model_f2x subdirs-y += ../model_f3x subdirs-y += ../model_f4x diff --git a/src/cpu/intel/speedstep/Makefile.inc b/src/cpu/intel/speedstep/Makefile.inc index 501638e753..c717a3304e 100644 --- a/src/cpu/intel/speedstep/Makefile.inc +++ b/src/cpu/intel/speedstep/Makefile.inc @@ -1 +1 @@ -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c diff --git a/src/cpu/via/model_c3/Makefile.inc b/src/cpu/via/model_c3/Makefile.inc index 39eb0fdbd7..320b649a2f 100644 --- a/src/cpu/via/model_c3/Makefile.inc +++ b/src/cpu/via/model_c3/Makefile.inc @@ -5,4 +5,4 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm subdirs-y += ../../intel/microcode -driver-y += model_c3_init.o +driver-y += model_c3_init.c diff --git a/src/cpu/via/model_c7/Makefile.inc b/src/cpu/via/model_c7/Makefile.inc index a3a42e347b..c6ab45e7b8 100644 --- a/src/cpu/via/model_c7/Makefile.inc +++ b/src/cpu/via/model_c7/Makefile.inc @@ -5,6 +5,6 @@ subdirs-y += ../../x86/cache subdirs-y += ../../x86/smm subdirs-y += ../../intel/microcode -driver-y += model_c7_init.o +driver-y += model_c7_init.c cpu_incs += $(src)/cpu/via/car/cache_as_ram.inc diff --git a/src/cpu/x86/cache/Makefile.inc b/src/cpu/x86/cache/Makefile.inc index 75679e586b..b33b9eeff0 100644 --- a/src/cpu/x86/cache/Makefile.inc +++ b/src/cpu/x86/cache/Makefile.inc @@ -1 +1 @@ -obj-y += cache.o +ramstage-y += cache.c diff --git a/src/cpu/x86/lapic/Makefile.inc b/src/cpu/x86/lapic/Makefile.inc index bed314024c..af20956a9a 100644 --- a/src/cpu/x86/lapic/Makefile.inc +++ b/src/cpu/x86/lapic/Makefile.inc @@ -1,4 +1,4 @@ -obj-y += lapic.o -obj-y += lapic_cpu_init.o -obj-y += secondary.o -obj-$(CONFIG_UDELAY_LAPIC) += apic_timer.o +ramstage-y += lapic.c +ramstage-y += lapic_cpu_init.c +ramstage-y += secondary.S +ramstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.c diff --git a/src/cpu/x86/mtrr/Makefile.inc b/src/cpu/x86/mtrr/Makefile.inc index b68873e5a6..cecb8269ef 100644 --- a/src/cpu/x86/mtrr/Makefile.inc +++ b/src/cpu/x86/mtrr/Makefile.inc @@ -1 +1 @@ -obj-y += mtrr.o +ramstage-y += mtrr.c diff --git a/src/cpu/x86/name/Makefile.inc b/src/cpu/x86/name/Makefile.inc index bfe17519f2..1528ed7661 100644 --- a/src/cpu/x86/name/Makefile.inc +++ b/src/cpu/x86/name/Makefile.inc @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += name.o +ramstage-y += name.c diff --git a/src/cpu/x86/pae/Makefile.inc b/src/cpu/x86/pae/Makefile.inc index e20ee2fc51..0ecec4753d 100644 --- a/src/cpu/x86/pae/Makefile.inc +++ b/src/cpu/x86/pae/Makefile.inc @@ -1 +1 @@ -obj-y += pgtbl.o +ramstage-y += pgtbl.c diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index 42413510e9..85bb45472b 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/src/cpu/x86/smm/Makefile.inc @@ -17,24 +17,26 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.o -obj-$(CONFIG_HAVE_SMI_HANDLER) += smm_wrap.o +ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.S +ifeq ($(CONFIG_HAVE_SMI_HANDLER),y) +ramstage-srcs += $(obj)/cpu/x86/smm/smm_wrap +endif -smmobj-y += smmhandler.o -smmobj-y += smihandler.o -smmobj-y += smiutil.o +smm-y += smmhandler.S +smm-y += smihandler.c +smm-y += smiutil.c -$(obj)/cpu/x86/smm/smm.o: $$(smmobjs) +$(obj)/cpu/x86/smm/smm.o: $$(smm-objs) $(CC) $(LDFLAGS) -nostdlib -r -o $@ $^ -$(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions +$(obj)/cpu/x86/smm/smm_wrap: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions $(CC) $(LDFLAGS) -nostdlib -nostartfiles -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/smm.ld $(obj)/cpu/x86/smm/smm.o $(NM) -n $(obj)/cpu/x86/smm/smm.elf | sort > $(obj)/cpu/x86/smm/smm.map $(OBJCOPY) -O binary $(obj)/cpu/x86/smm/smm.elf $(obj)/cpu/x86/smm/smm # change to the target path because objcopy will use the path name in its # ELF symbol names. -$(obj)/cpu/x86/smm/smm_wrap.o: $(obj)/cpu/x86/smm/smm +$(obj)/cpu/x86/smm/smm_wrap.ramstage.o: $(obj)/cpu/x86/smm/smm_wrap @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" - cd $(obj)/cpu/x86/smm; $(OBJCOPY) -I binary smm -O elf32-i386 -B i386 smm_wrap.o + cd $(obj)/cpu/x86/smm; $(OBJCOPY) -I binary smm -O elf32-i386 -B i386 smm_wrap.ramstage.o diff --git a/src/cpu/x86/tsc/Makefile.inc b/src/cpu/x86/tsc/Makefile.inc index d56c3e76d6..44bfe85170 100644 --- a/src/cpu/x86/tsc/Makefile.inc +++ b/src/cpu/x86/tsc/Makefile.inc @@ -1,2 +1,2 @@ -obj-$(CONFIG_UDELAY_TSC) += delay_tsc.o +ramstage-$(CONFIG_UDELAY_TSC) += delay_tsc.c |