coreboot September 2010

coreboot@coreboot.org

58 participants
324 discussions

[PATCH] Use existing, readable MTRR #defines instead of hardcoding numbers

by Uwe Hermann

See patch. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

10 years, 5 months

[commit] r5886 - in trunk: . src/arch/i386 src/arch/i386/boot src/arch/i386/lib src/boot src/console src/cpu/amd/dualcore src/cpu/amd/microcode src/cpu/amd/model_10xxx src/cpu/amd/model_fxx src/cpu...

by repository service

Author: oxygene Date: Thu Sep 30 18:55:02 2010 New Revision: 5886 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5886 Log: Rename build system variables to be more intuitive, and at the same time let the user specify sources instead of object files: - objs becomes ramstage-srcs - initobjs becomes romstage-srcs - driver becomes driver-srcs - smmobj becomes smm-srcs The user servicable parts are named accordingly: ramstage-y, romstage-y, driver-y, smm-y Also, the object file names are properly renamed now, using .ramstage.o, .romstage.o, .driver.o, .smm.o suffixes consistently. Remove stubbed out via/epia-m700 dsdt/ssdt files - they didn't easily fit in the build system and aren't useful anyway. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coreystems.de> Deleted: trunk/src/mainboard/via/epia-m700/dsdt.c trunk/src/mainboard/via/epia-m700/ssdt.c Modified: trunk/Makefile trunk/src/arch/i386/Makefile.bigbootblock.inc trunk/src/arch/i386/Makefile.bootblock.inc trunk/src/arch/i386/Makefile.inc trunk/src/arch/i386/boot/Makefile.inc trunk/src/arch/i386/lib/Makefile.inc trunk/src/boot/Makefile.inc trunk/src/console/Makefile.inc trunk/src/cpu/amd/dualcore/Makefile.inc trunk/src/cpu/amd/microcode/Makefile.inc trunk/src/cpu/amd/model_10xxx/Makefile.inc trunk/src/cpu/amd/model_fxx/Makefile.inc trunk/src/cpu/amd/model_gx1/Makefile.inc trunk/src/cpu/amd/model_gx2/Makefile.inc trunk/src/cpu/amd/model_lx/Makefile.inc trunk/src/cpu/amd/mtrr/Makefile.inc trunk/src/cpu/amd/quadcore/Makefile.inc trunk/src/cpu/amd/sc520/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_AM3/Makefile.inc trunk/src/cpu/amd/socket_ASB2/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/ep80579/Makefile.inc trunk/src/cpu/intel/hyperthreading/Makefile.inc trunk/src/cpu/intel/microcode/Makefile.inc trunk/src/cpu/intel/model_1067x/Makefile.inc trunk/src/cpu/intel/model_106cx/Makefile.inc trunk/src/cpu/intel/model_68x/Makefile.inc trunk/src/cpu/intel/model_69x/Makefile.inc trunk/src/cpu/intel/model_6bx/Makefile.inc trunk/src/cpu/intel/model_6dx/Makefile.inc trunk/src/cpu/intel/model_6ex/Makefile.inc trunk/src/cpu/intel/model_6fx/Makefile.inc trunk/src/cpu/intel/model_6xx/Makefile.inc trunk/src/cpu/intel/model_f0x/Makefile.inc trunk/src/cpu/intel/model_f1x/Makefile.inc trunk/src/cpu/intel/model_f2x/Makefile.inc trunk/src/cpu/intel/model_f3x/Makefile.inc trunk/src/cpu/intel/model_f4x/Makefile.inc trunk/src/cpu/intel/slot_1/Makefile.inc trunk/src/cpu/intel/slot_2/Makefile.inc trunk/src/cpu/intel/socket_441/Makefile.inc trunk/src/cpu/intel/socket_FC_PGA370/Makefile.inc trunk/src/cpu/intel/socket_PGA370/Makefile.inc trunk/src/cpu/intel/socket_mFCBGA479/Makefile.inc trunk/src/cpu/intel/socket_mFCPGA478/Makefile.inc trunk/src/cpu/intel/socket_mPGA478/Makefile.inc trunk/src/cpu/intel/socket_mPGA479M/Makefile.inc trunk/src/cpu/intel/socket_mPGA603/Makefile.inc trunk/src/cpu/intel/socket_mPGA604/Makefile.inc trunk/src/cpu/intel/speedstep/Makefile.inc trunk/src/cpu/via/model_c3/Makefile.inc trunk/src/cpu/via/model_c7/Makefile.inc trunk/src/cpu/x86/cache/Makefile.inc trunk/src/cpu/x86/lapic/Makefile.inc trunk/src/cpu/x86/mtrr/Makefile.inc trunk/src/cpu/x86/name/Makefile.inc trunk/src/cpu/x86/pae/Makefile.inc trunk/src/cpu/x86/smm/Makefile.inc trunk/src/cpu/x86/tsc/Makefile.inc trunk/src/devices/Makefile.inc trunk/src/devices/oprom/Makefile.inc trunk/src/devices/oprom/x86emu/Makefile.inc trunk/src/devices/oprom/yabel/Makefile.inc trunk/src/devices/oprom/yabel/compat/Makefile.inc trunk/src/drivers/ati/ragexl/Makefile.inc trunk/src/drivers/dec/21143/Makefile.inc trunk/src/drivers/generic/debug/Makefile.inc trunk/src/drivers/sil/3114/Makefile.inc trunk/src/lib/Makefile.inc trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc trunk/src/mainboard/broadcom/blast/Makefile.inc trunk/src/mainboard/emulation/qemu-x86/Makefile.inc trunk/src/mainboard/getac/p470/Makefile.inc trunk/src/mainboard/gigabyte/m57sli/Makefile.inc trunk/src/mainboard/hp/dl145_g1/Makefile.inc trunk/src/mainboard/ibase/mb899/Makefile.inc trunk/src/mainboard/intel/d945gclf/Makefile.inc trunk/src/mainboard/kontron/986lcd-m/Makefile.inc trunk/src/mainboard/msi/ms9282/Makefile.inc trunk/src/mainboard/rca/rm4100/Makefile.inc trunk/src/mainboard/roda/rk886ex/Makefile.inc trunk/src/mainboard/supermicro/h8dme/Makefile.inc trunk/src/mainboard/supermicro/x6dhe_g/Makefile.inc trunk/src/mainboard/supermicro/x6dhe_g2/Makefile.inc trunk/src/mainboard/technexion/tim5690/Makefile.inc trunk/src/mainboard/thomson/ip1000/Makefile.inc trunk/src/mainboard/tyan/s2881/Makefile.inc trunk/src/mainboard/tyan/s2892/Makefile.inc trunk/src/mainboard/via/epia-m700/Kconfig trunk/src/mainboard/via/epia-m700/Makefile.inc trunk/src/northbridge/amd/amdfam10/Makefile.inc trunk/src/northbridge/amd/amdk8/Makefile.inc trunk/src/northbridge/amd/gx1/Makefile.inc trunk/src/northbridge/amd/gx2/Makefile.inc trunk/src/northbridge/amd/lx/Makefile.inc trunk/src/northbridge/intel/e7501/Makefile.inc trunk/src/northbridge/intel/e7520/Makefile.inc trunk/src/northbridge/intel/e7525/Makefile.inc trunk/src/northbridge/intel/i3100/Makefile.inc trunk/src/northbridge/intel/i440bx/Makefile.inc trunk/src/northbridge/intel/i440lx/Makefile.inc trunk/src/northbridge/intel/i82810/Makefile.inc trunk/src/northbridge/intel/i82830/Makefile.inc trunk/src/northbridge/intel/i855/Makefile.inc trunk/src/northbridge/intel/i945/Makefile.inc trunk/src/northbridge/via/cn400/Makefile.inc trunk/src/northbridge/via/cn700/Makefile.inc trunk/src/northbridge/via/cx700/Makefile.inc trunk/src/northbridge/via/vt8601/Makefile.inc trunk/src/northbridge/via/vt8623/Makefile.inc trunk/src/northbridge/via/vx800/Makefile.inc trunk/src/pc80/Makefile.inc trunk/src/pc80/vga/Makefile.inc trunk/src/southbridge/amd/amd8111/Makefile.inc trunk/src/southbridge/amd/amd8131/Makefile.inc trunk/src/southbridge/amd/amd8132/Makefile.inc trunk/src/southbridge/amd/amd8151/Makefile.inc trunk/src/southbridge/amd/cs5530/Makefile.inc trunk/src/southbridge/amd/cs5535/Makefile.inc trunk/src/southbridge/amd/cs5536/Makefile.inc trunk/src/southbridge/amd/rs690/Makefile.inc trunk/src/southbridge/amd/rs780/Makefile.inc trunk/src/southbridge/amd/sb600/Makefile.inc trunk/src/southbridge/amd/sb700/Makefile.inc trunk/src/southbridge/broadcom/bcm21000/Makefile.inc trunk/src/southbridge/broadcom/bcm5780/Makefile.inc trunk/src/southbridge/broadcom/bcm5785/Makefile.inc trunk/src/southbridge/intel/esb6300/Makefile.inc trunk/src/southbridge/intel/i3100/Makefile.inc trunk/src/southbridge/intel/i82371eb/Makefile.inc trunk/src/southbridge/intel/i82801ax/Makefile.inc trunk/src/southbridge/intel/i82801bx/Makefile.inc trunk/src/southbridge/intel/i82801cx/Makefile.inc trunk/src/southbridge/intel/i82801dx/Makefile.inc trunk/src/southbridge/intel/i82801ex/Makefile.inc trunk/src/southbridge/intel/i82801gx/Makefile.inc trunk/src/southbridge/intel/i82870/Makefile.inc trunk/src/southbridge/intel/pxhd/Makefile.inc trunk/src/southbridge/nvidia/ck804/Makefile.inc trunk/src/southbridge/nvidia/mcp55/Makefile.inc trunk/src/southbridge/ricoh/rl5c476/Makefile.inc trunk/src/southbridge/sis/sis966/Makefile.inc trunk/src/southbridge/ti/pci1x2x/Makefile.inc trunk/src/southbridge/ti/pci7420/Makefile.inc trunk/src/southbridge/ti/pcixx12/Makefile.inc trunk/src/southbridge/via/k8t890/Makefile.inc trunk/src/southbridge/via/vt8231/Makefile.inc trunk/src/southbridge/via/vt8235/Makefile.inc trunk/src/southbridge/via/vt8237r/Makefile.inc trunk/src/superio/fintek/f71805f/Makefile.inc trunk/src/superio/fintek/f71859/Makefile.inc trunk/src/superio/fintek/f71863fg/Makefile.inc trunk/src/superio/intel/i3100/Makefile.inc trunk/src/superio/ite/it8661f/Makefile.inc trunk/src/superio/ite/it8671f/Makefile.inc trunk/src/superio/ite/it8673f/Makefile.inc trunk/src/superio/ite/it8705f/Makefile.inc trunk/src/superio/ite/it8712f/Makefile.inc trunk/src/superio/ite/it8716f/Makefile.inc trunk/src/superio/ite/it8718f/Makefile.inc trunk/src/superio/nsc/pc8374/Makefile.inc trunk/src/superio/nsc/pc87309/Makefile.inc trunk/src/superio/nsc/pc87351/Makefile.inc trunk/src/superio/nsc/pc87360/Makefile.inc trunk/src/superio/nsc/pc87366/Makefile.inc trunk/src/superio/nsc/pc87417/Makefile.inc trunk/src/superio/nsc/pc87427/Makefile.inc trunk/src/superio/nsc/pc97307/Makefile.inc trunk/src/superio/nsc/pc97317/Makefile.inc trunk/src/superio/renesas/m3885x/Makefile.inc trunk/src/superio/smsc/fdc37m60x/Makefile.inc trunk/src/superio/smsc/fdc37n972/Makefile.inc trunk/src/superio/smsc/lpc47b272/Makefile.inc trunk/src/superio/smsc/lpc47b397/Makefile.inc trunk/src/superio/smsc/lpc47m10x/Makefile.inc trunk/src/superio/smsc/lpc47m15x/Makefile.inc trunk/src/superio/smsc/lpc47n217/Makefile.inc trunk/src/superio/smsc/lpc47n227/Makefile.inc trunk/src/superio/smsc/sio10n268/Makefile.inc trunk/src/superio/smsc/smscsuperio/Makefile.inc trunk/src/superio/via/vt1211/Makefile.inc trunk/src/superio/winbond/w83627dhg/Makefile.inc trunk/src/superio/winbond/w83627ehg/Makefile.inc trunk/src/superio/winbond/w83627hf/Makefile.inc trunk/src/superio/winbond/w83627thf/Makefile.inc trunk/src/superio/winbond/w83627thg/Makefile.inc trunk/src/superio/winbond/w83627uhg/Makefile.inc trunk/src/superio/winbond/w83697hf/Makefile.inc trunk/src/superio/winbond/w83977f/Makefile.inc trunk/src/superio/winbond/w83977tf/Makefile.inc Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/Makefile Thu Sep 30 18:55:02 2010 (r5886) @@ -173,32 +173,35 @@ @printf " HOSTCC $(subst $(objutil)/,,$(@))\n" $(HOSTCC) -MMD -I$(subst $(objutil)/,util/,$(dir $<)) -I$(dir $<) $(HOSTCFLAGS) -c -o $@ $< -$(obj)/%.o: $(obj)/%.c $(obj)/config.h +$(obj)/%.ramstage.o: $(obj)/%.c $(obj)/config.h @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD $(CFLAGS) -c -o $@ $< -objs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.o -initobjs:= -drivers:= -smmobjs:= -types:=obj initobj driver smmobj +ramstage-srcs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.c +romstage-srcs:= +driver-srcs:= +smm-srcs:= + +ramstage-objs:= +romstage-objs:= +driver-objs:= +smm-objs:= +types:=ramstage romstage driver smm # Clean -y variables, include Makefile.inc -# If $(3) is non-empty, add paths to files in X-y, and add them to Xs +# Add paths to files in X-y to X-srcs # Add subdirs-y to subdirs includemakefiles= \ $(foreach type,$(2), $(eval $(type)-y:=)) \ $(eval subdirs-y:=) \ $(eval -include $(1)) \ $(foreach type,$(2), \ - $(eval $(type)s+= \ + $(eval $(type)-srcs+= \ $$(subst $(top)/,, \ - $$(abspath $$(patsubst src/%, \ - $(obj)/%, \ - $$(addprefix $(dir $(1)),$$($(type)-y))))))) \ + $$(abspath $$(addprefix $(dir $(1)),$$($(type)-y)))))) \ $(eval subdirs+=$$(subst $(CURDIR)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y))))) -# For each path in $(subdirs) call includemakefiles, passing $(1) as $(3) +# For each path in $(subdirs) call includemakefiles # Repeat until subdirs is empty evaluate_subdirs= \ $(eval cursubdirs:=$(subdirs)) \ @@ -211,70 +214,62 @@ subdirs:=$(PLATFORM-y) $(BUILD-y) $(eval $(call evaluate_subdirs)) -initobjs:=$(addsuffix .initobj.o, $(basename $(initobjs))) -drivers:=$(addsuffix .driver.o, $(basename $(drivers))) -smmobjs:=$(addsuffix .smmobj.o, $(basename $(smmobjs))) +src-to-obj=$(addsuffix .$(1).o, $(basename $(patsubst src/%, $(obj)/%, $($(1)-srcs)))) -allobjs:=$(foreach var, $(addsuffix s,$(types)), $($(var))) +ramstage-objs:=$(call src-to-obj,ramstage) +romstage-objs:=$(call src-to-obj,romstage) +driver-objs:=$(call src-to-obj,driver) +smm-objs:=$(call src-to-obj,smm) + +allsrcs:=$(foreach var, $(addsuffix -srcs,$(types)), $($(var))) +allobjs:=$(foreach var, $(addsuffix -objs,$(types)), $($(var))) alldirs:=$(sort $(abspath $(dir $(allobjs)))) -source_with_ext=$(patsubst $(obj)/%.o,src/%.$(1),$(allobjs)) -allsrc=$(wildcard $(call source_with_ext,c) $(call source_with_ext,S)) -define objs_asl_template -$(obj)/$(1)%.o: src/$(1)%.asl +define ramstage-objs_asl_template +$(obj)/$(1).ramstage.o: src/$(1).asl @printf " IASL $$(subst $(top)/,,$$(@))\n" $(CPP) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$(a)).asl - iasl -p $$(basename $$@) -tc $$(basename $$(a)).asl - mv $$(basename $$(a)).hex $$(basename $$(a)).c - $(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $$@))), -DAmlCode=AmlCode_$$(basename $$(notdir $$@))) -c -o $$@ $$(basename $$(a)).c + iasl -p $$(obj)/$(1) -tc $$(basename $$(a)).asl + mv $$(obj)/$(1).hex $$(basename $$(a)).c + $(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $(1)))), -DAmlCode=AmlCode_$$(basename $$(notdir $(1)))) -c -o $$@ $$(basename $$(a)).c # keep %.o: %.c rule from catching the temporary .c file after a make clean mv $$(basename $$(a)).c $$(basename $$(a)).hex endef # macro to define template macros that are used by use_template macro define create_cc_template -# $1 obj class (objs, initobjs, ...) +# $1 obj class (ramstage, romstage, driver, smm) # $2 source suffix (c, S) -# $3 .o infix ("" ".initobj", ...) -# $4 additional compiler flags -de$(EMPTY)fine $(1)_$(2)_template -$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h +# $3 additional compiler flags +de$(EMPTY)fine $(1)-objs_$(2)_template +$(obj)/$$(1).$(1).o: src/$$(1).$(2) $(obj)/config.h @printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" - $(CC) $(4) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< + $(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< en$(EMPTY)def endef -$(eval $(call create_cc_template,objs,c)) -$(eval $(call create_cc_template,objs,S,,-DASSEMBLY)) -$(eval $(call create_cc_template,initobjs,c,.initobj,-D__PRE_RAM__)) -$(eval $(call create_cc_template,initobjs,S,.initobj,-DASSEMBLY -D__PRE_RAM__)) -$(eval $(call create_cc_template,drivers,c,.driver)) -$(eval $(call create_cc_template,drivers,S,.driver,-DASSEMBLY)) -$(eval $(call create_cc_template,smmobjs,c,.smmobj)) -$(eval $(call create_cc_template,smmobjs,S,.smmobj)) - -usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d))))) -usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d))))) -$(eval $(call usetemplate,objs,asl)) -$(eval $(call usetemplate,objs,c)) -$(eval $(call usetemplate,objs,S)) -$(eval $(call usetemplate,initobjs,c)) -$(eval $(call usetemplate,initobjs,S)) -$(eval $(call usetemplate,drivers,c)) -$(eval $(call usetemplate,drivers,S)) -$(eval $(call usetemplate,smmobjs,c)) -$(eval $(call usetemplate,smmobjs,S)) +$(eval $(call create_cc_template,ramstage,c)) +$(eval $(call create_cc_template,ramstage,S,-DASSEMBLY)) +$(eval $(call create_cc_template,romstage,c,-D__PRE_RAM__)) +$(eval $(call create_cc_template,romstage,S,-DASSEMBLY -D__PRE_RAM__)) +$(eval $(call create_cc_template,driver,c)) +$(eval $(call create_cc_template,driver,S,-DASSEMBLY)) +$(eval $(call create_cc_template,smm,c)) +$(eval $(call create_cc_template,smm,S)) + +foreach-src=$(foreach file,$($(1)-srcs),$(eval $(call $(1)-objs_$(subst .,,$(suffix $(file)))_template,$(subst src/,,$(basename $(file)))))) +$(eval $(foreach type,$(types),$(call foreach-src,$(type)))) -DEPENDENCIES = $(objs:.o=.d) $(initobjs:.o=.d) $(drivers:.o=.d) $(smmobjs:.o=.d) +DEPENDENCIES = $(ramstage-objs:.o=.d) $(romstage-objs:.o=.d) $(driver-objs:.o=.d) $(smm-objs:.o=.d) -include $(DEPENDENCIES) printall: - @echo objs:=$(objs) - @echo initobjs:=$(initobjs) - @echo drivers:=$(drivers) - @echo smmobjs:=$(smmobjs) + @echo ramstage-objs:=$(ramstage-objs) + @echo romstage-objs:=$(romstage-objs) + @echo driver-objs:=$(driver-objs) + @echo smm-objs:=$(smm-objs) @echo alldirs:=$(alldirs) - @echo allsrc=$(allsrc) + @echo allsrcs=$(allsrcs) @echo DEPENDENCIES=$(DEPENDENCIES) @echo LIBGCC_FILE_NAME=$(LIBGCC_FILE_NAME) @@ -343,7 +338,7 @@ rm -rf $(DOXYGEN_OUTPUT_DIR) clean-for-update: doxygen-clean - rm -f $(objs) $(initobjs) $(drivers) $(smmobjs) .xcompile + rm -f $(ramstage-objs) $(romstage-objs) $(driver-objs) $(smm-objs) .xcompile rm -f $(DEPENDENCIES) rm -f $(obj)/coreboot_ram* $(obj)/coreboot.romstage $(obj)/coreboot.pre* $(obj)/coreboot.bootblock $(obj)/coreboot.a rm -rf $(obj)/bootblock* $(obj)/romstage* $(obj)/location.* Modified: trunk/src/arch/i386/Makefile.bigbootblock.inc ============================================================================== --- trunk/src/arch/i386/Makefile.bigbootblock.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/arch/i386/Makefile.bigbootblock.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -20,7 +20,7 @@ @printf " GEN $(subst $(obj)/,,$(@))\n" printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@ -$(obj)/mainboard/$(MAINBOARDDIR)/crt0.initobj.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s +$(obj)/mainboard/$(MAINBOARDDIR)/crt0.romstage.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD -I$(obj) -Wa,-acdlns -c -o $@ $< > $(dir $(a))/crt0.disasm @@ -28,9 +28,9 @@ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< -o $@ -$(obj)/coreboot: $$(initobjs) $(obj)/ldscript.ld +$(obj)/coreboot: $$(romstage-objs) $(obj)/ldscript.ld @printf " LINK $(subst $(obj)/,,$(@))\n" - $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(initobjs) + $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(romstage-objs) $(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map $(OBJCOPY) --only-keep-debug $@ $(obj)/bootblock.debug $(OBJCOPY) --strip-debug $@ Modified: trunk/src/arch/i386/Makefile.bootblock.inc ============================================================================== --- trunk/src/arch/i386/Makefile.bootblock.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/arch/i386/Makefile.bootblock.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -81,16 +81,16 @@ ####################################################################### # Build the romstage -$(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $$(initobjs) $(obj)/romstage/ldscript.ld +$(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $$(romstage-objs) $(obj)/romstage/ldscript.ld @printf " LINK $(subst $(obj)/,,$(@))\n" printf "CONFIG_ROMBASE = 0x0;\nAUTO_XIP_ROM_BASE = 0x0;\n" > $(obj)/location.ld - $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(initobjs) + $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs) $(OBJCOPY) -O binary $(obj)/romstage.elf $(obj)/romstage.bin printf "CONFIG_ROMBASE = 0x" > $(obj)/location.ld $(CBFSTOOL) $(obj)/coreboot.pre1 locate $(obj)/romstage.bin $(CONFIG_CBFS_PREFIX)/romstage $(CONFIG_XIP_ROM_SIZE) > $(obj)/location.txt cat $(obj)/location.txt >> $(obj)/location.ld printf ';\nAUTO_XIP_ROM_BASE = CONFIG_ROMBASE & ~(CONFIG_XIP_ROM_SIZE - 1);\n' >> $(obj)/location.ld - $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(initobjs) + $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(romstage-objs) $(NM) -n $(obj)/romstage.elf | sort > $(obj)/romstage.map $(OBJCOPY) --only-keep-debug $(obj)/romstage.elf $(obj)/romstage.debug $(OBJCOPY) --strip-debug $(obj)/romstage.elf @@ -107,7 +107,7 @@ mkdir -p $(obj)/romstage printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@ -$(obj)/mainboard/$(MAINBOARDDIR)/crt0.initobj.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s +$(obj)/mainboard/$(MAINBOARDDIR)/crt0.romstage.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -I$(obj) -Wa,-acdlns -c -o $@ $< > $(dir $(a))/crt0.disasm Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/arch/i386/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -25,7 +25,11 @@ subdirs-y += lib subdirs-y += smp -obj-$(CONFIG_HAVE_OPTION_TABLE) += ../../option_table.o +OPTION_TABLE_H:= +ifeq ($(CONFIG_HAVE_OPTION_TABLE),y) +ramstage-srcs += $(obj)/option_table.c +OPTION_TABLE_H:=$(obj)/option_table.h +endif ####################################################################### # Build the final rom image @@ -88,13 +92,13 @@ ####################################################################### # i386 specific tools -$(obj)/option_table.h: $(objutil)/options/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout +$(OPTION_TABLE_H): $(objutil)/options/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout @printf " OPTION $(subst $(obj)/,,$(@))\n" - $(objutil)/options/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h + $(objutil)/options/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $@ $(obj)/option_table.c: $(objutil)/options/build_opt_tbl $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout @printf " OPTION $(subst $(obj)/,,$(@))\n" - $(objutil)/options/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --option $(obj)/option_table.c + $(objutil)/options/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --option $@ $(objutil)/options/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h @printf " HOSTCC $(subst $(obj)/,,$(@))\n" @@ -111,11 +115,11 @@ $(OBJCOPY) --strip-debug $@ $(OBJCOPY) --add-gnu-debuglink=$(obj)/coreboot_ram.debug $@ -$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $$(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME) +$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.ramstage.o $$(driver-objs) $(obj)/coreboot.a $(LIBGCC_FILE_NAME) @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,--end-group + $(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.ramstage.o $(driver-objs) -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,--end-group -$(obj)/coreboot.a: $$(objs) +$(obj)/coreboot.a: $$(ramstage-objs) @printf " AR $(subst $(obj)/,,$(@))\n" rm -f $(obj)/coreboot.a $(AR) cr $(obj)/coreboot.a $^ @@ -191,11 +195,6 @@ crt0s += $(src)/arch/i386/init/crt0_romcc_epilogue.inc endif -OPTION_TABLE_H:= -ifeq ($(CONFIG_HAVE_OPTION_TABLE),y) -OPTION_TABLE_H:=$(obj)/option_table.h -endif - ifeq ($(CONFIG_ROMCC),y) ROMCCFLAGS ?= -mcpu=p2 -O2 @@ -219,36 +218,36 @@ endif # Things that appear in every board -initobjs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o -objs += $(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o +romstage-srcs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mainboard.c ifeq ($(CONFIG_GENERATE_MP_TABLE),y) -objs += $(obj)/mainboard/$(MAINBOARDDIR)/mptable.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mptable.c endif ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y) -objs += $(obj)/mainboard/$(MAINBOARDDIR)/irq_tables.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/irq_tables.c endif ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y) -objs += $(obj)/mainboard/$(MAINBOARDDIR)/reset.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c endif ifeq ($(CONFIG_GENERATE_ACPI_TABLES),y) -objs += $(obj)/mainboard/$(MAINBOARDDIR)/acpi_tables.o -objs += $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/acpi_tables.c +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/dsdt.asl # make doesn't have arithmetic operators or greater-than comparisons ifeq ($(subst 5,4,$(CONFIG_ACPI_SSDTX_NUM)),4) -objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.o -objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.o -objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt2.asl +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt3.asl +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt4.asl endif ifeq ($(CONFIG_ACPI_SSDTX_NUM),5) -objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt5.asl endif ifeq ($(CONFIG_BOARD_HAS_FADT),y) -objs += $(obj)/mainboard/$(MAINBOARDDIR)/fadt.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c endif endif ifeq ($(CONFIG_HAVE_BUS_CONFIG),y) -objs += $(obj)/mainboard/$(MAINBOARDDIR)/get_bus_conf.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c endif ifeq ($(CONFIG_TINY_BOOTBLOCK),y) Modified: trunk/src/arch/i386/boot/Makefile.inc ============================================================================== --- trunk/src/arch/i386/boot/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/arch/i386/boot/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,13 +1,13 @@ -obj-y += boot.o -obj-y += coreboot_table.o -obj-$(CONFIG_MULTIBOOT) += multiboot.o -obj-y += gdt.o -obj-y += tables.o -obj-$(CONFIG_GENERATE_MP_TABLE) += mpspec.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.o -obj-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.o +ramstage-y += boot.c +ramstage-y += coreboot_table.c +ramstage-$(CONFIG_MULTIBOOT) += multiboot.c +ramstage-y += gdt.c +ramstage-y += tables.c +ramstage-$(CONFIG_GENERATE_MP_TABLE) += mpspec.c +ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.c +ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S -$(obj)/arch/i386/boot/coreboot_table.o : $(OPTION_TABLE_H) +$(obj)/arch/i386/boot/coreboot_table.ramstage.o : $(OPTION_TABLE_H) Modified: trunk/src/arch/i386/lib/Makefile.inc ============================================================================== --- trunk/src/arch/i386/lib/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/arch/i386/lib/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,13 +1,13 @@ -obj-y += c_start.o -obj-y += cpu.o -obj-y += pci_ops_conf1.o -obj-y += pci_ops_conf2.o -obj-y += pci_ops_mmconf.o -obj-y += pci_ops_auto.o -obj-y += exception.o -obj-$(CONFIG_IOAPIC) += ioapic.o +ramstage-y += c_start.S +ramstage-y += cpu.c +ramstage-y += pci_ops_conf1.c +ramstage-y += pci_ops_conf2.c +ramstage-y += pci_ops_mmconf.c +ramstage-y += pci_ops_auto.c +ramstage-y += exception.c +ramstage-$(CONFIG_IOAPIC) += ioapic.c -initobj-y += printk_init.o -initobj-y += cbfs_and_run.o +romstage-y += printk_init.c +romstage-y += cbfs_and_run.c -$(obj)/arch/i386/lib/console.o :: $(obj)/build.h +$(obj)/arch/i386/lib/console.ramstage.o :: $(obj)/build.h Modified: trunk/src/boot/Makefile.inc ============================================================================== --- trunk/src/boot/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/boot/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -obj-y += hardwaremain.o -obj-y += selfboot.o +ramstage-y += hardwaremain.c +ramstage-y += selfboot.c Modified: trunk/src/console/Makefile.inc ============================================================================== --- trunk/src/console/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/console/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,21 +1,21 @@ -obj-y += printk.o -obj-y += console.o -obj-y += vtxprintf.o -obj-y += vsprintf.o +ramstage-y += printk.c +ramstage-y += console.c +ramstage-y += vtxprintf.c +ramstage-y += vsprintf.c -smmobj-y += printk.o -smmobj-y += vtxprintf.o +smm-y += printk.c +smm-y += vtxprintf.c -initobj-y += vtxprintf.o -initobj-$(CONFIG_CACHE_AS_RAM) += console.o +romstage-y += vtxprintf.c +romstage-$(CONFIG_CACHE_AS_RAM) += console.c -driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.o -driver-$(CONFIG_USBDEBUG) += usbdebug_console.o -driver-$(CONFIG_CONSOLE_VGA) += vga_console.o -driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.o -driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.o -driver-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.o -driver-$(CONFIG_CONSOLE_NE2K) += ne2k_console.o +driver-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c +driver-$(CONFIG_USBDEBUG) += usbdebug_console.c +driver-$(CONFIG_CONSOLE_VGA) += vga_console.c +driver-$(CONFIG_CONSOLE_BTEXT) += btext_console.c +driver-$(CONFIG_CONSOLE_BTEXT) += font-8x16.c +driver-$(CONFIG_CONSOLE_LOGBUF) += logbuf_console.c +driver-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c -$(obj)/console/console.o : $(obj)/build.h -$(obj)/console/console.initobj.o : $(obj)/build.h +$(obj)/console/console.ramstage.o : $(obj)/build.h +$(obj)/console/console.romstage.o : $(obj)/build.h Modified: trunk/src/cpu/amd/dualcore/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/dualcore/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/dualcore/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/amd/microcode/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/microcode/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/microcode/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += microcode.o +ramstage-y += microcode.c Modified: trunk/src/cpu/amd/model_10xxx/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/model_10xxx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/model_10xxx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/amd/model_fxx/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/model_fxx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/model_fxx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/amd/model_gx1/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/model_gx1/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/model_gx1/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -22,7 +22,7 @@ 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 Modified: trunk/src/cpu/amd/model_gx2/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/model_gx2/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/model_gx2/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -3,7 +3,7 @@ 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 Modified: trunk/src/cpu/amd/model_lx/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/model_lx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/model_lx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -3,7 +3,7 @@ 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 Modified: trunk/src/cpu/amd/mtrr/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/mtrr/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/mtrr/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += amd_mtrr.o +ramstage-y += amd_mtrr.c Modified: trunk/src/cpu/amd/quadcore/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/quadcore/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/quadcore/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += amd_sibling.o +ramstage-y += amd_sibling.c Modified: trunk/src/cpu/amd/sc520/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/sc520/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/sc520/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += sc520.o +ramstage-y += sc520.c Modified: trunk/src/cpu/amd/socket_754/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_754/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_754/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_754.o +ramstage-y += socket_754.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr Modified: trunk/src/cpu/amd/socket_939/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_939/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_939/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_939.o +ramstage-y += socket_939.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr Modified: trunk/src/cpu/amd/socket_940/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_940/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_940/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_940.o +ramstage-y += socket_940.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr Modified: trunk/src/cpu/amd/socket_AM2/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_AM2/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_AM2/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_AM2.o +ramstage-y += socket_AM2.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr Modified: trunk/src/cpu/amd/socket_AM2r2/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_AM2r2/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_AM2r2/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_AM2r2.o +ramstage-y += socket_AM2r2.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr Modified: trunk/src/cpu/amd/socket_AM3/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_AM3/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_AM3/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_AM3.o +ramstage-y += socket_AM3.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr Modified: trunk/src/cpu/amd/socket_ASB2/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_ASB2/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_ASB2/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_ASB2.o +ramstage-y += socket_ASB2.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr Modified: trunk/src/cpu/amd/socket_F/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_F/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_F/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_F.o +ramstage-y += socket_F.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr Modified: trunk/src/cpu/amd/socket_F_1207/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_F_1207/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_F_1207/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/amd/socket_S1G1/Makefile.inc ============================================================================== --- trunk/src/cpu/amd/socket_S1G1/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/amd/socket_S1G1/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += socket_S1G1.o +ramstage-y += socket_S1G1.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr Modified: trunk/src/cpu/intel/bga956/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/bga956/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/bga956/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -obj-y += bga956.o +ramstage-y += bga956.c subdirs-y += ../model_1067x subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr Modified: trunk/src/cpu/intel/ep80579/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/ep80579/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/ep80579/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/hyperthreading/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/hyperthreading/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/hyperthreading/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += intel_sibling.o +ramstage-y += intel_sibling.c Modified: trunk/src/cpu/intel/microcode/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/microcode/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/microcode/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += microcode.o +ramstage-y += microcode.c Modified: trunk/src/cpu/intel/model_1067x/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_1067x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_1067x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,3 +1,3 @@ -driver-y += model_1067x_init.o +driver-y += model_1067x_init.c subdirs-y += ../../x86/name Modified: trunk/src/cpu/intel/model_106cx/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_106cx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_106cx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/model_68x/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_68x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_68x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/model_69x/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_69x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_69x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += model_69x_init.o +driver-y += model_69x_init.c Modified: trunk/src/cpu/intel/model_6bx/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_6bx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_6bx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -driver-y += model_6bx_init.o +driver-y += model_6bx_init.c subdirs-y += ../../x86/name Modified: trunk/src/cpu/intel/model_6dx/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_6dx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_6dx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += model_6dx_init.o +driver-y += model_6dx_init.c Modified: trunk/src/cpu/intel/model_6ex/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_6ex/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_6ex/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/model_6fx/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_6fx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_6fx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -driver-y += model_6fx_init.o +driver-y += model_6fx_init.c subdirs-y += ../../x86/name Modified: trunk/src/cpu/intel/model_6xx/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_6xx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_6xx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += model_6xx_init.o +driver-y += model_6xx_init.c Modified: trunk/src/cpu/intel/model_f0x/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_f0x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_f0x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += model_f0x_init.o +driver-y += model_f0x_init.c Modified: trunk/src/cpu/intel/model_f1x/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_f1x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_f1x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += model_f1x_init.o +driver-y += model_f1x_init.c Modified: trunk/src/cpu/intel/model_f2x/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_f2x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_f2x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += model_f2x_init.o +driver-y += model_f2x_init.c Modified: trunk/src/cpu/intel/model_f3x/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_f3x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_f3x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += model_f3x_init.o +driver-y += model_f3x_init.c Modified: trunk/src/cpu/intel/model_f4x/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/model_f4x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/model_f4x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += model_f4x_init.o +driver-y += model_f4x_init.c Modified: trunk/src/cpu/intel/slot_1/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/slot_1/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/slot_1/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/slot_2/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/slot_2/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/slot_2/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/socket_441/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_441/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_441/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/socket_FC_PGA370/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_FC_PGA370/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_FC_PGA370/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/socket_PGA370/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_PGA370/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_PGA370/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/socket_mFCBGA479/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_mFCBGA479/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_mFCBGA479/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/socket_mFCPGA478/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_mFCPGA478/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_mFCPGA478/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/socket_mPGA478/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_mPGA478/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_mPGA478/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/socket_mPGA479M/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_mPGA479M/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_mPGA479M/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 += ../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 Modified: trunk/src/cpu/intel/socket_mPGA603/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_mPGA603/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_mPGA603/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/socket_mPGA604/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_mPGA604/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/socket_mPGA604/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/intel/speedstep/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/speedstep/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/intel/speedstep/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c Modified: trunk/src/cpu/via/model_c3/Makefile.inc ============================================================================== --- trunk/src/cpu/via/model_c3/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/via/model_c3/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -5,4 +5,4 @@ subdirs-y += ../../x86/smm subdirs-y += ../../intel/microcode -driver-y += model_c3_init.o +driver-y += model_c3_init.c Modified: trunk/src/cpu/via/model_c7/Makefile.inc ============================================================================== --- trunk/src/cpu/via/model_c7/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/via/model_c7/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -5,6 +5,6 @@ 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 Modified: trunk/src/cpu/x86/cache/Makefile.inc ============================================================================== --- trunk/src/cpu/x86/cache/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/x86/cache/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += cache.o +ramstage-y += cache.c Modified: trunk/src/cpu/x86/lapic/Makefile.inc ============================================================================== --- trunk/src/cpu/x86/lapic/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/x86/lapic/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 Modified: trunk/src/cpu/x86/mtrr/Makefile.inc ============================================================================== --- trunk/src/cpu/x86/mtrr/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/x86/mtrr/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += mtrr.o +ramstage-y += mtrr.c Modified: trunk/src/cpu/x86/name/Makefile.inc ============================================================================== --- trunk/src/cpu/x86/name/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/x86/name/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += name.o +ramstage-y += name.c Modified: trunk/src/cpu/x86/pae/Makefile.inc ============================================================================== --- trunk/src/cpu/x86/pae/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/x86/pae/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += pgtbl.o +ramstage-y += pgtbl.c Modified: trunk/src/cpu/x86/smm/Makefile.inc ============================================================================== --- trunk/src/cpu/x86/smm/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/x86/smm/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -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 + +smm-y += smmhandler.S +smm-y += smihandler.c +smm-y += smiutil.c -smmobj-y += smmhandler.o -smmobj-y += smihandler.o -smmobj-y += smiutil.o - -$(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 Modified: trunk/src/cpu/x86/tsc/Makefile.inc ============================================================================== --- trunk/src/cpu/x86/tsc/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/cpu/x86/tsc/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -obj-$(CONFIG_UDELAY_TSC) += delay_tsc.o +ramstage-$(CONFIG_UDELAY_TSC) += delay_tsc.c Modified: trunk/src/devices/Makefile.inc ============================================================================== --- trunk/src/devices/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/devices/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,21 +1,21 @@ -obj-y += device.o -obj-y += root_device.o -obj-y += device_util.o -obj-y += pci_device.o -obj-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.o -obj-y += pcix_device.o -obj-y += pciexp_device.o -obj-y += agp_device.o -obj-y += cardbus_device.o -obj-y += pnp_device.o -obj-y += pci_ops.o -obj-y += smbus_ops.o +ramstage-y += device.c +ramstage-y += root_device.c +ramstage-y += device_util.c +ramstage-y += pci_device.c +ramstage-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.c +ramstage-y += pcix_device.c +ramstage-y += pciexp_device.c +ramstage-y += agp_device.c +ramstage-y += cardbus_device.c +ramstage-y += pnp_device.c +ramstage-y += pci_ops.c +ramstage-y += smbus_ops.c subdirs-y += oprom ifeq ($(CONFIG_PCI_ROM_RUN),y) -obj-y += pci_rom.o +ramstage-y += pci_rom.c else -obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o +ramstage-$(CONFIG_VGA_ROM_RUN) += pci_rom.c endif Modified: trunk/src/devices/oprom/Makefile.inc ============================================================================== --- trunk/src/devices/oprom/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/devices/oprom/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,9 +17,9 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.o -obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.o -obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_interrupts.o +ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.c +ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.S +ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_interrupts.c subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += x86emu subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += yabel Modified: trunk/src/devices/oprom/x86emu/Makefile.inc ============================================================================== --- trunk/src/devices/oprom/x86emu/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/devices/oprom/x86emu/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,7 +1,7 @@ -obj-y += debug.o -obj-y += decode.o -obj-y += fpu.o -obj-y += ops.o -obj-y += ops2.o -obj-y += prim_ops.o -obj-y += sys.o +ramstage-y += debug.c +ramstage-y += decode.c +ramstage-y += fpu.c +ramstage-y += ops.c +ramstage-y += ops2.c +ramstage-y += prim_ops.c +ramstage-y += sys.c Modified: trunk/src/devices/oprom/yabel/Makefile.inc ============================================================================== --- trunk/src/devices/oprom/yabel/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/devices/oprom/yabel/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,9 +1,9 @@ -obj-y += biosemu.o -obj-y += debug.o -obj-y += device.o -obj-y += interrupt.o -obj-y += io.o -obj-y += mem.o -obj-y += pmm.o -obj-y += vbe.o +ramstage-y += biosemu.c +ramstage-y += debug.c +ramstage-y += device.c +ramstage-y += interrupt.c +ramstage-y += io.c +ramstage-y += mem.c +ramstage-y += pmm.c +ramstage-y += vbe.c subdirs-y += compat Modified: trunk/src/devices/oprom/yabel/compat/Makefile.inc ============================================================================== --- trunk/src/devices/oprom/yabel/compat/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/devices/oprom/yabel/compat/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += functions.o +ramstage-y += functions.c Modified: trunk/src/drivers/ati/ragexl/Makefile.inc ============================================================================== --- trunk/src/drivers/ati/ragexl/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/drivers/ati/ragexl/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-$(CONFIG_ATI_RAGE_XL) += xlinit.o +driver-$(CONFIG_ATI_RAGE_XL) += xlinit.c Modified: trunk/src/drivers/dec/21143/Makefile.inc ============================================================================== --- trunk/src/drivers/dec/21143/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/drivers/dec/21143/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -driver-y += 21143.o +driver-y += 21143.c Modified: trunk/src/drivers/generic/debug/Makefile.inc ============================================================================== --- trunk/src/drivers/generic/debug/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/drivers/generic/debug/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-$(CONFIG_DRIVERS_GENERIC_DEBUG) += debug_dev.o +ramstage-$(CONFIG_DRIVERS_GENERIC_DEBUG) += debug_dev.c Modified: trunk/src/drivers/sil/3114/Makefile.inc ============================================================================== --- trunk/src/drivers/sil/3114/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/drivers/sil/3114/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.o +driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.c Modified: trunk/src/lib/Makefile.inc ============================================================================== --- trunk/src/lib/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/lib/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,37 +1,37 @@ -obj-y += clog2.o -obj-y += uart8250.o -obj-y += memset.o -obj-y += memcpy.o -obj-y += memcmp.o -obj-y += memmove.o -obj-y += malloc.o -obj-y += delay.o -obj-y += fallback_boot.o -obj-y += compute_ip_checksum.o -obj-y += version.o -obj-y += cbfs.o -obj-y += lzma.o -#obj-y += lzmadecode.o -obj-y += gcc.o -obj-y += cbmem.o - -initobj-y += uart8250.o -initobj-y += memset.o -initobj-y += memcpy.o -initobj-y += memcmp.o -initobj-y += cbfs.o -initobj-y += lzma.o -#initobj-y += lzmadecode.o -initobj-$(CONFIG_CONSOLE_NE2K) += ne2k.o -initobj-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.o -driver-$(CONFIG_CONSOLE_NE2K) += ne2k.o - -obj-$(CONFIG_USBDEBUG) += usbdebug.o +ramstage-y += clog2.c +ramstage-y += uart8250.c +ramstage-y += memset.c +ramstage-y += memcpy.c +ramstage-y += memcmp.c +ramstage-y += memmove.c +ramstage-y += malloc.c +ramstage-y += delay.c +ramstage-y += fallback_boot.c +ramstage-y += compute_ip_checksum.c +ramstage-y += version.c +ramstage-y += cbfs.c +ramstage-y += lzma.c +#ramstage-y += lzmadecode.c +ramstage-y += gcc.c +ramstage-y += cbmem.c + +romstage-y += uart8250.c +romstage-y += memset.c +romstage-y += memcpy.c +romstage-y += memcmp.c +romstage-y += cbfs.c +romstage-y += lzma.c +#romstage-y += lzmadecode.c +romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c +romstage-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.c +driver-$(CONFIG_CONSOLE_NE2K) += ne2k.c + +ramstage-$(CONFIG_USBDEBUG) += usbdebug.c -obj-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.o +ramstage-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.c -obj-$(CONFIG_BOOTSPLASH) += jpeg.o +ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c -smmobj-y += memcpy.o +smm-y += memcpy.c -$(obj)/lib/version.o : $(obj)/build.h +$(obj)/lib/version.ramstage.o : $(obj)/build.h Modified: trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o +ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c Modified: trunk/src/mainboard/broadcom/blast/Makefile.inc ============================================================================== --- trunk/src/mainboard/broadcom/blast/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/broadcom/blast/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ # Needed by irq_tables and mptable and acpi_tables. -obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c Modified: trunk/src/mainboard/emulation/qemu-x86/Makefile.inc ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/emulation/qemu-x86/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,3 +1,3 @@ ROMCCFLAGS := -mcpu=i386 -O -obj-y += northbridge.o +ramstage-y += northbridge.c Modified: trunk/src/mainboard/getac/p470/Makefile.inc ============================================================================== --- trunk/src/mainboard/getac/p470/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/getac/p470/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,7 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += rtl8168.o -obj-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.o +driver-y += rtl8168.c +ramstage-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c Modified: trunk/src/mainboard/gigabyte/m57sli/Makefile.inc ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/gigabyte/m57sli/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.c Modified: trunk/src/mainboard/hp/dl145_g1/Makefile.inc ============================================================================== --- trunk/src/mainboard/hp/dl145_g1/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/hp/dl145_g1/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o \ No newline at end of file +ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c \ No newline at end of file Modified: trunk/src/mainboard/ibase/mb899/Makefile.inc ============================================================================== --- trunk/src/mainboard/ibase/mb899/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/ibase/mb899/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += rtl8168.o +ramstage-y += rtl8168.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c Modified: trunk/src/mainboard/intel/d945gclf/Makefile.inc ============================================================================== --- trunk/src/mainboard/intel/d945gclf/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/intel/d945gclf/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += rtl8168.o +driver-y += rtl8168.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c Modified: trunk/src/mainboard/kontron/986lcd-m/Makefile.inc ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/kontron/986lcd-m/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += rtl8168.o +driver-y += rtl8168.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c Modified: trunk/src/mainboard/msi/ms9282/Makefile.inc ============================================================================== --- trunk/src/mainboard/msi/ms9282/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/msi/ms9282/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,6 +18,6 @@ ## # FIXME drivers should be selected through Kconfig -obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o -obj-y += ../../../drivers/i2c/adm1027/adm1027.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c +ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c Modified: trunk/src/mainboard/rca/rm4100/Makefile.inc ============================================================================== --- trunk/src/mainboard/rca/rm4100/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/rca/rm4100/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c Modified: trunk/src/mainboard/roda/rk886ex/Makefile.inc ============================================================================== --- trunk/src/mainboard/roda/rk886ex/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/roda/rk886ex/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,8 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += m3885.o -obj-y += ec.o -driver-y += rtl8168.o +ramstage-y += m3885.c +ramstage-y += ec.c +driver-y += rtl8168.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c Modified: trunk/src/mainboard/supermicro/h8dme/Makefile.inc ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/supermicro/h8dme/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c # Needed by irq_tables and mptable and acpi_tables. Modified: trunk/src/mainboard/supermicro/x6dhe_g/Makefile.inc ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/supermicro/x6dhe_g/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-y += ../../../drivers/generic/debug/debug_dev.o +ramstage-y += ../../../drivers/generic/debug/debug_dev.c Modified: trunk/src/mainboard/supermicro/x6dhe_g2/Makefile.inc ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/supermicro/x6dhe_g2/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-y += ../../../drivers/generic/debug/debug_dev.o +ramstage-y += ../../../drivers/generic/debug/debug_dev.c Modified: trunk/src/mainboard/technexion/tim5690/Makefile.inc ============================================================================== --- trunk/src/mainboard/technexion/tim5690/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/technexion/tim5690/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -20,7 +20,7 @@ # Needed by irq_tables and mptable and acpi_tables. # This is debug message for products of Technexion. -obj-y += tn_post_code.o +ramstage-y += tn_post_code.c -obj-y += speaker.o -obj-y += vgabios.o +ramstage-y += speaker.c +ramstage-y += vgabios.c Modified: trunk/src/mainboard/thomson/ip1000/Makefile.inc ============================================================================== --- trunk/src/mainboard/thomson/ip1000/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/thomson/ip1000/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c Modified: trunk/src/mainboard/tyan/s2881/Makefile.inc ============================================================================== --- trunk/src/mainboard/tyan/s2881/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/tyan/s2881/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += ../../../drivers/i2c/adt7463/adt7463.o +ramstage-y += ../../../drivers/i2c/adt7463/adt7463.c Modified: trunk/src/mainboard/tyan/s2892/Makefile.inc ============================================================================== --- trunk/src/mainboard/tyan/s2892/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/tyan/s2892/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -obj-y += ../../../drivers/i2c/adm1027/adm1027.o +ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c Modified: trunk/src/mainboard/via/epia-m700/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-m700/Kconfig Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/via/epia-m700/Kconfig Thu Sep 30 18:55:02 2010 (r5886) @@ -8,7 +8,6 @@ select SUPERIO_WINBOND_W83697HF select BOARD_HAS_FADT select HAVE_OPTION_TABLE - select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR Modified: trunk/src/mainboard/via/epia-m700/Makefile.inc ============================================================================== --- trunk/src/mainboard/via/epia-m700/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/mainboard/via/epia-m700/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -22,5 +22,5 @@ # This code is unused and should be replaced by the generic resume code # completely. If anyone works on wakeup for this chipset/board, delete # wakeup.c when you are done. -# obj-y += wakeup.o +# ramstage-y += wakeup.c Modified: trunk/src/northbridge/amd/amdfam10/Makefile.inc ============================================================================== --- trunk/src/northbridge/amd/amdfam10/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/amd/amdfam10/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,16 +1,16 @@ -driver-y += northbridge.o -driver-y += misc_control.o +driver-y += northbridge.c +driver-y += misc_control.c -obj-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr3.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr4.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr5.o +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.asl +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.asl +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr3.asl +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr4.asl +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr5.asl -obj-y += get_pci1234.o +ramstage-y += get_pci1234.c # Enable this if you want to check the values of the PCI routing registers. # Call show_all_routes() anywhere amdfam10.h is included. -#obj-y += util.o +#ramstage-y += util.c Modified: trunk/src/northbridge/amd/amdk8/Makefile.inc ============================================================================== --- trunk/src/northbridge/amd/amdk8/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/amd/amdk8/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,11 +1,11 @@ -driver-y += northbridge.o -driver-y += misc_control.o -obj-y += get_sblk_pci1234.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += amdk8_acpi.o +driver-y += northbridge.c +driver-y += misc_control.c +ramstage-y += get_sblk_pci1234.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += amdk8_acpi.c # Enable this if you want to check the values of the PCI routing registers. # Call show_all_routes() anywhere amdk8.h is included. -#obj-y += util.o +#ramstage-y += util.c # Not sure what to do with these yet. How did raminit_test even work? # Should be a target in -y form. Modified: trunk/src/northbridge/amd/gx1/Makefile.inc ============================================================================== --- trunk/src/northbridge/amd/gx1/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/amd/gx1/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c Modified: trunk/src/northbridge/amd/gx2/Makefile.inc ============================================================================== --- trunk/src/northbridge/amd/gx2/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/amd/gx2/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,3 +1,3 @@ -driver-y += northbridge.o -obj-y += northbridgeinit.o -obj-y += grphinit.o +driver-y += northbridge.c +ramstage-y += northbridgeinit.c +ramstage-y += grphinit.c Modified: trunk/src/northbridge/amd/lx/Makefile.inc ============================================================================== --- trunk/src/northbridge/amd/lx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/amd/lx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,3 +1,3 @@ -driver-y += northbridge.o -obj-y += northbridgeinit.o -obj-y += grphinit.o +driver-y += northbridge.c +ramstage-y += northbridgeinit.c +ramstage-y += grphinit.c Modified: trunk/src/northbridge/intel/e7501/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/e7501/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/e7501/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += northbridge.o +ramstage-y += northbridge.c Modified: trunk/src/northbridge/intel/e7520/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/e7520/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/e7520/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,5 +1,5 @@ -driver-y += northbridge.o -driver-y += pciexp_porta.o -driver-y += pciexp_porta1.o -driver-y += pciexp_portb.o -driver-y += pciexp_portc.o +driver-y += northbridge.c +driver-y += pciexp_porta.c +driver-y += pciexp_porta1.c +driver-y += pciexp_portb.c +driver-y += pciexp_portc.c Modified: trunk/src/northbridge/intel/e7525/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/e7525/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/e7525/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,5 +1,5 @@ -driver-y += northbridge.o -driver-y += pciexp_porta.o -driver-y += pciexp_porta1.o -driver-y += pciexp_portb.o -driver-y += pciexp_portc.o +driver-y += northbridge.c +driver-y += pciexp_porta.c +driver-y += pciexp_porta1.c +driver-y += pciexp_portb.c +driver-y += pciexp_portc.c Modified: trunk/src/northbridge/intel/i3100/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/i3100/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/i3100/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,3 +1,3 @@ -driver-y += northbridge.o -driver-y += pciexp_porta.o -driver-y += pciexp_porta_ep80579.o +driver-y += northbridge.c +driver-y += pciexp_porta.c +driver-y += pciexp_porta_ep80579.c Modified: trunk/src/northbridge/intel/i440bx/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/i440bx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/i440bx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c Modified: trunk/src/northbridge/intel/i440lx/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/i440lx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/i440lx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c Modified: trunk/src/northbridge/intel/i82810/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/i82810/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/i82810/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c Modified: trunk/src/northbridge/intel/i82830/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/i82830/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/i82830/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -driver-y += northbridge.o -driver-y += vga.o +driver-y += northbridge.c +driver-y += vga.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.c Modified: trunk/src/northbridge/intel/i855/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/i855/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/i855/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -obj-y += northbridge.o +ramstage-y += northbridge.c Modified: trunk/src/northbridge/intel/i945/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/i945/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/intel/i945/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,6 +17,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -driver-y += northbridge.o -driver-y += gma.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o +driver-y += northbridge.c +driver-y += gma.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c Modified: trunk/src/northbridge/via/cn400/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/cn400/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/via/cn400/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,8 +18,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o -driver-y += agp.o -driver-y += vga.o -driver-y += vlink.o +driver-y += northbridge.c +driver-y += agp.c +driver-y += vga.c +driver-y += vlink.c Modified: trunk/src/northbridge/via/cn700/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/cn700/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/via/cn700/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o -driver-y += agp.o -driver-y += vga.o +driver-y += northbridge.c +driver-y += agp.c +driver-y += vga.c Modified: trunk/src/northbridge/via/cx700/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/cx700/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/via/cx700/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,10 +17,10 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += cx700_reset.o -obj-y += northbridge.o +ramstage-y += cx700_reset.c +ramstage-y += northbridge.c -driver-y += cx700_agp.o -driver-y += cx700_lpc.o -driver-y += cx700_sata.o -driver-y += cx700_vga.o +driver-y += cx700_agp.c +driver-y += cx700_lpc.c +driver-y += cx700_sata.c +driver-y += cx700_vga.c Modified: trunk/src/northbridge/via/vt8601/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/vt8601/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/via/vt8601/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c Modified: trunk/src/northbridge/via/vt8623/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/vt8623/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/via/vt8623/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,6 +18,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o -driver-y += vga.o +driver-y += northbridge.c +driver-y += vga.c Modified: trunk/src/northbridge/via/vx800/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/vx800/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/northbridge/via/vx800/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,10 +18,10 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o -driver-y += vga.o -driver-y += vx800_lpc.o -driver-y += vx800_ide.o +driver-y += northbridge.c +driver-y += vga.c +driver-y += vx800_lpc.c +driver-y += vx800_ide.c chipset_bootblock_inc += $(src)/northbridge/via/vx800/romstrap.inc chipset_bootblock_lds += $(src)/northbridge/via/vx800/romstrap.lds Modified: trunk/src/pc80/Makefile.inc ============================================================================== --- trunk/src/pc80/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/pc80/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,11 +1,12 @@ -obj-y += mc146818rtc.o -obj-y += isa-dma.o -obj-y += i8259.o -obj-$(CONFIG_UDELAY_IO) += udelay_io.o -obj-y += keyboard.o -initobj-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.o -initobj-$(CONFIG_CACHE_AS_RAM) += serial.o +ramstage-y += mc146818rtc.c +ramstage-y += isa-dma.c +ramstage-y += i8259.c +ramstage-$(CONFIG_UDELAY_IO) += udelay_io.c +ramstage-y += keyboard.c + +romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c +romstage-$(CONFIG_CACHE_AS_RAM) += serial.c subdirs-y += vga -$(obj)/pc80/mc146818rtc.o : $(OPTION_TABLE_H) -$(obj)/pc80/mc146818rtc_early.initobj.o : $(OPTION_TABLE_H) +$(obj)/pc80/mc146818rtc.ramstage.o : $(OPTION_TABLE_H) +$(obj)/pc80/mc146818rtc_early.romstage.o : $(OPTION_TABLE_H) Modified: trunk/src/pc80/vga/Makefile.inc ============================================================================== --- trunk/src/pc80/vga/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/pc80/vga/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,2 +1,2 @@ -obj-y += vga_io.o -obj-$(CONFIG_VGA) += vga.o +ramstage-y += vga_io.c +ramstage-$(CONFIG_VGA) += vga.c Modified: trunk/src/southbridge/amd/amd8111/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/amd8111/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/amd8111/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,11 +1,11 @@ -driver-y += amd8111.o -driver-y += amd8111_usb.o -driver-y += amd8111_lpc.o -driver-y += amd8111_ide.o -driver-y += amd8111_acpi.o -driver-y += amd8111_usb2.o -driver-y += amd8111_ac97.o -driver-y += amd8111_nic.o -driver-y += amd8111_pci.o -driver-y += amd8111_smbus.o -obj-y += amd8111_reset.o +driver-y += amd8111.c +driver-y += amd8111_usb.c +driver-y += amd8111_lpc.c +driver-y += amd8111_ide.c +driver-y += amd8111_acpi.c +driver-y += amd8111_usb2.c +driver-y += amd8111_ac97.c +driver-y += amd8111_nic.c +driver-y += amd8111_pci.c +driver-y += amd8111_smbus.c +ramstage-y += amd8111_reset.c Modified: trunk/src/southbridge/amd/amd8131/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/amd8131/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/amd8131/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += amd8131_bridge.o +driver-y += amd8131_bridge.c Modified: trunk/src/southbridge/amd/amd8132/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/amd8132/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/amd8132/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += amd8132_bridge.o +driver-y += amd8132_bridge.c Modified: trunk/src/southbridge/amd/amd8151/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/amd8151/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/amd8151/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += amd8151_agp3.o +driver-y += amd8151_agp3.c Modified: trunk/src/southbridge/amd/cs5530/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/cs5530/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/cs5530/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,8 +18,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += cs5530.o -driver-y += cs5530_isa.o -driver-y += cs5530_ide.o -driver-y += cs5530_vga.o -driver-y += cs5530_pirq.o +driver-y += cs5530.c +driver-y += cs5530_isa.c +driver-y += cs5530_ide.c +driver-y += cs5530_vga.c +driver-y += cs5530_pirq.c Modified: trunk/src/southbridge/amd/cs5535/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/cs5535/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/cs5535/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,4 +1,4 @@ -driver-y += cs5535.o -#driver-y += cs5535_pci.o -#driver-y += cs5535_ide.o -obj-y += chipsetinit.o +driver-y += cs5535.c +#driver-y += cs5535_pci.c +#driver-y += cs5535_ide.c +ramstage-y += chipsetinit.c Modified: trunk/src/southbridge/amd/cs5536/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/cs5536/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/cs5536/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += cs5536.o -driver-y += cs5536_ide.o -driver-y += cs5536_pirq.o +driver-y += cs5536.c +driver-y += cs5536_ide.c +driver-y += cs5536_pirq.c Modified: trunk/src/southbridge/amd/rs690/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/rs690/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/rs690/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,5 +1,5 @@ -driver-y += rs690.o -driver-y += rs690_cmn.o -driver-y += rs690_pcie.o -driver-y += rs690_ht.o -driver-y += rs690_gfx.o +driver-y += rs690.c +driver-y += rs690_cmn.c +driver-y += rs690_pcie.c +driver-y += rs690_ht.c +driver-y += rs690_gfx.c Modified: trunk/src/southbridge/amd/rs780/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/rs780/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/rs780/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,5 +1,5 @@ -driver-y += rs780.o -driver-y += rs780_cmn.o -driver-y += rs780_pcie.o -driver-y += rs780_ht.o -driver-y += rs780_gfx.o +driver-y += rs780.c +driver-y += rs780_cmn.c +driver-y += rs780_pcie.c +driver-y += rs780_ht.c +driver-y += rs780_gfx.c Modified: trunk/src/southbridge/amd/sb600/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/sb600/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/sb600/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,10 +1,10 @@ -driver-y += sb600.o -driver-y += sb600_usb.o -driver-y += sb600_lpc.o -driver-y += sb600_sm.o -driver-y += sb600_ide.o -driver-y += sb600_sata.o -driver-y += sb600_hda.o -driver-y += sb600_ac97.o -driver-y += sb600_pci.o -obj-y += sb600_reset.o +driver-y += sb600.c +driver-y += sb600_usb.c +driver-y += sb600_lpc.c +driver-y += sb600_sm.c +driver-y += sb600_ide.c +driver-y += sb600_sata.c +driver-y += sb600_hda.c +driver-y += sb600_ac97.c +driver-y += sb600_pci.c +ramstage-y += sb600_reset.c Modified: trunk/src/southbridge/amd/sb700/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/sb700/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/amd/sb700/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,9 +1,9 @@ -driver-y += sb700.o -driver-y += sb700_usb.o -driver-y += sb700_lpc.o -driver-y += sb700_sm.o -driver-y += sb700_ide.o -driver-y += sb700_sata.o -driver-y += sb700_hda.o -driver-y += sb700_pci.o -obj-y += sb700_reset.o +driver-y += sb700.c +driver-y += sb700_usb.c +driver-y += sb700_lpc.c +driver-y += sb700_sm.c +driver-y += sb700_ide.c +driver-y += sb700_sata.c +driver-y += sb700_hda.c +driver-y += sb700_pci.c +ramstage-y += sb700_reset.c Modified: trunk/src/southbridge/broadcom/bcm21000/Makefile.inc ============================================================================== --- trunk/src/southbridge/broadcom/bcm21000/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/broadcom/bcm21000/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += bcm21000_pcie.o +driver-y += bcm21000_pcie.c Modified: trunk/src/southbridge/broadcom/bcm5780/Makefile.inc ============================================================================== --- trunk/src/southbridge/broadcom/bcm5780/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/broadcom/bcm5780/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,3 +1,3 @@ -driver-y += bcm5780_nic.o -driver-y += bcm5780_pcix.o -driver-y += bcm5780_pcie.o +driver-y += bcm5780_nic.c +driver-y += bcm5780_pcix.c +driver-y += bcm5780_pcie.c Modified: trunk/src/southbridge/broadcom/bcm5785/Makefile.inc ============================================================================== --- trunk/src/southbridge/broadcom/bcm5785/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/broadcom/bcm5785/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,7 +1,7 @@ -driver-y += bcm5785.o -driver-y += bcm5785_usb.o -driver-y += bcm5785_lpc.o -driver-y += bcm5785_sb_pci_main.o -driver-y += bcm5785_ide.o -driver-y += bcm5785_sata.o -obj-y += bcm5785_reset.o +driver-y += bcm5785.c +driver-y += bcm5785_usb.c +driver-y += bcm5785_lpc.c +driver-y += bcm5785_sb_pci_main.c +driver-y += bcm5785_ide.c +driver-y += bcm5785_sata.c +ramstage-y += bcm5785_reset.c Modified: trunk/src/southbridge/intel/esb6300/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/esb6300/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/esb6300/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,11 +1,11 @@ -driver-y += esb6300.o -driver-y += esb6300_uhci.o -driver-y += esb6300_lpc.o -driver-y += esb6300_ide.o -driver-y += esb6300_sata.o -driver-y += esb6300_ehci.o -driver-y += esb6300_smbus.o -driver-y += esb6300_pci.o -driver-y += esb6300_pic.o -driver-y += esb6300_bridge1c.o -driver-y += esb6300_ac97.o +driver-y += esb6300.c +driver-y += esb6300_uhci.c +driver-y += esb6300_lpc.c +driver-y += esb6300_ide.c +driver-y += esb6300_sata.c +driver-y += esb6300_ehci.c +driver-y += esb6300_smbus.c +driver-y += esb6300_pci.c +driver-y += esb6300_pic.c +driver-y += esb6300_bridge1c.c +driver-y += esb6300_ac97.c Modified: trunk/src/southbridge/intel/i3100/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i3100/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i3100/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,9 +1,9 @@ -driver-y += i3100.o -driver-y += i3100_uhci.o -driver-y += i3100_lpc.o -driver-y += i3100_sata.o -driver-y += i3100_ehci.o -driver-y += i3100_smbus.o -driver-y += i3100_pci.o -obj-y += i3100_reset.o -obj-y += i3100_pciexp_portb.o +driver-y += i3100.c +driver-y += i3100_uhci.c +driver-y += i3100_lpc.c +driver-y += i3100_sata.c +driver-y += i3100_ehci.c +driver-y += i3100_smbus.c +driver-y += i3100_pci.c +ramstage-y += i3100_reset.c +ramstage-y += i3100_pciexp_portb.c Modified: trunk/src/southbridge/intel/i82371eb/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82371eb/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i82371eb/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,11 +18,11 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += i82371eb.o -driver-y += i82371eb_isa.o -driver-y += i82371eb_ide.o -driver-y += i82371eb_usb.o -driver-y += i82371eb_smbus.o -driver-y += i82371eb_reset.o +driver-y += i82371eb.c +driver-y += i82371eb_isa.c +driver-y += i82371eb_ide.c +driver-y += i82371eb_usb.c +driver-y += i82371eb_smbus.c +driver-y += i82371eb_reset.c -#initobj-y += i82371eb_early_rom.o +#romstage-y += i82371eb_early_rom.c Modified: trunk/src/southbridge/intel/i82801ax/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82801ax/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i82801ax/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,16 +18,16 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += i82801ax.o -driver-y += i82801ax_ac97.o -driver-y += i82801ax_ide.o -driver-y += i82801ax_lpc.o -driver-y += i82801ax_pci.o -# driver-y += i82801ax_smbus.o -driver-y += i82801ax_usb.o +driver-y += i82801ax.c +driver-y += i82801ax_ac97.c +driver-y += i82801ax_ide.c +driver-y += i82801ax_lpc.c +driver-y += i82801ax_pci.c +# driver-y += i82801ax_smbus.c +driver-y += i82801ax_usb.c -obj-y += i82801ax_reset.o -obj-y += i82801ax_watchdog.o +ramstage-y += i82801ax_reset.c +ramstage-y += i82801ax_watchdog.c # TODO: Fix and enable i82801ax_smbus.o later. Modified: trunk/src/southbridge/intel/i82801bx/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82801bx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i82801bx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,19 +18,19 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += i82801bx.o -driver-y += i82801bx_ac97.o -driver-y += i82801bx_ide.o -driver-y += i82801bx_lpc.o -driver-y += i82801bx_nic.o -driver-y += i82801bx_pci.o -driver-y += i82801bx_sata.o -# driver-y += i82801bx_smbus.o -driver-y += i82801bx_usb.o -driver-y += i82801bx_usb_ehci.o +driver-y += i82801bx.c +driver-y += i82801bx_ac97.c +driver-y += i82801bx_ide.c +driver-y += i82801bx_lpc.c +driver-y += i82801bx_nic.c +driver-y += i82801bx_pci.c +driver-y += i82801bx_sata.c +# driver-y += i82801bx_smbus.c +driver-y += i82801bx_usb.c +driver-y += i82801bx_usb_ehci.c -obj-y += i82801bx_reset.o -obj-y += i82801bx_watchdog.o +ramstage-y += i82801bx_reset.c +ramstage-y += i82801bx_watchdog.c # TODO: Fix and enable i82801bx_smbus.o later. Modified: trunk/src/southbridge/intel/i82801cx/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82801cx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i82801cx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,8 +1,8 @@ -driver-y += i82801cx.o -driver-y += i82801cx_usb.o -driver-y += i82801cx_lpc.o -driver-y += i82801cx_ide.o -driver-y += i82801cx_ac97.o -#driver-y += i82801cx_nic.o -driver-y += i82801cx_pci.o -obj-y += i82801cx_reset.o +driver-y += i82801cx.c +driver-y += i82801cx_usb.c +driver-y += i82801cx_lpc.c +driver-y += i82801cx_ide.c +driver-y += i82801cx_ac97.c +#driver-y += i82801cx_nic.c +driver-y += i82801cx_pci.c +ramstage-y += i82801cx_reset.c Modified: trunk/src/southbridge/intel/i82801dx/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82801dx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i82801dx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,15 +19,15 @@ ## MA 02110-1301 USA ## -driver-y += i82801dx.o -driver-y += i82801dx_ac97.o -driver-y += i82801dx_ide.o -driver-y += i82801dx_lpc.o -#driver-y += i82801dx_pci.o -driver-y += i82801dx_usb.o -driver-y += i82801dx_usb2.o +driver-y += i82801dx.c +driver-y += i82801dx_ac97.c +driver-y += i82801dx_ide.c +driver-y += i82801dx_lpc.c +#driver-y += i82801dx_pci.c +driver-y += i82801dx_usb.c +driver-y += i82801dx_usb2.c -obj-y += i82801dx_reset.o -obj-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smi.o +ramstage-y += i82801dx_reset.c +ramstage-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smi.c -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smihandler.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smihandler.c Modified: trunk/src/southbridge/intel/i82801ex/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82801ex/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i82801ex/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,11 +1,11 @@ -driver-y += i82801ex.o -driver-y += i82801ex_uhci.o -driver-y += i82801ex_lpc.o -driver-y += i82801ex_ide.o -driver-y += i82801ex_sata.o -driver-y += i82801ex_ehci.o -driver-y += i82801ex_smbus.o -driver-y += i82801ex_pci.o -driver-y += i82801ex_ac97.o -obj-y += i82801ex_watchdog.o -obj-y += i82801ex_reset.o +driver-y += i82801ex.c +driver-y += i82801ex_uhci.c +driver-y += i82801ex_lpc.c +driver-y += i82801ex_ide.c +driver-y += i82801ex_sata.c +driver-y += i82801ex_ehci.c +driver-y += i82801ex_smbus.c +driver-y += i82801ex_pci.c +driver-y += i82801ex_ac97.c +ramstage-y += i82801ex_watchdog.c +ramstage-y += i82801ex_reset.c Modified: trunk/src/southbridge/intel/i82801gx/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82801gx/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i82801gx/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,21 +17,21 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += i82801gx.o -driver-y += i82801gx_ac97.o -driver-y += i82801gx_azalia.o -driver-y += i82801gx_ide.o -driver-y += i82801gx_lpc.o -driver-y += i82801gx_nic.o -driver-y += i82801gx_pci.o -driver-y += i82801gx_pcie.o -driver-y += i82801gx_sata.o -driver-y += i82801gx_smbus.o -driver-y += i82801gx_usb.o -driver-y += i82801gx_usb_ehci.o +driver-y += i82801gx.c +driver-y += i82801gx_ac97.c +driver-y += i82801gx_azalia.c +driver-y += i82801gx_ide.c +driver-y += i82801gx_lpc.c +driver-y += i82801gx_nic.c +driver-y += i82801gx_pci.c +driver-y += i82801gx_pcie.c +driver-y += i82801gx_sata.c +driver-y += i82801gx_smbus.c +driver-y += i82801gx_usb.c +driver-y += i82801gx_usb_ehci.c -obj-y += i82801gx_reset.o -obj-y += i82801gx_watchdog.o +ramstage-y += i82801gx_reset.c +ramstage-y += i82801gx_watchdog.c -obj-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smi.o -smmobj-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smihandler.o +ramstage-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smi.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smihandler.c Modified: trunk/src/southbridge/intel/i82870/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/i82870/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/i82870/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,3 +1,3 @@ -driver-y += p64h2_ioapic.o -driver-y += p64h2_pcibridge.o -#driver-y += p64h2_pci_parity.o +driver-y += p64h2_ioapic.c +driver-y += p64h2_pcibridge.c +#driver-y += p64h2_pci_parity.c Modified: trunk/src/southbridge/intel/pxhd/Makefile.inc ============================================================================== --- trunk/src/southbridge/intel/pxhd/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/intel/pxhd/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += pxhd_bridge.o +driver-y += pxhd_bridge.c Modified: trunk/src/southbridge/nvidia/ck804/Makefile.inc ============================================================================== --- trunk/src/southbridge/nvidia/ck804/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/nvidia/ck804/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,19 +1,19 @@ -driver-y += ck804.o -driver-y += ck804_usb.o -driver-y += ck804_lpc.o -driver-y += ck804_smbus.o -driver-y += ck804_ide.o -driver-y += ck804_sata.o -driver-y += ck804_usb2.o -driver-y += ck804_ac97.o -driver-y += ck804_nic.o -driver-y += ck804_pci.o -driver-y += ck804_pcie.o -driver-y += ck804_ht.o +driver-y += ck804.c +driver-y += ck804_usb.c +driver-y += ck804_lpc.c +driver-y += ck804_smbus.c +driver-y += ck804_ide.c +driver-y += ck804_sata.c +driver-y += ck804_usb2.c +driver-y += ck804_ac97.c +driver-y += ck804_nic.c +driver-y += ck804_pci.c +driver-y += ck804_pcie.c +driver-y += ck804_ht.c -obj-y += ck804_reset.o +ramstage-y += ck804_reset.c -obj-$(CONFIG_GENERATE_ACPI_TABLES) += ck804_fadt.o +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ck804_fadt.c chipset_bootblock_inc += $(src)/southbridge/nvidia/ck804/romstrap.inc chipset_bootblock_lds += $(src)/southbridge/nvidia/ck804/romstrap.lds Modified: trunk/src/southbridge/nvidia/mcp55/Makefile.inc ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/nvidia/mcp55/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,19 +1,19 @@ -driver-y += mcp55.o -driver-y += mcp55_azalia.o -driver-y += mcp55_ht.o -driver-y += mcp55_ide.o -driver-y += mcp55_lpc.o -driver-y += mcp55_nic.o -driver-y += mcp55_pci.o -driver-y += mcp55_pcie.o -driver-y += mcp55_sata.o -driver-y += mcp55_smbus.o -driver-y += mcp55_usb2.o -driver-y += mcp55_usb.o +driver-y += mcp55.c +driver-y += mcp55_azalia.c +driver-y += mcp55_ht.c +driver-y += mcp55_ide.c +driver-y += mcp55_lpc.c +driver-y += mcp55_nic.c +driver-y += mcp55_pci.c +driver-y += mcp55_pcie.c +driver-y += mcp55_sata.c +driver-y += mcp55_smbus.c +driver-y += mcp55_usb2.c +driver-y += mcp55_usb.c -driver-$(CONFIG_GENERATE_ACPI_TABLES) += mcp55_fadt.o +driver-$(CONFIG_GENERATE_ACPI_TABLES) += mcp55_fadt.c -obj-y += mcp55_reset.o +ramstage-y += mcp55_reset.c chipset_bootblock_inc += $(src)/southbridge/nvidia/mcp55/romstrap.inc chipset_bootblock_lds += $(src)/southbridge/nvidia/mcp55/romstrap.lds Modified: trunk/src/southbridge/ricoh/rl5c476/Makefile.inc ============================================================================== --- trunk/src/southbridge/ricoh/rl5c476/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/ricoh/rl5c476/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-y += rl5c476.o +driver-y += rl5c476.c Modified: trunk/src/southbridge/sis/sis966/Makefile.inc ============================================================================== --- trunk/src/southbridge/sis/sis966/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/sis/sis966/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,14 +1,14 @@ -driver-y += sis761.o -driver-y += sis966.o -driver-y += sis966_lpc.o -driver-y += sis966_ide.o -driver-y += sis966_usb.o -driver-y += sis966_usb2.o -driver-y += sis966_nic.o -driver-y += sis966_sata.o -driver-y += sis966_pcie.o -driver-y += sis966_aza.o -obj-y += sis966_reset.o +driver-y += sis761.c +driver-y += sis966.c +driver-y += sis966_lpc.c +driver-y += sis966_ide.c +driver-y += sis966_usb.c +driver-y += sis966_usb2.c +driver-y += sis966_nic.c +driver-y += sis966_sata.c +driver-y += sis966_pcie.c +driver-y += sis966_aza.c +ramstage-y += sis966_reset.c chipset_bootblock_inc += $(src)/southbridge/sis/sis966/romstrap.inc chipset_bootblock_lds += $(src)/southbridge/sis/sis966/romstrap.lds Modified: trunk/src/southbridge/ti/pci1x2x/Makefile.inc ============================================================================== --- trunk/src/southbridge/ti/pci1x2x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/ti/pci1x2x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1 +1 @@ -driver-$(CONFIG_SOUTHBRIDGE_TI_PCI1X2X) += pci1x2x.o +driver-$(CONFIG_SOUTHBRIDGE_TI_PCI1X2X) += pci1x2x.c Modified: trunk/src/southbridge/ti/pci7420/Makefile.inc ============================================================================== --- trunk/src/southbridge/ti/pci7420/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/ti/pci7420/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,6 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += pci7420_cardbus.o -driver-y += pci7420_firewire.o +driver-y += pci7420_cardbus.c +driver-y += pci7420_firewire.c Modified: trunk/src/southbridge/ti/pcixx12/Makefile.inc ============================================================================== --- trunk/src/southbridge/ti/pcixx12/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/ti/pcixx12/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += pcixx12.o +driver-y += pcixx12.c Modified: trunk/src/southbridge/via/k8t890/Makefile.inc ============================================================================== --- trunk/src/southbridge/via/k8t890/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/via/k8t890/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -1,12 +1,12 @@ -driver-y += k8t890_ctrl.o -driver-y += k8t890_dram.o -driver-y += k8t890_bridge.o -driver-y += k8t890_host.o -driver-y += k8t890_host_ctrl.o -driver-y += k8t890_pcie.o -driver-y += k8t890_traf_ctrl.o -driver-y += k8t890_error.o -driver-y += k8m890_chrome.o +driver-y += k8t890_ctrl.c +driver-y += k8t890_dram.c +driver-y += k8t890_bridge.c +driver-y += k8t890_host.c +driver-y += k8t890_host_ctrl.c +driver-y += k8t890_pcie.c +driver-y += k8t890_traf_ctrl.c +driver-y += k8t890_error.c +driver-y += k8m890_chrome.c chipset_bootblock_inc += $(src)/southbridge/via/k8t890/romstrap.inc chipset_bootblock_lds += $(src)/southbridge/via/k8t890/romstrap.lds Modified: trunk/src/southbridge/via/vt8231/Makefile.inc ============================================================================== --- trunk/src/southbridge/via/vt8231/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/via/vt8231/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,9 +17,9 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += vt8231.o -driver-y += vt8231_lpc.o -driver-y += vt8231_acpi.o -driver-y += vt8231_ide.o -driver-y += vt8231_nic.o -#driver-y += vt8231_usb.o +driver-y += vt8231.c +driver-y += vt8231_lpc.c +driver-y += vt8231_acpi.c +driver-y += vt8231_ide.c +driver-y += vt8231_nic.c +#driver-y += vt8231_usb.c Modified: trunk/src/southbridge/via/vt8235/Makefile.inc ============================================================================== --- trunk/src/southbridge/via/vt8235/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/via/vt8235/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,8 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += vt8235.o -driver-y += vt8235_ide.o -driver-y += vt8235_lpc.o -driver-y += vt8235_nic.o -driver-y += vt8235_usb.o +driver-y += vt8235.c +driver-y += vt8235_ide.c +driver-y += vt8235_lpc.c +driver-y += vt8235_nic.c +driver-y += vt8235_usb.c Modified: trunk/src/southbridge/via/vt8237r/Makefile.inc ============================================================================== --- trunk/src/southbridge/via/vt8237r/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/southbridge/via/vt8237r/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,11 +17,11 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += vt8237r.o -driver-y += vt8237_ctrl.o -driver-y += vt8237r_ide.o -driver-y += vt8237r_lpc.o -driver-y += vt8237r_sata.o -driver-y += vt8237r_usb.o -driver-y += vt8237r_nic.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += vt8237_fadt.o +driver-y += vt8237r.c +driver-y += vt8237_ctrl.c +driver-y += vt8237r_ide.c +driver-y += vt8237r_lpc.c +driver-y += vt8237r_sata.c +driver-y += vt8237r_usb.c +driver-y += vt8237r_nic.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += vt8237_fadt.c Modified: trunk/src/superio/fintek/f71805f/Makefile.inc ============================================================================== --- trunk/src/superio/fintek/f71805f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/fintek/f71805f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_FINTEK_F71805F) += superio.o +ramstage-$(CONFIG_SUPERIO_FINTEK_F71805F) += superio.c Modified: trunk/src/superio/fintek/f71859/Makefile.inc ============================================================================== --- trunk/src/superio/fintek/f71859/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/fintek/f71859/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,4 +17,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_FINTEK_F71859) += superio.o +ramstage-$(CONFIG_SUPERIO_FINTEK_F71859) += superio.c Modified: trunk/src/superio/fintek/f71863fg/Makefile.inc ============================================================================== --- trunk/src/superio/fintek/f71863fg/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/fintek/f71863fg/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_SUPERIO_FINTEK_F71863FG) += superio.o +ramstage-$(CONFIG_SUPERIO_FINTEK_F71863FG) += superio.c Modified: trunk/src/superio/intel/i3100/Makefile.inc ============================================================================== --- trunk/src/superio/intel/i3100/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/intel/i3100/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_INTEL_I3100) += superio.o +ramstage-$(CONFIG_SUPERIO_INTEL_I3100) += superio.c Modified: trunk/src/superio/ite/it8661f/Makefile.inc ============================================================================== --- trunk/src/superio/ite/it8661f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/ite/it8661f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_ITE_IT8661F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8661F) += superio.c Modified: trunk/src/superio/ite/it8671f/Makefile.inc ============================================================================== --- trunk/src/superio/ite/it8671f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/ite/it8671f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_ITE_IT8671F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8671F) += superio.c Modified: trunk/src/superio/ite/it8673f/Makefile.inc ============================================================================== --- trunk/src/superio/ite/it8673f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/ite/it8673f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_ITE_IT8673F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8673F) += superio.c Modified: trunk/src/superio/ite/it8705f/Makefile.inc ============================================================================== --- trunk/src/superio/ite/it8705f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/ite/it8705f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_ITE_IT8705F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8705F) += superio.c Modified: trunk/src/superio/ite/it8712f/Makefile.inc ============================================================================== --- trunk/src/superio/ite/it8712f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/ite/it8712f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_ITE_IT8712F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8712F) += superio.c Modified: trunk/src/superio/ite/it8716f/Makefile.inc ============================================================================== --- trunk/src/superio/ite/it8716f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/ite/it8716f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_ITE_IT8716F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8716F) += superio.c Modified: trunk/src/superio/ite/it8718f/Makefile.inc ============================================================================== --- trunk/src/superio/ite/it8718f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/ite/it8718f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_ITE_IT8718F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8718F) += superio.c Modified: trunk/src/superio/nsc/pc8374/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc8374/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc8374/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -20,4 +20,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC8374) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC8374) += superio.c Modified: trunk/src/superio/nsc/pc87309/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc87309/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc87309/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC87309) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87309) += superio.c Modified: trunk/src/superio/nsc/pc87351/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc87351/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc87351/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -20,4 +20,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC87351) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87351) += superio.c Modified: trunk/src/superio/nsc/pc87360/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc87360/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc87360/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -20,4 +20,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC87360) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87360) += superio.c Modified: trunk/src/superio/nsc/pc87366/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc87366/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc87366/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -20,4 +20,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC87366) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87366) += superio.c Modified: trunk/src/superio/nsc/pc87417/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc87417/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc87417/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -21,4 +21,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC87417) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87417) += superio.c Modified: trunk/src/superio/nsc/pc87427/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc87427/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc87427/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -20,4 +20,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC87427) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87427) += superio.c Modified: trunk/src/superio/nsc/pc97307/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc97307/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc97307/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC97307) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC97307) += superio.c Modified: trunk/src/superio/nsc/pc97317/Makefile.inc ============================================================================== --- trunk/src/superio/nsc/pc97317/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/nsc/pc97317/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_NSC_PC97317) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC97317) += superio.c Modified: trunk/src/superio/renesas/m3885x/Makefile.inc ============================================================================== --- trunk/src/superio/renesas/m3885x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/renesas/m3885x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_SUPERIO_RENESAS_M3885X) += superio.o +ramstage-$(CONFIG_SUPERIO_RENESAS_M3885X) += superio.c Modified: trunk/src/superio/smsc/fdc37m60x/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/fdc37m60x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/fdc37m60x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_SMSC_FDC37M60X) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_FDC37M60X) += superio.c Modified: trunk/src/superio/smsc/fdc37n972/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/fdc37n972/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/fdc37n972/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_SUPERIO_SMSC_FDC37N972) += fdc37n972.o +ramstage-$(CONFIG_SUPERIO_SMSC_FDC37N972) += fdc37n972.c Modified: trunk/src/superio/smsc/lpc47b272/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/lpc47b272/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/lpc47b272/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_SMSC_LPC47B272) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47B272) += superio.c Modified: trunk/src/superio/smsc/lpc47b397/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/lpc47b397/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/lpc47b397/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -21,4 +21,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_SMSC_LPC47B397) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47B397) += superio.c Modified: trunk/src/superio/smsc/lpc47m10x/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/lpc47m10x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/lpc47m10x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -23,4 +23,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += superio.c Modified: trunk/src/superio/smsc/lpc47m15x/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/lpc47m15x/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/lpc47m15x/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -18,4 +18,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += superio.c Modified: trunk/src/superio/smsc/lpc47n217/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/lpc47n217/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/lpc47n217/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.c Modified: trunk/src/superio/smsc/lpc47n227/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/lpc47n227/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/lpc47n227/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_SUPERIO_SMSC_LPC47N227) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N227) += superio.c Modified: trunk/src/superio/smsc/sio10n268/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/sio10n268/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/sio10n268/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -17,4 +17,4 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-$(CONFIG_SUPERIO_SMSC_SIO10N268) += sio10n268.o +ramstage-$(CONFIG_SUPERIO_SMSC_SIO10N268) += sio10n268.c Modified: trunk/src/superio/smsc/smscsuperio/Makefile.inc ============================================================================== --- trunk/src/superio/smsc/smscsuperio/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/smsc/smscsuperio/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += superio.c Modified: trunk/src/superio/via/vt1211/Makefile.inc ============================================================================== --- trunk/src/superio/via/vt1211/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/via/vt1211/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_VIA_VT1211) += vt1211.o +ramstage-$(CONFIG_SUPERIO_VIA_VT1211) += vt1211.c Modified: trunk/src/superio/winbond/w83627dhg/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83627dhg/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83627dhg/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += superio.c Modified: trunk/src/superio/winbond/w83627ehg/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83627ehg/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83627ehg/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -20,4 +20,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.c Modified: trunk/src/superio/winbond/w83627hf/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83627hf/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83627hf/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -21,4 +21,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83627HF) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627HF) += superio.c Modified: trunk/src/superio/winbond/w83627thf/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83627thf/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83627thf/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -21,4 +21,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83627THF) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627THF) += superio.c Modified: trunk/src/superio/winbond/w83627thg/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83627thg/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83627thg/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -21,4 +21,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83627THG) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627THG) += superio.c Modified: trunk/src/superio/winbond/w83627uhg/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83627uhg/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83627uhg/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83627UHG) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627UHG) += superio.c Modified: trunk/src/superio/winbond/w83697hf/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83697hf/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83697hf/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.c Modified: trunk/src/superio/winbond/w83977f/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83977f/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83977f/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -19,4 +19,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83977F) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83977F) += superio.c Modified: trunk/src/superio/winbond/w83977tf/Makefile.inc ============================================================================== --- trunk/src/superio/winbond/w83977tf/Makefile.inc Thu Sep 30 09:56:12 2010 (r5885) +++ trunk/src/superio/winbond/w83977tf/Makefile.inc Thu Sep 30 18:55:02 2010 (r5886) @@ -21,4 +21,4 @@ ## #config chip.h -obj-$(CONFIG_SUPERIO_WINBOND_W83977TF) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83977TF) += superio.c

10 years, 5 months

[PATCH EHCI Debug Port setup for all AMD SB600/SB700 boards

by Uwe Hermann

See patch. I also cleaned up the Debug Port page in the wiki a bit. http://www.coreboot.org/EHCI_Debug_Port For now I marked all chipsets where we have Debug Port code as untested, I have a feeling the functionality was rarely tested recently (or at all) so we should only mark those chipsets as tested where we actually have recent test reports. I'm not sure about the SiS966 Debug Port code, it looks copy-pasted from MCP55 to me, not sure if the functionality actually exists on that chipset and if the code is correct for that. Maybe someone with a SiS966 board could test this? I'll be able to test on two more chipsets (MCP55, ICH7) and mark them as tested in the wiki then, will report back. Can somebody test SB700? I guess it works fine as the SB600 does too, but a test report would be nice. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

10 years, 5 months

[PATCH] Move CAR settings to board config for socket 940 boards.

by Warren Turkal

Does anyone have access to the machines for which I needed override configurations that are listed in the patch message below? I would like to test these with the DCACHE_* items removed from their mainboard Kconfig files to see if they work so that the CAR settings for socket 940 systems can be completely unified. Thanks, wt 8<---------------------------------------------------------------------- For the a number of the socket 940 based machines, I collapsed their CAR configurations into the socket config. However, I have kept a number of overrides in place for the following machines: * broadcom/blast * ibm/e32{5,6} * newisys/khepri * sunw/ultra40 * tyan/s488{0,2} These machines used different setting than the defaults for socket 940 systems. Signed-off-by: Warren Turkal <wt(a)penguintechs.org> --- src/cpu/amd/model_fxx/Kconfig | 22 ---------------------- src/cpu/amd/socket_940/Kconfig | 26 ++++++++++++++++++++++++-- src/mainboard/arima/hdama/Kconfig | 1 - src/mainboard/broadcom/blast/Kconfig | 1 - src/mainboard/ibm/e325/Kconfig | 1 - src/mainboard/ibm/e326/Kconfig | 1 - src/mainboard/iwill/dk8_htx/Kconfig | 13 ------------- src/mainboard/iwill/dk8s2/Kconfig | 13 ------------- src/mainboard/iwill/dk8x/Kconfig | 13 ------------- src/mainboard/newisys/khepri/Kconfig | 1 - src/mainboard/sunw/ultra40/Kconfig | 1 - src/mainboard/tyan/s4880/Kconfig | 1 - src/mainboard/tyan/s4882/Kconfig | 1 - 13 files changed, 24 insertions(+), 71 deletions(-) diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig index 21fc1ab..139b96a 100644 --- a/src/cpu/amd/model_fxx/Kconfig +++ b/src/cpu/amd/model_fxx/Kconfig @@ -1,31 +1,9 @@ config CPU_AMD_MODEL_FXX bool - select CACHE_AS_RAM select MMX select SSE select SSE2 -config CPU_ADDR_BITS - int - default 40 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_SIZE - hex - default 0x08000 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - depends on CPU_AMD_MODEL_FXX - - config UDELAY_IO bool default n diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig index c17a85f..6c3a929 100644 --- a/src/cpu/amd/socket_940/Kconfig +++ b/src/cpu/amd/socket_940/Kconfig @@ -1,14 +1,36 @@ config CPU_AMD_SOCKET_940 bool + +if CPU_AMD_SOCKET_940 + +config SOCKET_SPECIFIC_OPTIONS + def_bool y select K8_HT_FREQ_1G_SUPPORT select CPU_AMD_MODEL_FXX + select CACHE_AS_RAM config CPU_SOCKET_TYPE hex default 0x0 - depends on CPU_AMD_SOCKET_940 config DIMM_SUPPORT hex default 0x108 - depends on CPU_AMD_SOCKET_940 + +config CPU_ADDR_BITS + int + default 40 + +config DCACHE_RAM_BASE + hex + default 0xc8000 + +config DCACHE_RAM_SIZE + hex + default 0x08000 + +config DCACHE_RAM_GLOBAL_VAR_SIZE + hex + default 0x01000 + +endif # CPU_AMD_SOCKET_940 diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig index 3f89162..664b260 100644 --- a/src/mainboard/arima/hdama/Kconfig +++ b/src/mainboard/arima/hdama/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select BOARD_ROMSIZE_KB_512 diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig index 2c14b0a..b9d2548 100644 --- a/src/mainboard/broadcom/blast/Kconfig +++ b/src/mainboard/broadcom/blast/Kconfig @@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig index 143618f..c0fc3bf 100644 --- a/src/mainboard/ibm/e325/Kconfig +++ b/src/mainboard/ibm/e325/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig index 147f379..10f7557 100644 --- a/src/mainboard/ibm/e326/Kconfig +++ b/src/mainboard/ibm/e326/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig index 5232b70..78bd169 100644 --- a/src/mainboard/iwill/dk8_htx/Kconfig +++ b/src/mainboard/iwill/dk8_htx/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID select SB_HT_CHAIN_UNITID_OFFSET_ONLY @@ -26,18 +25,6 @@ config MAINBOARD_DIR string default iwill/dk8_htx -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x10 diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig index 4d40847..e5ba7c3 100644 --- a/src/mainboard/iwill/dk8s2/Kconfig +++ b/src/mainboard/iwill/dk8s2/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT @@ -23,18 +22,6 @@ config MAINBOARD_DIR string default iwill/dk8s2 -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0 diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig index 315a743..9676503 100644 --- a/src/mainboard/iwill/dk8x/Kconfig +++ b/src/mainboard/iwill/dk8x/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT @@ -22,18 +21,6 @@ config MAINBOARD_DIR string default iwill/dk8x -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0 diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig index 31f705d..5fcb011 100644 --- a/src/mainboard/newisys/khepri/Kconfig +++ b/src/mainboard/newisys/khepri/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig index 4cd5800..7d521fc 100644 --- a/src/mainboard/sunw/ultra40/Kconfig +++ b/src/mainboard/sunw/ultra40/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_1024 diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig index faff037..78c98df 100644 --- a/src/mainboard/tyan/s4880/Kconfig +++ b/src/mainboard/tyan/s4880/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig index 866aec0..54c0327 100644 --- a/src/mainboard/tyan/s4882/Kconfig +++ b/src/mainboard/tyan/s4882/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY -- 1.7.1

10 years, 5 months

build service results for r5885

by repository service

Dear coreboot readers! This is the automatic build system of coreboot. The developer "stepan" checked in revision 5885 to the coreboot repository. This caused the following changes: Change Log: fix Kontron KT690 and clean up socket S1G1 boards accordingly. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Build Log: Compilation of kontron:kt690 has been fixed If something broke during this checkin please be a pain in stepan's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

10 years, 5 months

build service results for r5884

by repository service

Dear coreboot readers! This is the automatic build system of coreboot. The developer "stepan" checked in revision 5884 to the coreboot repository. This caused the following changes: Change Log: drop unneeded earlymtrr.c include Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Build Log: Compilation of kontron:kt690 is still broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5884&device=kt690&vendor=k… If something broke during this checkin please be a pain in stepan's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

10 years, 5 months

[commit] r5885 - in trunk/src: cpu/amd/socket_S1G1 mainboard/amd/dbm690t mainboard/technexion/tim5690 mainboard/technexion/tim8690

by repository service

Author: stepan Date: Thu Sep 30 09:56:12 2010 New Revision: 5885 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5885 Log: fix Kontron KT690 and clean up socket S1G1 boards accordingly. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/cpu/amd/socket_S1G1/Kconfig trunk/src/mainboard/amd/dbm690t/Kconfig trunk/src/mainboard/technexion/tim5690/Kconfig trunk/src/mainboard/technexion/tim8690/Kconfig Modified: trunk/src/cpu/amd/socket_S1G1/Kconfig ============================================================================== --- trunk/src/cpu/amd/socket_S1G1/Kconfig Thu Sep 30 09:45:58 2010 (r5884) +++ trunk/src/cpu/amd/socket_S1G1/Kconfig Thu Sep 30 09:56:12 2010 (r5885) @@ -1,5 +1,10 @@ config CPU_AMD_SOCKET_S1G1 bool + +if CPU_AMD_SOCKET_S1G1 + +config SOCKET_SPECIFIC_OPTIONS + def_bool y select K8_REV_F_SUPPORT select K8_HT_FREQ_1G_SUPPORT select CPU_AMD_MODEL_FXX @@ -7,11 +12,26 @@ config CPU_SOCKET_TYPE hex default 0x12 - depends on CPU_AMD_SOCKET_S1G1 #DDR2 and REG, S1G1 config DIMM_SUPPORT hex default 0x0204 - depends on CPU_AMD_SOCKET_S1G1 +config CPU_ADDR_BITS + int + default 40 + +config DCACHE_RAM_BASE + hex + default 0xc8000 + +config DCACHE_RAM_SIZE + hex + default 0x08000 + +config DCACHE_RAM_GLOBAL_VAR_SIZE + hex + default 0x01000 + +endif Modified: trunk/src/mainboard/amd/dbm690t/Kconfig ============================================================================== --- trunk/src/mainboard/amd/dbm690t/Kconfig Thu Sep 30 09:45:58 2010 (r5884) +++ trunk/src/mainboard/amd/dbm690t/Kconfig Thu Sep 30 09:56:12 2010 (r5885) @@ -25,18 +25,6 @@ string default amd/dbm690t -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0 Modified: trunk/src/mainboard/technexion/tim5690/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/tim5690/Kconfig Thu Sep 30 09:45:58 2010 (r5884) +++ trunk/src/mainboard/technexion/tim5690/Kconfig Thu Sep 30 09:56:12 2010 (r5885) @@ -26,18 +26,6 @@ string default technexion/tim5690 -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0 Modified: trunk/src/mainboard/technexion/tim8690/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/tim8690/Kconfig Thu Sep 30 09:45:58 2010 (r5884) +++ trunk/src/mainboard/technexion/tim8690/Kconfig Thu Sep 30 09:56:12 2010 (r5885) @@ -25,18 +25,6 @@ string default technexion/tim8690 -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0

10 years, 5 months

[commit] r5884 - in trunk/src/mainboard: bcom/winnetp680 jetway/j7f24 via/epia-cn via/epia-m700 via/pc2500e

by repository service

Author: stepan Date: Thu Sep 30 09:45:58 2010 New Revision: 5884 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5884 Log: drop unneeded earlymtrr.c include Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/mainboard/bcom/winnetp680/romstage.c trunk/src/mainboard/jetway/j7f24/romstage.c trunk/src/mainboard/via/epia-cn/romstage.c trunk/src/mainboard/via/epia-m700/romstage.c trunk/src/mainboard/via/pc2500e/romstage.c Modified: trunk/src/mainboard/bcom/winnetp680/romstage.c ============================================================================== --- trunk/src/mainboard/bcom/winnetp680/romstage.c Thu Sep 30 05:35:00 2010 (r5883) +++ trunk/src/mainboard/bcom/winnetp680/romstage.c Thu Sep 30 09:45:58 2010 (r5884) @@ -29,7 +29,6 @@ #include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" -#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" #include "pc80/udelay_io.c" #include "lib/delay.c" Modified: trunk/src/mainboard/jetway/j7f24/romstage.c ============================================================================== --- trunk/src/mainboard/jetway/j7f24/romstage.c Thu Sep 30 05:35:00 2010 (r5883) +++ trunk/src/mainboard/jetway/j7f24/romstage.c Thu Sep 30 09:45:58 2010 (r5884) @@ -29,7 +29,6 @@ #include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" -#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" #include "pc80/udelay_io.c" #include "lib/delay.c" Modified: trunk/src/mainboard/via/epia-cn/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-cn/romstage.c Thu Sep 30 05:35:00 2010 (r5883) +++ trunk/src/mainboard/via/epia-cn/romstage.c Thu Sep 30 09:45:58 2010 (r5884) @@ -29,7 +29,6 @@ #include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" -#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" #include "pc80/udelay_io.c" #include "lib/delay.c" Modified: trunk/src/mainboard/via/epia-m700/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia-m700/romstage.c Thu Sep 30 05:35:00 2010 (r5883) +++ trunk/src/mainboard/via/epia-m700/romstage.c Thu Sep 30 09:45:58 2010 (r5884) @@ -36,7 +36,6 @@ #include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/vx800/vx800.h" -#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" #include "pc80/udelay_io.c" #include "lib/delay.c" Modified: trunk/src/mainboard/via/pc2500e/romstage.c ============================================================================== --- trunk/src/mainboard/via/pc2500e/romstage.c Thu Sep 30 05:35:00 2010 (r5883) +++ trunk/src/mainboard/via/pc2500e/romstage.c Thu Sep 30 09:45:58 2010 (r5884) @@ -29,7 +29,6 @@ #include <console/console.h> #include "lib/ramtest.c" #include "northbridge/via/cn700/raminit.h" -#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" #include "pc80/udelay_io.c" #include "lib/delay.c"

10 years, 5 months

build service results for r5883

by repository service

Dear coreboot readers! This is the automatic build system of coreboot. The developer "wt" checked in revision 5883 to the coreboot repository. This caused the following changes: Change Log: Move CAR settings to board config for socket 940 boards. For the a number of the socket 940 based machines, I collapsed their CAR configurations into the socket config. However, I have kept a number of overrides in place for the following machines: * broadcom/blast * ibm/e32{5,6} * newisys/khepri * sunw/ultra40 * tyan/s488{0,2} These machines used different setting than the defaults for socket 940 systems. Signed-off-by: Warren Turkal <wt(a)penguintechs.org> Acked-by: Peter Stuge <peter(a)stuge.se> Build Log: Compilation of kontron:kt690 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5883&device=kt690&vendor=k… If something broke during this checkin please be a pain in wt's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

10 years, 5 months

[commit] r5883 - in trunk/src: cpu/amd/model_fxx cpu/amd/socket_940 mainboard/arima/hdama mainboard/broadcom/blast mainboard/ibm/e325 mainboard/ibm/e326 mainboard/iwill/dk8_htx mainboard/iwill/dk8s...

by repository service

Author: wt Date: Thu Sep 30 05:35:00 2010 New Revision: 5883 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5883 Log: Move CAR settings to board config for socket 940 boards. For the a number of the socket 940 based machines, I collapsed their CAR configurations into the socket config. However, I have kept a number of overrides in place for the following machines: * broadcom/blast * ibm/e32{5,6} * newisys/khepri * sunw/ultra40 * tyan/s488{0,2} These machines used different setting than the defaults for socket 940 systems. Signed-off-by: Warren Turkal <wt(a)penguintechs.org> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/src/cpu/amd/model_fxx/Kconfig trunk/src/cpu/amd/socket_940/Kconfig trunk/src/mainboard/arima/hdama/Kconfig trunk/src/mainboard/broadcom/blast/Kconfig trunk/src/mainboard/ibm/e325/Kconfig trunk/src/mainboard/ibm/e326/Kconfig trunk/src/mainboard/iwill/dk8_htx/Kconfig trunk/src/mainboard/iwill/dk8s2/Kconfig trunk/src/mainboard/iwill/dk8x/Kconfig trunk/src/mainboard/newisys/khepri/Kconfig trunk/src/mainboard/sunw/ultra40/Kconfig trunk/src/mainboard/tyan/s4880/Kconfig trunk/src/mainboard/tyan/s4882/Kconfig Modified: trunk/src/cpu/amd/model_fxx/Kconfig ============================================================================== --- trunk/src/cpu/amd/model_fxx/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/cpu/amd/model_fxx/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -1,31 +1,9 @@ config CPU_AMD_MODEL_FXX bool - select CACHE_AS_RAM select MMX select SSE select SSE2 -config CPU_ADDR_BITS - int - default 40 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_BASE - hex - default 0xc8000 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_SIZE - hex - default 0x08000 - depends on CPU_AMD_MODEL_FXX - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - depends on CPU_AMD_MODEL_FXX - - config UDELAY_IO bool default n Modified: trunk/src/cpu/amd/socket_940/Kconfig ============================================================================== --- trunk/src/cpu/amd/socket_940/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/cpu/amd/socket_940/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -1,14 +1,36 @@ config CPU_AMD_SOCKET_940 bool + +if CPU_AMD_SOCKET_940 + +config SOCKET_SPECIFIC_OPTIONS + def_bool y select K8_HT_FREQ_1G_SUPPORT select CPU_AMD_MODEL_FXX + select CACHE_AS_RAM config CPU_SOCKET_TYPE hex default 0x0 - depends on CPU_AMD_SOCKET_940 config DIMM_SUPPORT hex default 0x108 - depends on CPU_AMD_SOCKET_940 + +config CPU_ADDR_BITS + int + default 40 + +config DCACHE_RAM_BASE + hex + default 0xc8000 + +config DCACHE_RAM_SIZE + hex + default 0x08000 + +config DCACHE_RAM_GLOBAL_VAR_SIZE + hex + default 0x01000 + +endif # CPU_AMD_SOCKET_940 Modified: trunk/src/mainboard/arima/hdama/Kconfig ============================================================================== --- trunk/src/mainboard/arima/hdama/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/arima/hdama/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select BOARD_ROMSIZE_KB_512 Modified: trunk/src/mainboard/broadcom/blast/Kconfig ============================================================================== --- trunk/src/mainboard/broadcom/blast/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/broadcom/blast/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -13,7 +13,6 @@ select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY Modified: trunk/src/mainboard/ibm/e325/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/e325/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/ibm/e325/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT Modified: trunk/src/mainboard/ibm/e326/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/e326/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/ibm/e326/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT Modified: trunk/src/mainboard/iwill/dk8_htx/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/iwill/dk8_htx/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -14,7 +14,6 @@ select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID select SB_HT_CHAIN_UNITID_OFFSET_ONLY @@ -26,18 +25,6 @@ string default iwill/dk8_htx -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x10 Modified: trunk/src/mainboard/iwill/dk8s2/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/iwill/dk8s2/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_PIRQ_TABLE select HAVE_OPTION_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT @@ -23,18 +22,6 @@ string default iwill/dk8s2 -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0 Modified: trunk/src/mainboard/iwill/dk8x/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8x/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/iwill/dk8x/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT @@ -22,18 +21,6 @@ string default iwill/dk8x -config DCACHE_RAM_BASE - hex - default 0xc8000 - -config DCACHE_RAM_SIZE - hex - default 0x08000 - -config DCACHE_RAM_GLOBAL_VAR_SIZE - hex - default 0x01000 - config APIC_ID_OFFSET hex default 0x0 Modified: trunk/src/mainboard/newisys/khepri/Kconfig ============================================================================== --- trunk/src/mainboard/newisys/khepri/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/newisys/khepri/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY Modified: trunk/src/mainboard/sunw/ultra40/Kconfig ============================================================================== --- trunk/src/mainboard/sunw/ultra40/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/sunw/ultra40/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_BUS_CONFIG select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_1024 Modified: trunk/src/mainboard/tyan/s4880/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s4880/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/tyan/s4880/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY Modified: trunk/src/mainboard/tyan/s4882/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s4882/Kconfig Thu Sep 30 05:13:21 2010 (r5882) +++ trunk/src/mainboard/tyan/s4882/Kconfig Thu Sep 30 05:35:00 2010 (r5883) @@ -12,7 +12,6 @@ select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select HAVE_MP_TABLE - select CACHE_AS_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 select SB_HT_CHAIN_UNITID_OFFSET_ONLY

10 years, 5 months

Jump to page:

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot September 2010