Index: src/southbridge/amd/rs690/rs690_cmn.c
===================================================================
--- src/southbridge/amd/rs690/rs690_cmn.c	(Revision 3779)
+++ src/southbridge/amd/rs690/rs690_cmn.c	(Arbeitskopie)
@@ -307,8 +307,10 @@
 */
 void rs690_set_tom(device_t nb_dev)
 {
+#if (CONFIG_GFXUMA == 1)
 	/* set TOM */
 	pci_write_config32(nb_dev, 0x90, uma_memory_start);
 	nbmc_write_index(nb_dev, 0x1e, uma_memory_start);
+#endif
 }
 
Index: src/mainboard/amd/dbm690t/Config.lb
===================================================================
--- src/mainboard/amd/dbm690t/Config.lb	(Revision 3779)
+++ src/mainboard/amd/dbm690t/Config.lb	(Arbeitskopie)
@@ -187,8 +187,8 @@
 #Define gfx_link_width, 0: x16, 1: x1, 2: x2, 3: x4, 4: x8, 5: x12 (not supported), 6: x16
 chip northbridge/amd/amdk8/root_complex
 	device apic_cluster 0 on
-		chip cpu/amd/socket_S1G1
-		device apic 0 on end
+		chip cpu/amd/socket_AM2
+			device apic 0 on end
 		end
 	end
 	device pci_domain 0 on
@@ -196,19 +196,19 @@
 			device pci 18.0 on #  southbridge 
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
-					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
+					device pci 1.0 on  # Internal Graphics P2P bridge 0x791e
 						chip drivers/pci/onboard
 							device pci 5.0 on end	# Internal Graphics 0x791F
 							register "rom_address" = "0xfff00000"
 						end
 					end
-					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
-					device pci 3.0 off end # PCIE P2P bridge	0x791b
-					device pci 4.0 on end # PCIE P2P bridge 0x1914
-					device pci 5.0 on end # PCIE P2P bridge 0x7915
+					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913  #
+					device pci 3.0 off end # PCIE P2P bridge	0x791b #
+					device pci 4.0 on end # PCIE P2P bridge 0x1914 #
+					device pci 5.0 on end # PCIE P2P bridge 0x7915 #
 					device pci 6.0 on end # PCIE P2P bridge 0x7916
 					device pci 7.0 on end # PCIE P2P bridge 0x7917
-					device pci 8.0 off end # NB/SB Link P2P bridge
+					device pci 8.0 off end # NB/SB Link P2P bridge #
 					register "vga_rom_address" = "0xfff00000"
 					register "gpp_configuration" = "4"
 					register "port_enable" = "0xfc"
@@ -235,18 +235,18 @@
 						chip drivers/generic/generic #dimm 0-0-1
 							device i2c 51 on end
 						end
-						chip drivers/generic/generic #dimm 0-1-0
-							device i2c 52 on end
-						end
-						chip drivers/generic/generic #dimm 0-1-1
-							device i2c 53 on end
-						end
+						# chip drivers/generic/generic #dimm 0-1-0
+						# 	device i2c 52 on end
+						# end
+						# chip drivers/generic/generic #dimm 0-1-1
+						# 	device i2c 53 on end
+						# end
 					end # SM
 				device pci 14.1 on end # IDE    0x438c
 				device pci 14.2 on end # HDA    0x4383
 				device pci 14.3 on # LPC	0x438d
 					chip superio/ite/it8712f
-						device pnp 2e.0 off #  Floppy
+						device pnp 2e.0 on #  Floppy
 							io 0x60 = 0x3f0
 							irq 0x70 = 6
 							drq 0x74 = 2
@@ -259,11 +259,14 @@
 							io 0x60 = 0x2f8
 							irq 0x70 = 3
 						end
-						device pnp 2e.3 off #  Parallel Port
+						device pnp 2e.3 on #  Parallel port
 							io 0x60 = 0x378
 							irq 0x70 = 7
 						end
-						device pnp 2e.4 off end #  EC
+						device pnp 2e.4 on # EC
+							io 0x60 = 0x290
+							irq 0x70 = 9
+						end
 						device pnp 2e.5 on #  Keyboard
 							io 0x60 = 0x60
 							io 0x62 = 0x64
@@ -271,20 +274,27 @@
 						end
 						device pnp 2e.6 on #  Mouse
 							irq 0x70 = 12
+							irq 0x71 = 2
 						end
+						device pnp 2e.7 on  # GPIO
+						end
 						device pnp 2e.8 off #  MIDI
 							io 0x60 = 0x300
-							irq 0x70 = 9
+							irq 0x70 = 10
 						end
 						device pnp 2e.9 off #  GAME
-							io 0x60 = 0x220
+							# io 0x60 = 0x220
+							io 0x60 = 0x201 # TODO?
 						end
-						device pnp 2e.a off end #  CIR
+						device pnp 2e.a on #  CIR TODO
+							io 0x60 = 0x310
+							irq 0x70 = 11
+						end
 					end	#superio/ite/it8712f
 				end		#LPC
 				device pci 14.4 on end # PCI 0x4384
-				device pci 14.5 on end # ACI 0x4382
-				device pci 14.6 on end # MCI 0x438e
+				# device pci 14.5 on end # ACI 0x4382
+				# device pci 14.6 on end # MCI 0x438e
 					register "ide0_enable" = "1"
 					register "sata0_enable" = "1"
 					register "hda_viddid" = "0x10ec0882"
@@ -292,7 +302,7 @@
 			end #  device pci 18.0
 
 			device pci 18.0 on end
-			device pci 18.0 on end
+			device pci 18.0 on end	# TODO?
 			device pci 18.1 on end
 			device pci 18.2 on end
 			device pci 18.3 on end
Index: src/mainboard/amd/dbm690t/Options.lb
===================================================================
--- src/mainboard/amd/dbm690t/Options.lb	(Revision 3779)
+++ src/mainboard/amd/dbm690t/Options.lb	(Arbeitskopie)
@@ -99,7 +99,7 @@
 ##
 ## ROM_SIZE is the size of boot ROM that this board will use.
 ##
-default ROM_SIZE=524288
+default ROM_SIZE= 1024 * 1024
 
 ##
 ## FALLBACK_SIZE is the amount of the ROM the complete fallback image will use
@@ -191,10 +191,10 @@
 ##
 ## Clean up the motherboard id strings
 ##
-default MAINBOARD_PART_NUMBER="dbm690t"
-default MAINBOARD_VENDOR="amd"
-default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1022
-default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x3050
+default MAINBOARD_PART_NUMBER="ASUS"
+default MAINBOARD_VENDOR="M2A-MX"
+default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1043
+default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x8288
 
 
 ###
@@ -286,16 +286,16 @@
 ## SPEW       9   Way too many details             
 
 ## Request this level of debugging output
-default  DEFAULT_CONSOLE_LOGLEVEL=8
+default  DEFAULT_CONSOLE_LOGLEVEL=9
 ## At a maximum only compile in this level of debugging
-default  MAXIMUM_CONSOLE_LOGLEVEL=8
+default  MAXIMUM_CONSOLE_LOGLEVEL=9
 
 ##
 ## Select power on after power fail setting
 default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON"
 
-default CONFIG_VIDEO_MB=1
-default CONFIG_GFXUMA=1
+default CONFIG_VIDEO_MB=0
+default CONFIG_GFXUMA=0
 
 ### End Options.lb
 end
Index: src/mainboard/amd/dbm690t/mainboard.c
===================================================================
--- src/mainboard/amd/dbm690t/mainboard.c	(Revision 3779)
+++ src/mainboard/amd/dbm690t/mainboard.c	(Arbeitskopie)
@@ -106,8 +106,8 @@
 
 	/* TODO: TOP_MEM2 */
 #else
-	uma_memory_size = 0x8000000; /* 128M recommended UMA */
-	uma_memory_start = 0x38000000; /* 1GB  system memory supposed */
+	// uma_memory_size = 0x8000000; /* 128M recommended UMA */
+	// uma_memory_start = 0x38000000; /* 1GB  system memory supposed */
 #endif
 
 	printk_info("dbm690t_enable. dev=0x%x\n", dev);
Index: src/mainboard/amd/dbm690t/cache_as_ram_auto.c
===================================================================
--- src/mainboard/amd/dbm690t/cache_as_ram_auto.c	(Revision 3779)
+++ src/mainboard/amd/dbm690t/cache_as_ram_auto.c	(Arbeitskopie)
@@ -34,7 +34,7 @@
 #define DIMM1 0x51
 
 #define ICS951462_ADDRESS	0x69
-#define SMBUS_HUB 0x71
+#define SMBUS_HUB 0x71			// FIXME
 
 #include <stdint.h>
 #include <device/pci_def.h>
Index: targets/amd/dbm690t/Config.lb
===================================================================
--- targets/amd/dbm690t/Config.lb	(Revision 3779)
+++ targets/amd/dbm690t/Config.lb	(Arbeitskopie)
@@ -4,7 +4,8 @@
 mainboard amd/dbm690t
 
 romimage "normal"
-	option ROM_SIZE = 1024*1024 - 55808
+	# option ROM_SIZE = 1024*1024 - 55808
+	option ROM_SIZE = 1024*1024
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000