diff -u src/southbridge/via/vt8237r/Makefile.inc src/southbridge/via/vt8237r/Makefile.inc --- src/southbridge/via/vt8237r/Makefile.inc (Arbeitskopie) +++ src/southbridge/via/vt8237r/Makefile.inc (Arbeitskopie) @@ -20,8 +20,8 @@ -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 -ramstage-$(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 diff -u src/southbridge/amd/cs5535/Makefile.inc src/southbridge/amd/cs5535/Makefile.inc --- src/southbridge/amd/cs5535/Makefile.inc (Arbeitskopie) +++ src/southbridge/amd/cs5535/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -driver-y += cs5535.o -#driver-y += cs5535_pci.o -#driver-y += cs5535_ide.o -ramstage-y += chipsetinit.o +driver-y += cs5535.c +#driver-y += cs5535_pci.c +#driver-y += cs5535_ide.c +ramstage-y += chipsetinit.c diff -u src/southbridge/amd/sb600/Makefile.inc src/southbridge/amd/sb600/Makefile.inc --- src/southbridge/amd/sb600/Makefile.inc (Arbeitskopie) +++ src/southbridge/amd/sb600/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-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 diff -u src/southbridge/amd/sb700/Makefile.inc src/southbridge/amd/sb700/Makefile.inc --- src/southbridge/amd/sb700/Makefile.inc (Arbeitskopie) +++ src/southbridge/amd/sb700/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-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 diff -u src/southbridge/amd/amd8111/Makefile.inc src/southbridge/amd/amd8111/Makefile.inc --- src/southbridge/amd/amd8111/Makefile.inc (Arbeitskopie) +++ src/southbridge/amd/amd8111/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-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 diff -u src/southbridge/broadcom/bcm5785/Makefile.inc src/southbridge/broadcom/bcm5785/Makefile.inc --- src/southbridge/broadcom/bcm5785/Makefile.inc (Arbeitskopie) +++ src/southbridge/broadcom/bcm5785/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-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 diff -u src/southbridge/nvidia/ck804/Makefile.inc src/southbridge/nvidia/ck804/Makefile.inc --- src/southbridge/nvidia/ck804/Makefile.inc (Arbeitskopie) +++ src/southbridge/nvidia/ck804/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-y += ck804_reset.o +ramstage-y += ck804_reset.c -ramstage-$(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 diff -u src/southbridge/nvidia/mcp55/Makefile.inc src/southbridge/nvidia/mcp55/Makefile.inc --- src/southbridge/nvidia/mcp55/Makefile.inc (Arbeitskopie) +++ src/southbridge/nvidia/mcp55/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-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 diff -u src/southbridge/intel/i82371eb/Makefile.inc src/southbridge/intel/i82371eb/Makefile.inc --- src/southbridge/intel/i82371eb/Makefile.inc (Arbeitskopie) +++ src/southbridge/intel/i82371eb/Makefile.inc (Arbeitskopie) @@ -21,8 +21,8 @@ -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 -#romstage-y += i82371eb_early_rom.o +#romstage-y += i82371eb_early_rom.c diff -u src/southbridge/intel/i82801ax/Makefile.inc src/southbridge/intel/i82801ax/Makefile.inc --- src/southbridge/intel/i82801ax/Makefile.inc (Arbeitskopie) +++ src/southbridge/intel/i82801ax/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-y += i82801ax_reset.o -ramstage-y += i82801ax_watchdog.o +ramstage-y += i82801ax_reset.c +ramstage-y += i82801ax_watchdog.c # TODO: Fix and enable i82801ax_smbus.o later. diff -u src/southbridge/intel/i82801bx/Makefile.inc src/southbridge/intel/i82801bx/Makefile.inc --- src/southbridge/intel/i82801bx/Makefile.inc (Arbeitskopie) +++ src/southbridge/intel/i82801bx/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-y += i82801bx_reset.o -ramstage-y += i82801bx_watchdog.o +ramstage-y += i82801bx_reset.c +ramstage-y += i82801bx_watchdog.c # TODO: Fix and enable i82801bx_smbus.o later. diff -u src/southbridge/intel/i82801cx/Makefile.inc src/southbridge/intel/i82801cx/Makefile.inc --- src/southbridge/intel/i82801cx/Makefile.inc (Arbeitskopie) +++ src/southbridge/intel/i82801cx/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-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 diff -u src/southbridge/intel/i82801dx/Makefile.inc src/southbridge/intel/i82801dx/Makefile.inc --- src/southbridge/intel/i82801dx/Makefile.inc (Arbeitskopie) +++ src/southbridge/intel/i82801dx/Makefile.inc (Arbeitskopie) @@ -22,12 +22,12 @@ -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 -ramstage-y += i82801dx_reset.o -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smi.o +ramstage-y += i82801dx_reset.c +ramstage-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smi.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smihandler.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += i82801dx_smihandler.c diff -u src/southbridge/intel/i82801ex/Makefile.inc src/southbridge/intel/i82801ex/Makefile.inc --- src/southbridge/intel/i82801ex/Makefile.inc (Arbeitskopie) +++ src/southbridge/intel/i82801ex/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-y += i82801ex_watchdog.o -ramstage-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 diff -u src/southbridge/intel/i82801gx/Makefile.inc src/southbridge/intel/i82801gx/Makefile.inc --- src/southbridge/intel/i82801gx/Makefile.inc (Arbeitskopie) +++ src/southbridge/intel/i82801gx/Makefile.inc (Arbeitskopie) @@ -20,18 +20,18 @@ -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 -ramstage-y += i82801gx_reset.o -ramstage-y += i82801gx_watchdog.o +ramstage-y += i82801gx_reset.c +ramstage-y += i82801gx_watchdog.c -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smi.o -smm-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smihandler.o +ramstage-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smi.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += i82801gx_smihandler.c diff -u src/southbridge/intel/i3100/Makefile.inc src/southbridge/intel/i3100/Makefile.inc --- src/southbridge/intel/i3100/Makefile.inc (Arbeitskopie) +++ src/southbridge/intel/i3100/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-y += i3100_reset.o -ramstage-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 diff -u src/southbridge/sis/sis966/Makefile.inc src/southbridge/sis/sis966/Makefile.inc --- src/southbridge/sis/sis966/Makefile.inc (Arbeitskopie) +++ src/southbridge/sis/sis966/Makefile.inc (Arbeitskopie) @@ -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 -ramstage-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 diff -u src/devices/Makefile.inc src/devices/Makefile.inc --- src/devices/Makefile.inc (Arbeitskopie) +++ src/devices/Makefile.inc (Arbeitskopie) @@ -1,21 +1,21 @@ -ramstage-y += device.o -ramstage-y += root_device.o -ramstage-y += device_util.o -ramstage-y += pci_device.o -ramstage-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.o -ramstage-y += pcix_device.o -ramstage-y += pciexp_device.o -ramstage-y += agp_device.o -ramstage-y += cardbus_device.o -ramstage-y += pnp_device.o -ramstage-y += pci_ops.o -ramstage-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) -ramstage-y += pci_rom.o +ramstage-y += pci_rom.c else -ramstage-$(CONFIG_VGA_ROM_RUN) += pci_rom.o +ramstage-$(CONFIG_VGA_ROM_RUN) += pci_rom.c endif diff -u src/devices/oprom/Makefile.inc src/devices/oprom/Makefile.inc --- src/devices/oprom/Makefile.inc (Arbeitskopie) +++ src/devices/oprom/Makefile.inc (Arbeitskopie) @@ -17,9 +17,9 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.o -ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.o -ramstage-$(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 diff -u src/devices/oprom/x86emu/Makefile.inc src/devices/oprom/x86emu/Makefile.inc --- src/devices/oprom/x86emu/Makefile.inc (Arbeitskopie) +++ src/devices/oprom/x86emu/Makefile.inc (Arbeitskopie) @@ -1,7 +1,7 @@ -ramstage-y += debug.o -ramstage-y += decode.o -ramstage-y += fpu.o -ramstage-y += ops.o -ramstage-y += ops2.o -ramstage-y += prim_ops.o -ramstage-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 diff -u src/devices/oprom/yabel/compat/Makefile.inc src/devices/oprom/yabel/compat/Makefile.inc --- src/devices/oprom/yabel/compat/Makefile.inc (Arbeitskopie) +++ src/devices/oprom/yabel/compat/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += functions.o +ramstage-y += functions.c diff -u src/devices/oprom/yabel/Makefile.inc src/devices/oprom/yabel/Makefile.inc --- src/devices/oprom/yabel/Makefile.inc (Arbeitskopie) +++ src/devices/oprom/yabel/Makefile.inc (Arbeitskopie) @@ -1,9 +1,9 @@ -ramstage-y += biosemu.o -ramstage-y += debug.o -ramstage-y += device.o -ramstage-y += interrupt.o -ramstage-y += io.o -ramstage-y += mem.o -ramstage-y += pmm.o -ramstage-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 diff -u src/superio/via/vt1211/Makefile.inc src/superio/via/vt1211/Makefile.inc --- src/superio/via/vt1211/Makefile.inc (Arbeitskopie) +++ src/superio/via/vt1211/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_VIA_VT1211) += vt1211.o +ramstage-$(CONFIG_SUPERIO_VIA_VT1211) += vt1211.c diff -u src/superio/fintek/f71805f/Makefile.inc src/superio/fintek/f71805f/Makefile.inc --- src/superio/fintek/f71805f/Makefile.inc (Arbeitskopie) +++ src/superio/fintek/f71805f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_FINTEK_F71805F) += superio.o +ramstage-$(CONFIG_SUPERIO_FINTEK_F71805F) += superio.c diff -u src/superio/fintek/f71859/Makefile.inc src/superio/fintek/f71859/Makefile.inc --- src/superio/fintek/f71859/Makefile.inc (Arbeitskopie) +++ src/superio/fintek/f71859/Makefile.inc (Arbeitskopie) @@ -20 +20 @@ -ramstage-$(CONFIG_SUPERIO_FINTEK_F71859) += superio.o +ramstage-$(CONFIG_SUPERIO_FINTEK_F71859) += superio.c diff -u src/superio/fintek/f71863fg/Makefile.inc src/superio/fintek/f71863fg/Makefile.inc --- src/superio/fintek/f71863fg/Makefile.inc (Arbeitskopie) +++ src/superio/fintek/f71863fg/Makefile.inc (Arbeitskopie) @@ -20,3 +20,3 @@ -ramstage-$(CONFIG_SUPERIO_FINTEK_F71863FG) += superio.o +ramstage-$(CONFIG_SUPERIO_FINTEK_F71863FG) += superio.c diff -u src/superio/renesas/m3885x/Makefile.inc src/superio/renesas/m3885x/Makefile.inc --- src/superio/renesas/m3885x/Makefile.inc (Arbeitskopie) +++ src/superio/renesas/m3885x/Makefile.inc (Arbeitskopie) @@ -20 +20 @@ -ramstage-$(CONFIG_SUPERIO_RENESAS_M3885X) += superio.o +ramstage-$(CONFIG_SUPERIO_RENESAS_M3885X) += superio.c diff -u src/superio/winbond/w83627thf/Makefile.inc src/superio/winbond/w83627thf/Makefile.inc --- src/superio/winbond/w83627thf/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83627thf/Makefile.inc (Arbeitskopie) @@ -24 +24 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83627THF) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627THF) += superio.c diff -u src/superio/winbond/w83977tf/Makefile.inc src/superio/winbond/w83977tf/Makefile.inc --- src/superio/winbond/w83977tf/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83977tf/Makefile.inc (Arbeitskopie) @@ -24 +24 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83977TF) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83977TF) += superio.c diff -u src/superio/winbond/w83627dhg/Makefile.inc src/superio/winbond/w83627dhg/Makefile.inc --- src/superio/winbond/w83627dhg/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83627dhg/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += superio.c diff -u src/superio/winbond/w83627thg/Makefile.inc src/superio/winbond/w83627thg/Makefile.inc --- src/superio/winbond/w83627thg/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83627thg/Makefile.inc (Arbeitskopie) @@ -24 +24 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83627THG) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627THG) += superio.c diff -u src/superio/winbond/w83627ehg/Makefile.inc src/superio/winbond/w83627ehg/Makefile.inc --- src/superio/winbond/w83627ehg/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83627ehg/Makefile.inc (Arbeitskopie) @@ -23 +23 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.c diff -u src/superio/winbond/w83627uhg/Makefile.inc src/superio/winbond/w83627uhg/Makefile.inc --- src/superio/winbond/w83627uhg/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83627uhg/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83627UHG) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627UHG) += superio.c diff -u src/superio/winbond/w83697hf/Makefile.inc src/superio/winbond/w83697hf/Makefile.inc --- src/superio/winbond/w83697hf/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83697hf/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.c diff -u src/superio/winbond/w83627hf/Makefile.inc src/superio/winbond/w83627hf/Makefile.inc --- src/superio/winbond/w83627hf/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83627hf/Makefile.inc (Arbeitskopie) @@ -24 +24 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83627HF) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83627HF) += superio.c diff -u src/superio/winbond/w83977f/Makefile.inc src/superio/winbond/w83977f/Makefile.inc --- src/superio/winbond/w83977f/Makefile.inc (Arbeitskopie) +++ src/superio/winbond/w83977f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_WINBOND_W83977F) += superio.o +ramstage-$(CONFIG_SUPERIO_WINBOND_W83977F) += superio.c diff -u src/superio/ite/it8712f/Makefile.inc src/superio/ite/it8712f/Makefile.inc --- src/superio/ite/it8712f/Makefile.inc (Arbeitskopie) +++ src/superio/ite/it8712f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_ITE_IT8712F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8712F) += superio.c diff -u src/superio/ite/it8705f/Makefile.inc src/superio/ite/it8705f/Makefile.inc --- src/superio/ite/it8705f/Makefile.inc (Arbeitskopie) +++ src/superio/ite/it8705f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_ITE_IT8705F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8705F) += superio.c diff -u src/superio/ite/it8661f/Makefile.inc src/superio/ite/it8661f/Makefile.inc --- src/superio/ite/it8661f/Makefile.inc (Arbeitskopie) +++ src/superio/ite/it8661f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_ITE_IT8661F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8661F) += superio.c diff -u src/superio/ite/it8671f/Makefile.inc src/superio/ite/it8671f/Makefile.inc --- src/superio/ite/it8671f/Makefile.inc (Arbeitskopie) +++ src/superio/ite/it8671f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_ITE_IT8671F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8671F) += superio.c diff -u src/superio/ite/it8716f/Makefile.inc src/superio/ite/it8716f/Makefile.inc --- src/superio/ite/it8716f/Makefile.inc (Arbeitskopie) +++ src/superio/ite/it8716f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_ITE_IT8716F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8716F) += superio.c diff -u src/superio/ite/it8673f/Makefile.inc src/superio/ite/it8673f/Makefile.inc --- src/superio/ite/it8673f/Makefile.inc (Arbeitskopie) +++ src/superio/ite/it8673f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_ITE_IT8673F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8673F) += superio.c diff -u src/superio/ite/it8718f/Makefile.inc src/superio/ite/it8718f/Makefile.inc --- src/superio/ite/it8718f/Makefile.inc (Arbeitskopie) +++ src/superio/ite/it8718f/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_ITE_IT8718F) += superio.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8718F) += superio.c diff -u src/superio/nsc/pc87366/Makefile.inc src/superio/nsc/pc87366/Makefile.inc --- src/superio/nsc/pc87366/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc87366/Makefile.inc (Arbeitskopie) @@ -23 +23 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC87366) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87366) += superio.c diff -u src/superio/nsc/pc8374/Makefile.inc src/superio/nsc/pc8374/Makefile.inc --- src/superio/nsc/pc8374/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc8374/Makefile.inc (Arbeitskopie) @@ -23 +23 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC8374) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC8374) += superio.c diff -u src/superio/nsc/pc87351/Makefile.inc src/superio/nsc/pc87351/Makefile.inc --- src/superio/nsc/pc87351/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc87351/Makefile.inc (Arbeitskopie) @@ -23 +23 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC87351) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87351) += superio.c diff -u src/superio/nsc/pc87360/Makefile.inc src/superio/nsc/pc87360/Makefile.inc --- src/superio/nsc/pc87360/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc87360/Makefile.inc (Arbeitskopie) @@ -23 +23 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC87360) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87360) += superio.c diff -u src/superio/nsc/pc97307/Makefile.inc src/superio/nsc/pc97307/Makefile.inc --- src/superio/nsc/pc97307/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc97307/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC97307) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC97307) += superio.c diff -u src/superio/nsc/pc87309/Makefile.inc src/superio/nsc/pc87309/Makefile.inc --- src/superio/nsc/pc87309/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc87309/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC87309) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87309) += superio.c diff -u src/superio/nsc/pc87417/Makefile.inc src/superio/nsc/pc87417/Makefile.inc --- src/superio/nsc/pc87417/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc87417/Makefile.inc (Arbeitskopie) @@ -24 +24 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC87417) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87417) += superio.c diff -u src/superio/nsc/pc97317/Makefile.inc src/superio/nsc/pc97317/Makefile.inc --- src/superio/nsc/pc97317/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc97317/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC97317) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC97317) += superio.c diff -u src/superio/nsc/pc87427/Makefile.inc src/superio/nsc/pc87427/Makefile.inc --- src/superio/nsc/pc87427/Makefile.inc (Arbeitskopie) +++ src/superio/nsc/pc87427/Makefile.inc (Arbeitskopie) @@ -23 +23 @@ -ramstage-$(CONFIG_SUPERIO_NSC_PC87427) += superio.o +ramstage-$(CONFIG_SUPERIO_NSC_PC87427) += superio.c diff -u src/superio/smsc/lpc47m10x/Makefile.inc src/superio/smsc/lpc47m10x/Makefile.inc --- src/superio/smsc/lpc47m10x/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/lpc47m10x/Makefile.inc (Arbeitskopie) @@ -26 +26 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += superio.c diff -u src/superio/smsc/fdc37m60x/Makefile.inc src/superio/smsc/fdc37m60x/Makefile.inc --- src/superio/smsc/fdc37m60x/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/fdc37m60x/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_FDC37M60X) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_FDC37M60X) += superio.c diff -u src/superio/smsc/lpc47n217/Makefile.inc src/superio/smsc/lpc47n217/Makefile.inc --- src/superio/smsc/lpc47n217/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/lpc47n217/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.c diff -u src/superio/smsc/lpc47n227/Makefile.inc src/superio/smsc/lpc47n227/Makefile.inc --- src/superio/smsc/lpc47n227/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/lpc47n227/Makefile.inc (Arbeitskopie) @@ -20 +20 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N227) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N227) += superio.c diff -u src/superio/smsc/lpc47m15x/Makefile.inc src/superio/smsc/lpc47m15x/Makefile.inc --- src/superio/smsc/lpc47m15x/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/lpc47m15x/Makefile.inc (Arbeitskopie) @@ -21 +21 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += superio.c diff -u src/superio/smsc/lpc47b272/Makefile.inc src/superio/smsc/lpc47b272/Makefile.inc --- src/superio/smsc/lpc47b272/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/lpc47b272/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_LPC47B272) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47B272) += superio.c diff -u src/superio/smsc/fdc37n972/Makefile.inc src/superio/smsc/fdc37n972/Makefile.inc --- src/superio/smsc/fdc37n972/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/fdc37n972/Makefile.inc (Arbeitskopie) @@ -20 +20 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_FDC37N972) += fdc37n972.o +ramstage-$(CONFIG_SUPERIO_SMSC_FDC37N972) += fdc37n972.c diff -u src/superio/smsc/sio10n268/Makefile.inc src/superio/smsc/sio10n268/Makefile.inc --- src/superio/smsc/sio10n268/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/sio10n268/Makefile.inc (Arbeitskopie) @@ -20 +20 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_SIO10N268) += sio10n268.o +ramstage-$(CONFIG_SUPERIO_SMSC_SIO10N268) += sio10n268.c diff -u src/superio/smsc/smscsuperio/Makefile.inc src/superio/smsc/smscsuperio/Makefile.inc --- src/superio/smsc/smscsuperio/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/smscsuperio/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += superio.c diff -u src/superio/smsc/lpc47b397/Makefile.inc src/superio/smsc/lpc47b397/Makefile.inc --- src/superio/smsc/lpc47b397/Makefile.inc (Arbeitskopie) +++ src/superio/smsc/lpc47b397/Makefile.inc (Arbeitskopie) @@ -24 +24 @@ -ramstage-$(CONFIG_SUPERIO_SMSC_LPC47B397) += superio.o +ramstage-$(CONFIG_SUPERIO_SMSC_LPC47B397) += superio.c diff -u src/superio/intel/i3100/Makefile.inc src/superio/intel/i3100/Makefile.inc --- src/superio/intel/i3100/Makefile.inc (Arbeitskopie) +++ src/superio/intel/i3100/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-$(CONFIG_SUPERIO_INTEL_I3100) += superio.o +ramstage-$(CONFIG_SUPERIO_INTEL_I3100) += superio.c diff -u src/cpu/amd/model_gx2/Makefile.inc src/cpu/amd/model_gx2/Makefile.inc --- src/cpu/amd/model_gx2/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/model_gx2/Makefile.inc (Arbeitskopie) @@ -4,6 +4,6 @@ subdirs-y += ../../x86/smm -driver-y += model_gx2_init.o -ramstage-y += cpubug.o +driver-y += model_gx2_init.c +ramstage-y += cpubug.c cpu_incs += $(src)/cpu/amd/model_gx2/cache_as_ram.inc diff -u src/cpu/amd/socket_S1G1/Makefile.inc src/cpu/amd/socket_S1G1/Makefile.inc --- src/cpu/amd/socket_S1G1/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_S1G1/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_S1G1.o +ramstage-y += socket_S1G1.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff -u src/cpu/amd/mtrr/Makefile.inc src/cpu/amd/mtrr/Makefile.inc --- src/cpu/amd/mtrr/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/mtrr/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += amd_mtrr.o +ramstage-y += amd_mtrr.c diff -u src/cpu/amd/socket_940/Makefile.inc src/cpu/amd/socket_940/Makefile.inc --- src/cpu/amd/socket_940/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_940/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_940.o +ramstage-y += socket_940.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff -u src/cpu/amd/model_fxx/Makefile.inc src/cpu/amd/model_fxx/Makefile.inc --- src/cpu/amd/model_fxx/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/model_fxx/Makefile.inc (Arbeitskopie) @@ -2,5 +2,5 @@ -driver-y += model_fxx_init.o -ramstage-y += apic_timer.o -ramstage-y += model_fxx_update_microcode.o -ramstage-y += processor_name.o -ramstage-y += powernow_acpi.o +driver-y += model_fxx_init.c +ramstage-y += apic_timer.c +ramstage-y += model_fxx_update_microcode.c +ramstage-y += processor_name.c +ramstage-y += powernow_acpi.c diff -u src/cpu/amd/socket_AM2/Makefile.inc src/cpu/amd/socket_AM2/Makefile.inc --- src/cpu/amd/socket_AM2/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_AM2/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_AM2.o +ramstage-y += socket_AM2.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff -u src/cpu/amd/socket_754/Makefile.inc src/cpu/amd/socket_754/Makefile.inc --- src/cpu/amd/socket_754/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_754/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_754.o +ramstage-y += socket_754.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff -u src/cpu/amd/socket_AM3/Makefile.inc src/cpu/amd/socket_AM3/Makefile.inc --- src/cpu/amd/socket_AM3/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_AM3/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_AM3.o +ramstage-y += socket_AM3.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff -u src/cpu/amd/socket_AM2r2/Makefile.inc src/cpu/amd/socket_AM2r2/Makefile.inc --- src/cpu/amd/socket_AM2r2/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_AM2r2/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_AM2r2.o +ramstage-y += socket_AM2r2.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff -u src/cpu/amd/sc520/Makefile.inc src/cpu/amd/sc520/Makefile.inc --- src/cpu/amd/sc520/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/sc520/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += sc520.o +ramstage-y += sc520.c diff -u src/cpu/amd/socket_939/Makefile.inc src/cpu/amd/socket_939/Makefile.inc --- src/cpu/amd/socket_939/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_939/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_939.o +ramstage-y += socket_939.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff -u src/cpu/amd/socket_F/Makefile.inc src/cpu/amd/socket_F/Makefile.inc --- src/cpu/amd/socket_F/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_F/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_F.o +ramstage-y += socket_F.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff -u src/cpu/amd/dualcore/Makefile.inc src/cpu/amd/dualcore/Makefile.inc --- src/cpu/amd/dualcore/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/dualcore/Makefile.inc (Arbeitskopie) @@ -2 +2 @@ -ramstage-y += amd_sibling.o +ramstage-y += amd_sibling.c diff -u src/cpu/amd/socket_ASB2/Makefile.inc src/cpu/amd/socket_ASB2/Makefile.inc --- src/cpu/amd/socket_ASB2/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_ASB2/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_ASB2.o +ramstage-y += socket_ASB2.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff -u src/cpu/amd/quadcore/Makefile.inc src/cpu/amd/quadcore/Makefile.inc --- src/cpu/amd/quadcore/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/quadcore/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += amd_sibling.o +ramstage-y += amd_sibling.c diff -u src/cpu/amd/model_lx/Makefile.inc src/cpu/amd/model_lx/Makefile.inc --- src/cpu/amd/model_lx/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/model_lx/Makefile.inc (Arbeitskopie) @@ -4,6 +4,6 @@ subdirs-y += ../../x86/smm -driver-y += model_lx_init.o -ramstage-y += cpubug.o +driver-y += model_lx_init.c +ramstage-y += cpubug.c cpu_incs += $(src)/cpu/amd/model_lx/cache_as_ram.inc diff -u src/cpu/amd/microcode/Makefile.inc src/cpu/amd/microcode/Makefile.inc --- src/cpu/amd/microcode/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/microcode/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += microcode.o +ramstage-y += microcode.c diff -u src/cpu/amd/socket_F_1207/Makefile.inc src/cpu/amd/socket_F_1207/Makefile.inc --- src/cpu/amd/socket_F_1207/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/socket_F_1207/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_F_1207.o +ramstage-y += socket_F_1207.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff -u src/cpu/amd/model_10xxx/Makefile.inc src/cpu/amd/model_10xxx/Makefile.inc --- src/cpu/amd/model_10xxx/Makefile.inc (Arbeitskopie) +++ src/cpu/amd/model_10xxx/Makefile.inc (Arbeitskopie) @@ -2,4 +2,4 @@ -driver-y += model_10xxx_init.o -ramstage-y += update_microcode.o -ramstage-y += apic_timer.o -ramstage-y += processor_name.o +driver-y += model_10xxx_init.c +ramstage-y += update_microcode.c +ramstage-y += apic_timer.c +ramstage-y += processor_name.c diff -u src/cpu/x86/name/Makefile.inc src/cpu/x86/name/Makefile.inc --- src/cpu/x86/name/Makefile.inc (Arbeitskopie) +++ src/cpu/x86/name/Makefile.inc (Arbeitskopie) @@ -19,3 +19,3 @@ -ramstage-y += name.o +ramstage-y += name.c diff -u src/cpu/x86/cache/Makefile.inc src/cpu/x86/cache/Makefile.inc --- src/cpu/x86/cache/Makefile.inc (Arbeitskopie) +++ src/cpu/x86/cache/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += cache.o +ramstage-y += cache.c diff -u src/cpu/x86/mtrr/Makefile.inc src/cpu/x86/mtrr/Makefile.inc --- src/cpu/x86/mtrr/Makefile.inc (Arbeitskopie) +++ src/cpu/x86/mtrr/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += mtrr.o +ramstage-y += mtrr.c diff -u src/cpu/x86/pae/Makefile.inc src/cpu/x86/pae/Makefile.inc --- src/cpu/x86/pae/Makefile.inc (Arbeitskopie) +++ src/cpu/x86/pae/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += pgtbl.o +ramstage-y += pgtbl.c diff -u src/cpu/x86/lapic/Makefile.inc src/cpu/x86/lapic/Makefile.inc --- src/cpu/x86/lapic/Makefile.inc (Arbeitskopie) +++ src/cpu/x86/lapic/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += lapic.o -ramstage-y += lapic_cpu_init.o -ramstage-y += secondary.o -ramstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.o +ramstage-y += lapic.c +ramstage-y += lapic_cpu_init.c +ramstage-y += secondary.S +ramstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.c diff -u src/cpu/x86/tsc/Makefile.inc src/cpu/x86/tsc/Makefile.inc --- src/cpu/x86/tsc/Makefile.inc (Arbeitskopie) +++ src/cpu/x86/tsc/Makefile.inc (Arbeitskopie) @@ -1,2 +1,2 @@ -ramstage-$(CONFIG_UDELAY_TSC) += delay_tsc.o +ramstage-$(CONFIG_UDELAY_TSC) += delay_tsc.c diff -u src/cpu/x86/smm/Makefile.inc src/cpu/x86/smm/Makefile.inc --- src/cpu/x86/smm/Makefile.inc (Arbeitskopie) +++ src/cpu/x86/smm/Makefile.inc (Arbeitskopie) @@ -17,24 +17,26 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.o -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smm_wrap.o - -smm-y += smmhandler.o -smm-y += smihandler.o -smm-y += smiutil.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 $(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.ramstage.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.ramstage.o diff -u src/cpu/intel/socket_441/Makefile.inc src/cpu/intel/socket_441/Makefile.inc --- src/cpu/intel/socket_441/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_441/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_441.o +ramstage-y += socket_441.c subdirs-y += ../model_106cx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff -u src/cpu/intel/ep80579/Makefile.inc src/cpu/intel/ep80579/Makefile.inc --- src/cpu/intel/ep80579/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/ep80579/Makefile.inc (Arbeitskopie) @@ -1,5 +1,5 @@ -ramstage-y += ep80579.o -driver-y += ep80579_init.o +ramstage-y += ep80579.c +driver-y += ep80579_init.c subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic diff -u src/cpu/intel/socket_mFCBGA479/Makefile.inc src/cpu/intel/socket_mFCBGA479/Makefile.inc --- src/cpu/intel/socket_mFCBGA479/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_mFCBGA479/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_mFCBGA479.o +ramstage-y += socket_mFCBGA479.c subdirs-y += ../model_6bx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff -u src/cpu/intel/bga956/Makefile.inc src/cpu/intel/bga956/Makefile.inc --- src/cpu/intel/bga956/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/bga956/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += bga956.o +ramstage-y += bga956.c subdirs-y += ../model_1067x subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff -u src/cpu/intel/socket_mPGA478/Makefile.inc src/cpu/intel/socket_mPGA478/Makefile.inc --- src/cpu/intel/socket_mPGA478/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_mPGA478/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_mPGA478.o +ramstage-y += socket_mPGA478.c subdirs-y += ../model_69x subdirs-y += ../model_6dx subdirs-y += ../../x86/tsc diff -u src/cpu/intel/socket_mFCPGA478/Makefile.inc src/cpu/intel/socket_mFCPGA478/Makefile.inc --- src/cpu/intel/socket_mFCPGA478/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_mFCPGA478/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_mFCPGA478.o +ramstage-y += socket_mFCPGA478.c subdirs-y += ../model_69x subdirs-y += ../model_6dx subdirs-y += ../model_6ex diff -u src/cpu/intel/socket_PGA370/Makefile.inc src/cpu/intel/socket_PGA370/Makefile.inc --- src/cpu/intel/socket_PGA370/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_PGA370/Makefile.inc (Arbeitskopie) @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ramstage-y += socket_PGA370.o +ramstage-y += socket_PGA370.c subdirs-y += ../model_6xx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff -u src/cpu/intel/socket_FC_PGA370/Makefile.inc src/cpu/intel/socket_FC_PGA370/Makefile.inc --- src/cpu/intel/socket_FC_PGA370/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_FC_PGA370/Makefile.inc (Arbeitskopie) @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ramstage-y += socket_FC_PGA370.o +ramstage-y += socket_FC_PGA370.c subdirs-y += ../model_68x subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff -u src/cpu/intel/socket_mPGA603/Makefile.inc src/cpu/intel/socket_mPGA603/Makefile.inc --- src/cpu/intel/socket_mPGA603/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_mPGA603/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_mPGA603_400Mhz.o +ramstage-y += socket_mPGA603_400Mhz.c subdirs-y += ../model_f0x subdirs-y += ../model_f1x subdirs-y += ../model_f2x diff -u src/cpu/intel/socket_mPGA604/Makefile.inc src/cpu/intel/socket_mPGA604/Makefile.inc --- src/cpu/intel/socket_mPGA604/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_mPGA604/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_mPGA604.o +ramstage-y += socket_mPGA604.c subdirs-y += ../model_f2x subdirs-y += ../model_f3x subdirs-y += ../model_f4x diff -u src/cpu/intel/speedstep/Makefile.inc src/cpu/intel/speedstep/Makefile.inc --- src/cpu/intel/speedstep/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/speedstep/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c diff -u src/cpu/intel/slot_1/Makefile.inc src/cpu/intel/slot_1/Makefile.inc --- src/cpu/intel/slot_1/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/slot_1/Makefile.inc (Arbeitskopie) @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ramstage-y += slot_1.o +ramstage-y += slot_1.c subdirs-y += ../model_6xx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff -u src/cpu/intel/slot_2/Makefile.inc src/cpu/intel/slot_2/Makefile.inc --- src/cpu/intel/slot_2/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/slot_2/Makefile.inc (Arbeitskopie) @@ -18,7 +18,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -ramstage-y += slot_2.o +ramstage-y += slot_2.c subdirs-y += ../model_6xx subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr diff -u src/cpu/intel/microcode/Makefile.inc src/cpu/intel/microcode/Makefile.inc --- src/cpu/intel/microcode/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/microcode/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += microcode.o +ramstage-y += microcode.c diff -u src/cpu/intel/hyperthreading/Makefile.inc src/cpu/intel/hyperthreading/Makefile.inc --- src/cpu/intel/hyperthreading/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/hyperthreading/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += intel_sibling.o +ramstage-y += intel_sibling.c diff -u src/cpu/intel/socket_mPGA479M/Makefile.inc src/cpu/intel/socket_mPGA479M/Makefile.inc --- src/cpu/intel/socket_mPGA479M/Makefile.inc (Arbeitskopie) +++ src/cpu/intel/socket_mPGA479M/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -ramstage-y += socket_mPGA479M.o +ramstage-y += socket_mPGA479M.c subdirs-y += ../model_69x subdirs-y += ../model_6dx subdirs-y += ../model_f2x diff -u src/mainboard/getac/p470/Makefile.inc src/mainboard/getac/p470/Makefile.inc --- src/mainboard/getac/p470/Makefile.inc (Arbeitskopie) +++ src/mainboard/getac/p470/Makefile.inc (Arbeitskopie) @@ -20,4 +20,4 @@ -driver-y += rtl8168.o -ramstage-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.o +driver-y += rtl8168.c +ramstage-$(CONFIG_HAVE_ACPI_SLIC) += acpi_slic.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff -u src/mainboard/broadcom/blast/Makefile.inc src/mainboard/broadcom/blast/Makefile.inc --- src/mainboard/broadcom/blast/Makefile.inc (Arbeitskopie) +++ src/mainboard/broadcom/blast/Makefile.inc (Arbeitskopie) @@ -4 +4 @@ -ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c diff -u src/mainboard/thomson/ip1000/Makefile.inc src/mainboard/thomson/ip1000/Makefile.inc --- src/mainboard/thomson/ip1000/Makefile.inc (Arbeitskopie) +++ src/mainboard/thomson/ip1000/Makefile.inc (Arbeitskopie) @@ -1,2 +1,2 @@ -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff -u src/mainboard/supermicro/x6dhe_g/Makefile.inc src/mainboard/supermicro/x6dhe_g/Makefile.inc --- src/mainboard/supermicro/x6dhe_g/Makefile.inc (Arbeitskopie) +++ src/mainboard/supermicro/x6dhe_g/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-y += ../../../drivers/generic/debug/debug_dev.o +ramstage-y += ../../../drivers/generic/debug/debug_dev.c diff -u src/mainboard/supermicro/h8dme/Makefile.inc src/mainboard/supermicro/h8dme/Makefile.inc --- src/mainboard/supermicro/h8dme/Makefile.inc (Arbeitskopie) +++ src/mainboard/supermicro/h8dme/Makefile.inc (Arbeitskopie) @@ -18,5 +18,5 @@ ## -ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c # Needed by irq_tables and mptable and acpi_tables. diff -u src/mainboard/supermicro/x6dhe_g2/Makefile.inc src/mainboard/supermicro/x6dhe_g2/Makefile.inc --- src/mainboard/supermicro/x6dhe_g2/Makefile.inc (Arbeitskopie) +++ src/mainboard/supermicro/x6dhe_g2/Makefile.inc (Arbeitskopie) @@ -22 +22 @@ -ramstage-y += ../../../drivers/generic/debug/debug_dev.o +ramstage-y += ../../../drivers/generic/debug/debug_dev.c diff -u src/mainboard/kontron/986lcd-m/Makefile.inc src/mainboard/kontron/986lcd-m/Makefile.inc --- src/mainboard/kontron/986lcd-m/Makefile.inc (Arbeitskopie) +++ src/mainboard/kontron/986lcd-m/Makefile.inc (Arbeitskopie) @@ -20,3 +20,3 @@ -driver-y += rtl8168.o +driver-y += rtl8168.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff -u src/mainboard/gigabyte/m57sli/Makefile.inc src/mainboard/gigabyte/m57sli/Makefile.inc --- src/mainboard/gigabyte/m57sli/Makefile.inc (Arbeitskopie) +++ src/mainboard/gigabyte/m57sli/Makefile.inc (Arbeitskopie) @@ -20 +20 @@ -ramstage-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.o +ramstage-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.c diff -u src/mainboard/emulation/qemu-x86/Makefile.inc src/mainboard/emulation/qemu-x86/Makefile.inc --- src/mainboard/emulation/qemu-x86/Makefile.inc (Arbeitskopie) +++ src/mainboard/emulation/qemu-x86/Makefile.inc (Arbeitskopie) @@ -3 +3 @@ -ramstage-y += northbridge.o +ramstage-y += northbridge.c diff -u src/mainboard/amd/serengeti_cheetah/Makefile.inc src/mainboard/amd/serengeti_cheetah/Makefile.inc --- src/mainboard/amd/serengeti_cheetah/Makefile.inc (Arbeitskopie) +++ src/mainboard/amd/serengeti_cheetah/Makefile.inc (Arbeitskopie) @@ -20 +20 @@ -ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.o +ramstage-y += ../../../drivers/i2c/i2cmux/i2cmux.c diff -u src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc --- src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc (Arbeitskopie) +++ src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc (Arbeitskopie) @@ -20 +20 @@ -ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c diff -u src/mainboard/rca/rm4100/Makefile.inc src/mainboard/rca/rm4100/Makefile.inc --- src/mainboard/rca/rm4100/Makefile.inc (Arbeitskopie) +++ src/mainboard/rca/rm4100/Makefile.inc (Arbeitskopie) @@ -1,2 +1,2 @@ -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff -u src/mainboard/hp/dl145_g1/Makefile.inc src/mainboard/hp/dl145_g1/Makefile.inc --- src/mainboard/hp/dl145_g1/Makefile.inc (Arbeitskopie) +++ src/mainboard/hp/dl145_g1/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-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 diff -u src/mainboard/tyan/s2881/Makefile.inc src/mainboard/tyan/s2881/Makefile.inc --- src/mainboard/tyan/s2881/Makefile.inc (Arbeitskopie) +++ src/mainboard/tyan/s2881/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += ../../../drivers/i2c/adt7463/adt7463.o +ramstage-y += ../../../drivers/i2c/adt7463/adt7463.c diff -u src/mainboard/tyan/s2892/Makefile.inc src/mainboard/tyan/s2892/Makefile.inc --- src/mainboard/tyan/s2892/Makefile.inc (Arbeitskopie) +++ src/mainboard/tyan/s2892/Makefile.inc (Arbeitskopie) @@ -2 +2 @@ -ramstage-y += ../../../drivers/i2c/adm1027/adm1027.o +ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c diff -u src/mainboard/via/epia-m700/Makefile.inc src/mainboard/via/epia-m700/Makefile.inc --- src/mainboard/via/epia-m700/Makefile.inc (Arbeitskopie) +++ src/mainboard/via/epia-m700/Makefile.inc (Arbeitskopie) @@ -24,3 +24,3 @@ # wakeup.c when you are done. -# ramstage-y += wakeup.o +# ramstage-y += wakeup.c diff -u src/mainboard/ibase/mb899/Makefile.inc src/mainboard/ibase/mb899/Makefile.inc --- src/mainboard/ibase/mb899/Makefile.inc (Arbeitskopie) +++ src/mainboard/ibase/mb899/Makefile.inc (Arbeitskopie) @@ -20,3 +20,3 @@ -ramstage-y += rtl8168.o +ramstage-y += rtl8168.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff -u src/mainboard/roda/rk886ex/Makefile.inc src/mainboard/roda/rk886ex/Makefile.inc --- src/mainboard/roda/rk886ex/Makefile.inc (Arbeitskopie) +++ src/mainboard/roda/rk886ex/Makefile.inc (Arbeitskopie) @@ -20,5 +20,5 @@ -ramstage-y += m3885.o -ramstage-y += ec.o -driver-y += rtl8168.o +ramstage-y += m3885.c +ramstage-y += ec.c +driver-y += rtl8168.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff -u src/mainboard/msi/ms9282/Makefile.inc src/mainboard/msi/ms9282/Makefile.inc --- src/mainboard/msi/ms9282/Makefile.inc (Arbeitskopie) +++ src/mainboard/msi/ms9282/Makefile.inc (Arbeitskopie) @@ -20,4 +20,4 @@ # FIXME drivers should be selected through Kconfig -ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o -ramstage-y += ../../../drivers/i2c/adm1027/adm1027.o +ramstage-y += ../../../drivers/i2c/i2cmux2/i2cmux2.c +ramstage-y += ../../../drivers/i2c/adm1027/adm1027.c diff -u src/mainboard/technexion/tim5690/Makefile.inc src/mainboard/technexion/tim5690/Makefile.inc --- src/mainboard/technexion/tim5690/Makefile.inc (Arbeitskopie) +++ src/mainboard/technexion/tim5690/Makefile.inc (Arbeitskopie) @@ -23,4 +23,4 @@ -ramstage-y += tn_post_code.o +ramstage-y += tn_post_code.c -ramstage-y += speaker.o -ramstage-y += vgabios.o +ramstage-y += speaker.c +ramstage-y += vgabios.c diff -u src/mainboard/intel/d945gclf/Makefile.inc src/mainboard/intel/d945gclf/Makefile.inc --- src/mainboard/intel/d945gclf/Makefile.inc (Arbeitskopie) +++ src/mainboard/intel/d945gclf/Makefile.inc (Arbeitskopie) @@ -20,3 +20,3 @@ -driver-y += rtl8168.o +driver-y += rtl8168.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c diff -u src/console/Makefile.inc src/console/Makefile.inc --- src/console/Makefile.inc (Arbeitskopie) +++ src/console/Makefile.inc (Arbeitskopie) @@ -1,21 +1,21 @@ -ramstage-y += printk.o -ramstage-y += console.o -ramstage-y += vtxprintf.o -ramstage-y += vsprintf.o +ramstage-y += printk.c +ramstage-y += console.c +ramstage-y += vtxprintf.c +ramstage-y += vsprintf.c -smm-y += printk.o -smm-y += vtxprintf.o +smm-y += printk.c +smm-y += vtxprintf.c -romstage-y += vtxprintf.o -romstage-$(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.ramstage.o : $(obj)/build.h $(obj)/console/console.romstage.o : $(obj)/build.h diff -u src/boot/Makefile.inc src/boot/Makefile.inc --- src/boot/Makefile.inc (Arbeitskopie) +++ src/boot/Makefile.inc (Arbeitskopie) @@ -1,2 +1,2 @@ -ramstage-y += hardwaremain.o -ramstage-y += selfboot.o +ramstage-y += hardwaremain.c +ramstage-y += selfboot.c diff -u src/lib/Makefile.inc src/lib/Makefile.inc --- src/lib/Makefile.inc (Arbeitskopie) +++ src/lib/Makefile.inc (Arbeitskopie) @@ -1,37 +1,37 @@ -ramstage-y += clog2.o -ramstage-y += uart8250.o -ramstage-y += memset.o -ramstage-y += memcpy.o -ramstage-y += memcmp.o -ramstage-y += memmove.o -ramstage-y += malloc.o -ramstage-y += delay.o -ramstage-y += fallback_boot.o -ramstage-y += compute_ip_checksum.o -ramstage-y += version.o -ramstage-y += cbfs.o -ramstage-y += lzma.o -#ramstage-y += lzmadecode.o -ramstage-y += gcc.o -ramstage-y += cbmem.o - -romstage-y += uart8250.o -romstage-y += memset.o -romstage-y += memcpy.o -romstage-y += memcmp.o -romstage-y += cbfs.o -romstage-y += lzma.o -#romstage-y += lzmadecode.o -romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.o -romstage-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.o -driver-$(CONFIG_CONSOLE_NE2K) += ne2k.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.o +ramstage-$(CONFIG_USBDEBUG) += usbdebug.c -ramstage-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.o +ramstage-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.c -ramstage-$(CONFIG_BOOTSPLASH) += jpeg.o +ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c -smm-y += memcpy.o +smm-y += memcpy.c $(obj)/lib/version.ramstage.o : $(obj)/build.h diff -u src/northbridge/via/cx700/Makefile.inc src/northbridge/via/cx700/Makefile.inc --- src/northbridge/via/cx700/Makefile.inc (Arbeitskopie) +++ src/northbridge/via/cx700/Makefile.inc (Arbeitskopie) @@ -20,7 +20,7 @@ -ramstage-y += cx700_reset.o -ramstage-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 diff -u src/northbridge/amd/gx2/Makefile.inc src/northbridge/amd/gx2/Makefile.inc --- src/northbridge/amd/gx2/Makefile.inc (Arbeitskopie) +++ src/northbridge/amd/gx2/Makefile.inc (Arbeitskopie) @@ -1,3 +1,3 @@ -driver-y += northbridge.o -ramstage-y += northbridgeinit.o -ramstage-y += grphinit.o +driver-y += northbridge.c +ramstage-y += northbridgeinit.c +ramstage-y += grphinit.c diff -u src/northbridge/amd/lx/Makefile.inc src/northbridge/amd/lx/Makefile.inc --- src/northbridge/amd/lx/Makefile.inc (Arbeitskopie) +++ src/northbridge/amd/lx/Makefile.inc (Arbeitskopie) @@ -1,3 +1,3 @@ -driver-y += northbridge.o -ramstage-y += northbridgeinit.o -ramstage-y += grphinit.o +driver-y += northbridge.c +ramstage-y += northbridgeinit.c +ramstage-y += grphinit.c diff -u src/northbridge/amd/amdk8/Makefile.inc src/northbridge/amd/amdk8/Makefile.inc --- src/northbridge/amd/amdk8/Makefile.inc (Arbeitskopie) +++ src/northbridge/amd/amdk8/Makefile.inc (Arbeitskopie) @@ -1,11 +1,11 @@ -driver-y += northbridge.o -driver-y += misc_control.o -ramstage-y += get_sblk_pci1234.o -ramstage-$(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. -#ramstage-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. diff -u src/northbridge/amd/amdfam10/Makefile.inc src/northbridge/amd/amdfam10/Makefile.inc --- src/northbridge/amd/amdfam10/Makefile.inc (Arbeitskopie) +++ src/northbridge/amd/amdfam10/Makefile.inc (Arbeitskopie) @@ -1,16 +1,16 @@ -driver-y += northbridge.o -driver-y += misc_control.o +driver-y += northbridge.c +driver-y += misc_control.c -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.o -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.o -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.o -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.o -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr3.o -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr4.o -ramstage-$(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 -ramstage-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. -#ramstage-y += util.o +#ramstage-y += util.c diff -u src/northbridge/intel/e7501/Makefile.inc src/northbridge/intel/e7501/Makefile.inc --- src/northbridge/intel/e7501/Makefile.inc (Arbeitskopie) +++ src/northbridge/intel/e7501/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += northbridge.o +ramstage-y += northbridge.c diff -u src/northbridge/intel/i855/Makefile.inc src/northbridge/intel/i855/Makefile.inc --- src/northbridge/intel/i855/Makefile.inc (Arbeitskopie) +++ src/northbridge/intel/i855/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-y += northbridge.o +ramstage-y += northbridge.c diff -u src/northbridge/intel/i945/Makefile.inc src/northbridge/intel/i945/Makefile.inc --- src/northbridge/intel/i945/Makefile.inc (Arbeitskopie) +++ src/northbridge/intel/i945/Makefile.inc (Arbeitskopie) @@ -20,3 +20,3 @@ -driver-y += northbridge.o -driver-y += gma.o -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o +driver-y += northbridge.c +driver-y += gma.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c diff -u src/northbridge/intel/i82830/Makefile.inc src/northbridge/intel/i82830/Makefile.inc --- src/northbridge/intel/i82830/Makefile.inc (Arbeitskopie) +++ src/northbridge/intel/i82830/Makefile.inc (Arbeitskopie) @@ -1,4 +1,4 @@ -driver-y += northbridge.o -driver-y += vga.o +driver-y += northbridge.c +driver-y += vga.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.o +smm-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.c diff -u src/pc80/Makefile.inc src/pc80/Makefile.inc --- src/pc80/Makefile.inc (Arbeitskopie) +++ src/pc80/Makefile.inc (Arbeitskopie) @@ -1,11 +1,11 @@ -ramstage-y += mc146818rtc.o -ramstage-y += isa-dma.o -ramstage-y += i8259.o -ramstage-$(CONFIG_UDELAY_IO) += udelay_io.o -ramstage-y += keyboard.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.o -romstage-$(CONFIG_CACHE_AS_RAM) += serial.o +romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c +romstage-$(CONFIG_CACHE_AS_RAM) += serial.c subdirs-y += vga $(obj)/pc80/mc146818rtc.ramstage.o : $(OPTION_TABLE_H) diff -u src/pc80/vga/Makefile.inc src/pc80/vga/Makefile.inc --- src/pc80/vga/Makefile.inc (Arbeitskopie) +++ src/pc80/vga/Makefile.inc (Arbeitskopie) @@ -1,2 +1,2 @@ -ramstage-y += vga_io.o -ramstage-$(CONFIG_VGA) += vga.o +ramstage-y += vga_io.c +ramstage-$(CONFIG_VGA) += vga.c diff -u src/arch/i386/boot/Makefile.inc src/arch/i386/boot/Makefile.inc --- src/arch/i386/boot/Makefile.inc (Arbeitskopie) +++ src/arch/i386/boot/Makefile.inc (Arbeitskopie) @@ -1,13 +1,13 @@ -ramstage-y += boot.o -ramstage-y += coreboot_table.o -ramstage-$(CONFIG_MULTIBOOT) += multiboot.o -ramstage-y += gdt.o -ramstage-y += tables.o -ramstage-$(CONFIG_GENERATE_MP_TABLE) += mpspec.o -ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += pirq_routing.o -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o -ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.o -ramstage-$(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.ramstage.o : $(OPTION_TABLE_H) diff -u src/arch/i386/Makefile.inc src/arch/i386/Makefile.inc --- src/arch/i386/Makefile.inc (Arbeitskopie) +++ src/arch/i386/Makefile.inc (Arbeitskopie) @@ -25,7 +25,11 @@ subdirs-y += lib subdirs-y += smp -ramstage-$(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" @@ -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 -romstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o -ramstage-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) -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/mptable.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/mptable.c endif ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y) -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/irq_tables.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/irq_tables.c endif ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y) -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/reset.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/reset.c endif ifeq ($(CONFIG_GENERATE_ACPI_TABLES),y) -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/acpi_tables.o -ramstage-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) -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.o -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.o -ramstage-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) -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/ssdt5.asl endif ifeq ($(CONFIG_BOARD_HAS_FADT),y) -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/fadt.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c endif endif ifeq ($(CONFIG_HAVE_BUS_CONFIG),y) -ramstage-objs += $(obj)/mainboard/$(MAINBOARDDIR)/get_bus_conf.o +ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c endif ifeq ($(CONFIG_TINY_BOOTBLOCK),y) diff -u src/arch/i386/lib/Makefile.inc src/arch/i386/lib/Makefile.inc --- src/arch/i386/lib/Makefile.inc (Arbeitskopie) +++ src/arch/i386/lib/Makefile.inc (Arbeitskopie) @@ -1,13 +1,13 @@ -ramstage-y += c_start.o -ramstage-y += cpu.o -ramstage-y += pci_ops_conf1.o -ramstage-y += pci_ops_conf2.o -ramstage-y += pci_ops_mmconf.o -ramstage-y += pci_ops_auto.o -ramstage-y += exception.o -ramstage-$(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 -romstage-y += printk_init.o -romstage-y += cbfs_and_run.o +romstage-y += printk_init.c +romstage-y += cbfs_and_run.c $(obj)/arch/i386/lib/console.ramstage.o :: $(obj)/build.h diff -u src/drivers/generic/debug/Makefile.inc src/drivers/generic/debug/Makefile.inc --- src/drivers/generic/debug/Makefile.inc (Arbeitskopie) +++ src/drivers/generic/debug/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -ramstage-$(CONFIG_DRIVERS_GENERIC_DEBUG) += debug_dev.o +ramstage-$(CONFIG_DRIVERS_GENERIC_DEBUG) += debug_dev.c diff -u Makefile Makefile --- Makefile (Arbeitskopie) +++ Makefile (Arbeitskopie) @@ -177,28 +177,31 @@ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD $(CFLAGS) -c -o $@ $< -ramstage-objs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.o +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)-objs+= \ + $(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,18 +214,19 @@ subdirs:=$(PLATFORM-y) $(BUILD-y) $(eval $(call evaluate_subdirs)) -ramstage-objs:=$(addsuffix .ramstage.o, $(basename $(ramstage-objs))) -romstage-objs:=$(addsuffix .romstage.o, $(basename $(romstage-objs))) -driver-objs:=$(addsuffix .driver.o, $(basename $(driver-objs))) -smm-objs:=$(addsuffix .smm.o, $(basename $(smm-objs))) +src-to-obj=$(addsuffix .$(1).o, $(basename $(patsubst src/%, $(obj)/%, $($(1)-srcs)))) + +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 ramstage-objs_asl_template -$(obj)/$(1)%.ramstage.o: src/$(1)%.asl +$(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 $$@).asl iasl -p $$(obj)/$(1) -tc $$(basename $$@).asl @@ -238,7 +242,7 @@ # $2 source suffix (c, S) # $3 additional compiler flags de$(EMPTY)fine $(1)-objs_$(2)_template -$(obj)/$$(1)%.$(1).o: src/$$(1)%.$(2) $(obj)/config.h +$(obj)/$$(1).$(1).o: src/$$(1).$(2) $(obj)/config.h @printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" $(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< en$(EMPTY)def @@ -253,16 +257,8 @@ $(eval $(call create_cc_template,smm,c)) $(eval $(call create_cc_template,smm,S)) -usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d))))) -$(eval $(call usetemplate,ramstage-objs,asl)) -$(eval $(call usetemplate,ramstage-objs,c)) -$(eval $(call usetemplate,ramstage-objs,S)) -$(eval $(call usetemplate,romstage-objs,c)) -$(eval $(call usetemplate,romstage-objs,S)) -$(eval $(call usetemplate,driver-objs,c)) -$(eval $(call usetemplate,driver-objs,S)) -$(eval $(call usetemplate,smm-objs,c)) -$(eval $(call usetemplate,smm-objs,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 = $(ramstage-objs:.o=.d) $(romstage-objs:.o=.d) $(driver-objs:.o=.d) $(smm-objs:.o=.d) -include $(DEPENDENCIES) @@ -273,7 +269,7 @@ @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) only in patch2: unchanged: --- src/southbridge/via/k8t890/Makefile.inc (Revision 5880) +++ src/southbridge/via/k8t890/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/via/vt8231/Makefile.inc (Revision 5880) +++ src/southbridge/via/vt8231/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/via/vt8235/Makefile.inc (Revision 5880) +++ src/southbridge/via/vt8235/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/amd/amd8132/Makefile.inc (Revision 5880) +++ src/southbridge/amd/amd8132/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += amd8132_bridge.o +driver-y += amd8132_bridge.c only in patch2: unchanged: --- src/southbridge/amd/amd8151/Makefile.inc (Revision 5880) +++ src/southbridge/amd/amd8151/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += amd8151_agp3.o +driver-y += amd8151_agp3.c only in patch2: unchanged: --- src/southbridge/amd/cs5530/Makefile.inc (Revision 5880) +++ src/southbridge/amd/cs5530/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/amd/rs690/Makefile.inc (Revision 5880) +++ src/southbridge/amd/rs690/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/amd/rs780/Makefile.inc (Revision 5880) +++ src/southbridge/amd/rs780/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/amd/cs5536/Makefile.inc (Revision 5880) +++ src/southbridge/amd/cs5536/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/amd/amd8131/Makefile.inc (Revision 5880) +++ src/southbridge/amd/amd8131/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += amd8131_bridge.o +driver-y += amd8131_bridge.c only in patch2: unchanged: --- src/southbridge/ricoh/rl5c476/Makefile.inc (Revision 5880) +++ src/southbridge/ricoh/rl5c476/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += rl5c476.o +driver-y += rl5c476.c only in patch2: unchanged: --- src/southbridge/broadcom/bcm21000/Makefile.inc (Revision 5880) +++ src/southbridge/broadcom/bcm21000/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += bcm21000_pcie.o +driver-y += bcm21000_pcie.c only in patch2: unchanged: --- src/southbridge/broadcom/bcm5780/Makefile.inc (Revision 5880) +++ src/southbridge/broadcom/bcm5780/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/intel/i82870/Makefile.inc (Revision 5880) +++ src/southbridge/intel/i82870/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/intel/esb6300/Makefile.inc (Revision 5880) +++ src/southbridge/intel/esb6300/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/intel/pxhd/Makefile.inc (Revision 5880) +++ src/southbridge/intel/pxhd/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += pxhd_bridge.o +driver-y += pxhd_bridge.c only in patch2: unchanged: --- src/southbridge/ti/pci7420/Makefile.inc (Revision 5880) +++ src/southbridge/ti/pci7420/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/southbridge/ti/pcixx12/Makefile.inc (Revision 5880) +++ src/southbridge/ti/pcixx12/Makefile.inc (Arbeitskopie) @@ -17,5 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += pcixx12.o +driver-y += pcixx12.c only in patch2: unchanged: --- src/southbridge/ti/pci1x2x/Makefile.inc (Revision 5880) +++ src/southbridge/ti/pci1x2x/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-$(CONFIG_SOUTHBRIDGE_TI_PCI1X2X) += pci1x2x.o +driver-$(CONFIG_SOUTHBRIDGE_TI_PCI1X2X) += pci1x2x.c only in patch2: unchanged: --- src/cpu/via/model_c3/Makefile.inc (Revision 5880) +++ src/cpu/via/model_c3/Makefile.inc (Arbeitskopie) @@ -5,4 +5,4 @@ subdirs-y += ../../x86/smm subdirs-y += ../../intel/microcode -driver-y += model_c3_init.o +driver-y += model_c3_init.c only in patch2: unchanged: --- src/cpu/via/model_c7/Makefile.inc (Revision 5880) +++ src/cpu/via/model_c7/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/cpu/amd/model_gx1/Makefile.inc (Revision 5880) +++ src/cpu/amd/model_gx1/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/cpu/intel/model_f3x/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_f3x/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += model_f3x_init.o +driver-y += model_f3x_init.c only in patch2: unchanged: --- src/cpu/intel/model_6ex/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_6ex/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/cpu/intel/model_69x/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_69x/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += model_69x_init.o +driver-y += model_69x_init.c only in patch2: unchanged: --- src/cpu/intel/model_f0x/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_f0x/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += model_f0x_init.o +driver-y += model_f0x_init.c only in patch2: unchanged: --- src/cpu/intel/model_6bx/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_6bx/Makefile.inc (Arbeitskopie) @@ -1,2 +1,2 @@ -driver-y += model_6bx_init.o +driver-y += model_6bx_init.c subdirs-y += ../../x86/name only in patch2: unchanged: --- src/cpu/intel/model_f2x/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_f2x/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += model_f2x_init.o +driver-y += model_f2x_init.c only in patch2: unchanged: --- src/cpu/intel/model_6dx/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_6dx/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += model_6dx_init.o +driver-y += model_6dx_init.c only in patch2: unchanged: --- src/cpu/intel/model_106cx/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_106cx/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/cpu/intel/model_f4x/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_f4x/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += model_f4x_init.o +driver-y += model_f4x_init.c only in patch2: unchanged: --- src/cpu/intel/model_6fx/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_6fx/Makefile.inc (Arbeitskopie) @@ -1,2 +1,2 @@ -driver-y += model_6fx_init.o +driver-y += model_6fx_init.c subdirs-y += ../../x86/name only in patch2: unchanged: --- src/cpu/intel/model_6xx/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_6xx/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += model_6xx_init.o +driver-y += model_6xx_init.c only in patch2: unchanged: --- src/cpu/intel/model_1067x/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_1067x/Makefile.inc (Arbeitskopie) @@ -1,3 +1,3 @@ -driver-y += model_1067x_init.o +driver-y += model_1067x_init.c subdirs-y += ../../x86/name only in patch2: unchanged: --- src/cpu/intel/model_68x/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_68x/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/cpu/intel/model_f1x/Makefile.inc (Revision 5880) +++ src/cpu/intel/model_f1x/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-y += model_f1x_init.o +driver-y += model_f1x_init.c only in patch2: unchanged: --- src/northbridge/via/cn400/Makefile.inc (Revision 5880) +++ src/northbridge/via/cn400/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/northbridge/via/vx800/Makefile.inc (Revision 5880) +++ src/northbridge/via/vx800/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/northbridge/via/cn700/Makefile.inc (Revision 5880) +++ src/northbridge/via/cn700/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/northbridge/via/vt8601/Makefile.inc (Revision 5880) +++ src/northbridge/via/vt8601/Makefile.inc (Arbeitskopie) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c only in patch2: unchanged: --- src/northbridge/via/vt8623/Makefile.inc (Revision 5880) +++ src/northbridge/via/vt8623/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/northbridge/amd/gx1/Makefile.inc (Revision 5880) +++ src/northbridge/amd/gx1/Makefile.inc (Arbeitskopie) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c only in patch2: unchanged: --- src/northbridge/intel/e7520/Makefile.inc (Revision 5880) +++ src/northbridge/intel/e7520/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/northbridge/intel/i440lx/Makefile.inc (Revision 5880) +++ src/northbridge/intel/i440lx/Makefile.inc (Arbeitskopie) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c only in patch2: unchanged: --- src/northbridge/intel/e7525/Makefile.inc (Revision 5880) +++ src/northbridge/intel/e7525/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/northbridge/intel/i440bx/Makefile.inc (Revision 5880) +++ src/northbridge/intel/i440bx/Makefile.inc (Arbeitskopie) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c only in patch2: unchanged: --- src/northbridge/intel/i82810/Makefile.inc (Revision 5880) +++ src/northbridge/intel/i82810/Makefile.inc (Arbeitskopie) @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -driver-y += northbridge.o +driver-y += northbridge.c only in patch2: unchanged: --- src/northbridge/intel/i3100/Makefile.inc (Revision 5880) +++ src/northbridge/intel/i3100/Makefile.inc (Arbeitskopie) @@ -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 only in patch2: unchanged: --- src/drivers/sil/3114/Makefile.inc (Revision 5880) +++ src/drivers/sil/3114/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.o +driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.c only in patch2: unchanged: --- src/drivers/dec/21143/Makefile.inc (Revision 5880) +++ src/drivers/dec/21143/Makefile.inc (Arbeitskopie) @@ -1,2 +1,2 @@ -driver-y += 21143.o +driver-y += 21143.c only in patch2: unchanged: --- src/drivers/ati/ragexl/Makefile.inc (Revision 5880) +++ src/drivers/ati/ragexl/Makefile.inc (Arbeitskopie) @@ -1 +1 @@ -driver-$(CONFIG_ATI_RAGE_XL) += xlinit.o +driver-$(CONFIG_ATI_RAGE_XL) += xlinit.c