This is the southbridge part of Harald's patch and my patch merged. Signed-off-by: Myles Watson <[email protected]>
Thanks, Myles
Index: src/southbridge/Kconfig =================================================================== --- src/southbridge/Kconfig (revision 4564) +++ src/southbridge/Kconfig (working copy) @@ -1,7 +1,7 @@ source src/southbridge/amd/Kconfig #source src/southbridge/broadcom/Kconfig source src/southbridge/intel/Kconfig -#source src/southbridge/nvidia/Kconfig +source src/southbridge/nvidia/Kconfig #source src/southbridge/ricoh/Kconfig #source src/southbridge/sis/Kconfig source src/southbridge/via/Kconfig Index: src/southbridge/Makefile.inc =================================================================== --- src/southbridge/Makefile.inc (revision 4564) +++ src/southbridge/Makefile.inc (working copy) @@ -1,7 +1,7 @@ subdirs-y += amd #subdirs-y += broadcom subdirs-y += intel -#subdirs-y += nvidia +subdirs-y += nvidia #subdirs-y += ricoh #subdirs-y += sis subdirs-y += via Index: src/southbridge/nvidia/Makefile.inc =================================================================== --- src/southbridge/nvidia/Makefile.inc (revision 4564) +++ src/southbridge/nvidia/Makefile.inc (working copy) @@ -1,3 +1,3 @@ -subdirs-y += ck804 -subdirs-y += mcp55 +subdirs-$(CONFIG_SOUTHBRIDGE_NVIDIA_CK804) += ck804 +subdirs-$(CONFIG_SOUTHBRIDGE_NVIDIA_MCP55) += mcp55 Index: src/southbridge/nvidia/ck804/Kconfig =================================================================== --- src/southbridge/nvidia/ck804/Kconfig (revision 0) +++ src/southbridge/nvidia/ck804/Kconfig (revision 0) @@ -0,0 +1,3 @@ +config SOUTHBRIDGE_NVIDIA_CK804 + bool + default n Index: src/southbridge/nvidia/ck804/Makefile.inc =================================================================== --- src/southbridge/nvidia/ck804/Makefile.inc (revision 4560) +++ src/southbridge/nvidia/ck804/Makefile.inc (working copy) @@ -1,20 +1,15 @@ -uses CONFIG_HAVE_ACPI_TABLES +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 +obj-y += ck804_reset.o -config chip.h -driver ck804.o -driver ck804_usb.o -driver ck804_lpc.o -driver ck804_smbus.o -driver ck804_ide.o -driver ck804_sata.o -driver ck804_usb2.o -driver ck804_ac97.o -driver ck804_nic.o -driver ck804_pci.o -driver ck804_pcie.o -driver ck804_ht.o -object ck804_reset.o - -if CONFIG_HAVE_ACPI_TABLES - object ck804_fadt.o -end +obj-$(CONFIG_HAVE_ACPI_TABLES) +=ck804_fadt.o Property changes on: src/southbridge/nvidia/ck804/Makefile.inc ___________________________________________________________________ Added: svn:mergeinfo Index: src/southbridge/nvidia/mcp55/Kconfig =================================================================== --- src/southbridge/nvidia/mcp55/Kconfig (revision 0) +++ src/southbridge/nvidia/mcp55/Kconfig (revision 0) @@ -0,0 +1,3 @@ +config SOUTHBRIDGE_NVIDIA_MCP55 + bool + default n Index: src/southbridge/nvidia/mcp55/Makefile.inc =================================================================== --- src/southbridge/nvidia/mcp55/Makefile.inc (revision 0) +++ src/southbridge/nvidia/mcp55/Makefile.inc (revision 0) @@ -0,0 +1,15 @@ +driver-y += mcp55.o +driver-y += mcp55_aza.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-$(CONFIG_HAVE_ACPI_TABLES) += mcp55_fadt.o + +obj-y += mcp55_reset.o
-- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
