Index: src/southbridge/amd/rs780/rs780.c =================================================================== --- src/southbridge/amd/rs780/rs780.c (revision 6378) +++ src/southbridge/amd/rs780/rs780.c (working copy) @@ -109,7 +109,11 @@ static u32 get_vid_did(device_t dev) { - return pci_read_config32(dev, 0); + u32 vdid; + printk(BIOS_INFO, "gvd"); + vdid = pci_read_config32(dev, 0); + printk(BIOS_INFO, "%08x\n", vdid); + return vdid; } static void rs780_nb_pci_table(device_t nb_dev) Index: src/mainboard/asus/Kconfig =================================================================== --- src/mainboard/asus/Kconfig (revision 6378) +++ src/mainboard/asus/Kconfig (working copy) @@ -37,6 +37,8 @@ bool "M4A785-M" config BOARD_ASUS_M4A78_EM bool "M4A78-EM" +config BOARD_ASUS_M4A87TD_USB3 + bool "M4A87TD/USB3" config BOARD_ASUS_MEW_AM bool "MEW-AM" config BOARD_ASUS_MEW_VM @@ -64,6 +66,7 @@ source "src/mainboard/asus/m2v-mx_se/Kconfig" source "src/mainboard/asus/m4a785-m/Kconfig" source "src/mainboard/asus/m4a78-em/Kconfig" +source "src/mainboard/asus/m4a87td-usb3/Kconfig" source "src/mainboard/asus/mew-am/Kconfig" source "src/mainboard/asus/mew-vm/Kconfig" source "src/mainboard/asus/p2b/Kconfig" Index: src/mainboard/asus/m4a87td-usb3/Kconfig =================================================================== --- src/mainboard/asus/m4a87td-usb3/Kconfig (revision 6375) +++ src/mainboard/asus/m4a87td-usb3/Kconfig (working copy) @@ -1,9 +1,9 @@ -if BOARD_AMD_BIMINI_FAM10 +if BOARD_ASUS_M4A87TD_USB3 config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select ARCH_X86 - select CPU_AMD_SOCKET_ASB2 + select CPU_AMD_SOCKET_AM3 select DIMM_DDR3 select DIMM_REGISTERED # TODO: Enable QRANK_DIMM_SUPPORT? Was commented in the Kconfig file, @@ -24,16 +24,16 @@ select SERIAL_CPU_INIT select AMDMCT select GENERATE_ACPI_TABLES - select BOARD_ROMSIZE_KB_2048 + select BOARD_ROMSIZE_KB_1024 select RAMINIT_SYSINFO select ENABLE_APIC_EXT_ID - select GFXUMA + #select GFXUMA select HAVE_DEBUG_CAR select SET_FIDVID config MAINBOARD_DIR string - default amd/bimini_fam10 + default asus/m4a87td-usb3 config APIC_ID_OFFSET hex @@ -41,7 +41,7 @@ config MAINBOARD_PART_NUMBER string - default "Bimini (Fam10)" + default "M4A87TD/USB3" config HW_MEM_HOLE_SIZEK hex @@ -93,14 +93,10 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex - default 0x3060 + default 0x8432 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 -endif #BOARD_AMD_BIMINI_FAM10 +endif #BOARD_ASUS_M4A87TD_USB3 Index: src/mainboard/asus/m4a87td-usb3/devicetree.cb =================================================================== --- src/mainboard/asus/m4a87td-usb3/devicetree.cb (revision 6375) +++ src/mainboard/asus/m4a87td-usb3/devicetree.cb (working copy) @@ -1,7 +1,7 @@ # sample config for amd/bimini_fam10 chip northbridge/amd/amdfam10/root_complex device lapic_cluster 0 on - chip cpu/amd/socket_ASB2 #L1 and DDR3 + chip cpu/amd/socket_AM3 #L1 and DDR3 device lapic 0 on end end end @@ -10,17 +10,17 @@ device pci 18.0 on # northbridge chip southbridge/amd/rs780 device pci 0.0 on end # HT 0x9600 - device pci 1.0 on end # Internal Graphics P2P bridge 0x9602 - device pci 2.0 off end # PCIE P2P bridge (external graphics) 0x9603 + #device pci 1.0 on end # Internal Graphics P2P bridge 0x9602 + device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603 device pci 3.0 off end # PCIE P2P bridge 0x960b device pci 4.0 on end # PCIE P2P bridge 0x9604 - device pci 5.0 on end # PCIE P2P bridge 0x9605 - device pci 6.0 on end # PCIE P2P bridge 0x9606 - device pci 7.0 on end # PCIE P2P bridge 0x9607 + device pci 5.0 off end # PCIE P2P bridge 0x9605 + device pci 6.0 off end # PCIE P2P bridge 0x9606 + device pci 7.0 off end # PCIE P2P bridge 0x9607 device pci 8.0 off end # NB/SB Link P2P bridge device pci 9.0 on end # - device pci a.0 off end # - register "gppsb_configuration" = "4" # Configuration E + device pci a.0 on end # + register "gppsb_configuration" = "1" # Configuration E register "gpp_configuration" = "2" # Configuration C register "port_enable" = "0x6fc" register "gfx_dev2_dev3" = "1" @@ -53,7 +53,24 @@ end # SM device pci 14.1 on end # IDE 0x439c device pci 14.2 on end # HDA 0x4383 - device pci 14.3 on end # LPC 0x439d + device pci 14.3 on # LPC 0x439d + chip superio/ite/it8718f + device pnp 2e.0 off end + device pnp 2e.1 on + io 0x60 = 0x3f8 + irq 0x70 = 4 + end + device pnp 2e.2 off end + device pnp 2e.3 off end + device pnp 2e.4 off end + device pnp 2e.5 off end + device pnp 2e.6 off end + device pnp 2e.7 off end + device pnp 2e.8 off end + device pnp 2e.9 off end + device pnp 2e.a off end + end #superio/ite/it8718f + end #LPC device pci 14.4 off end # PCI 0x4384 # PCI-b conflict with GPIO. device pci 14.5 on end # USB 2 device pci 14.6 on end # Gec Index: src/mainboard/asus/m4a87td-usb3/romstage.c =================================================================== --- src/mainboard/asus/m4a87td-usb3/romstage.c (revision 6375) +++ src/mainboard/asus/m4a87td-usb3/romstage.c (working copy) @@ -69,6 +69,7 @@ #include "cpu/amd/model_10xxx/update_microcode.c" #include "cpu/amd/model_10xxx/init_cpus.c" #include "northbridge/amd/amdfam10/early_ht.c" +#include "superio/ite/it8718f/early_serial.c" #define RC00 0 #define RC01 1 @@ -109,6 +110,7 @@ enable_rs780_dev8(); sb800_lpc_init(); + it8718f_enable_serial(0, CONFIG_TTYS0_BASE); uart_init(); #if CONFIG_USBDEBUG sb800_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT); Index: src/mainboard/asus/m4a87td-usb3/mainboard.c =================================================================== --- src/mainboard/asus/m4a87td-usb3/mainboard.c (revision 6375) +++ src/mainboard/asus/m4a87td-usb3/mainboard.c (working copy) @@ -122,6 +122,7 @@ } #endif /* get_ide_dma66() */ +#if 0 /************************************************* * enable the dedicated function in bimini board. * This function called early than rs780_enable. @@ -178,6 +179,7 @@ enable_int_gfx(); /* get_ide_dma66(); */ } +#endif int add_mainboard_resources(struct lb_memory *mem) { @@ -195,5 +197,5 @@ struct chip_operations mainboard_ops = { CHIP_NAME("AMD Bimini Mainboard") - .enable_dev = bimini_enable, + //.enable_dev = bimini_enable, };