9 files changed, 0 insertions, 76 deletions
diff --git a/src/mainboard/supermicro/h8dme/devicetree.cb b/src/mainboard/supermicro/h8dme/devicetree.cb
index 9efbaf7292..754e3163ea 100644
--- a/src/mainboard/supermicro/h8dme/devicetree.cb
+++ b/src/mainboard/supermicro/h8dme/devicetree.cb
@@ -123,16 +123,4 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
       device pci 18.3 on end
     end
   end
-  # chip drivers/generic/debug
-  #   device pnp 0.0 off end			# chip name
-  #   device pnp 0.1 on end			# pci_regs_all
-  #   device pnp 0.2 off end			# mem
-  #   device pnp 0.3 off end			# cpuid
-  #   device pnp 0.4 on end			# smbus_regs_all
-  #   device pnp 0.5 off end			# dual core msr
-  #   device pnp 0.6 off end			# cache size
-  #   device pnp 0.7 off end			# tsc
-  #   device pnp 0.8 off end			# io
-  #   device pnp 0.9 on end			# io
-  # end
 end
diff --git a/src/mainboard/supermicro/h8dmr/devicetree.cb b/src/mainboard/supermicro/h8dmr/devicetree.cb
index 51ad94f275..b36367477d 100644
--- a/src/mainboard/supermicro/h8dmr/devicetree.cb
+++ b/src/mainboard/supermicro/h8dmr/devicetree.cb
@@ -143,16 +143,4 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
       device pci 18.3 on end
     end
   end
-  # chip drivers/generic/debug
-  #   device pnp 0.0 off end			# chip name
-  #   device pnp 0.1 on end			# pci_regs_all
-  #   device pnp 0.2 off end			# mem
-  #   device pnp 0.3 off end			# cpuid
-  #   device pnp 0.4 on end			# smbus_regs_all
-  #   device pnp 0.5 off end			# dual core msr
-  #   device pnp 0.6 off end			# cache size
-  #   device pnp 0.7 off end			# tsc
-  #   device pnp 0.8 off end			# io
-  #   device pnp 0.9 on end			# io
-  # end
 end
diff --git a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
index c8a8bc5a2f..9e52d07f56 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
@@ -149,16 +149,4 @@ chip northbridge/amd/amdfam10/root_complex	# Root complex
       device pci 19.4 on end
     end
   end
-  # chip drivers/generic/debug
-  #   device pnp 0.0 off end			# chip name
-  #   device pnp 0.1 on end			# pci_regs_all
-  #   device pnp 0.2 off end			# mem
-  #   device pnp 0.3 off end			# cpuid
-  #   device pnp 0.4 on end			# smbus_regs_all
-  #   device pnp 0.5 off end			# dual core msr
-  #   device pnp 0.6 off end			# cache size
-  #   device pnp 0.7 off end			# tsc
-  #   device pnp 0.8 off end			# io
-  #   device pnp 0.9 on end			# io
-  # end
 end
diff --git a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
index 93a38d679c..6956b45f7e 100644
--- a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
@@ -112,16 +112,4 @@ chip northbridge/amd/amdfam10/root_complex	# Root complex
       device pci 19.4 on end
     end
   end
-  # chip drivers/generic/debug
-  #   device pnp 0.0 off end			# chip name
-  #   device pnp 0.1 on end			# pci_regs_all
-  #   device pnp 0.2 off end			# mem
-  #   device pnp 0.3 off end			# cpuid
-  #   device pnp 0.4 on end			# smbus_regs_all
-  #   device pnp 0.5 off end			# dual core msr
-  #   device pnp 0.6 off end			# cache size
-  #   device pnp 0.7 off end			# tsc
-  #   device pnp 0.8 off end			# io
-  #   device pnp 0.9 on end			# io
-  # end
 end
diff --git a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
index ba7eb2acc4..9dda5d8150 100644
--- a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb
@@ -120,20 +120,6 @@ chip northbridge/amd/amdfam10/root_complex
 #		end
 #	end #domain
 
-#	  chip drivers/generic/debug
-#		 device pnp 0.0 off end # chip name
-#		  device pnp 0.1 on end # pci_regs_all
-#		  device pnp 0.2 off end # mem
-#		  device pnp 0.3 off end # cpuid
-#		  device pnp 0.4 off end # smbus_regs_all
-#		  device pnp 0.5 off end # dual core msr
-#		  device pnp 0.6 off end # cache size
-#		  device pnp 0.7 off end # tsc
-#		  device pnp 0.8 off end # hard reset
-#		  device pnp 0.9 off end # mcp55
-#		  device pnp 0.a on end # GH ext table
-#	 end
-
 end
 
 
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index 03bb0a8508..ab8d00b8f6 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_1024
-	select DRIVERS_GENERIC_DEBUG
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/supermicro/x6dhe_g/devicetree.cb b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
index 01c2837a8a..322860bc5d 100644
--- a/src/mainboard/supermicro/x6dhe_g/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
@@ -1,10 +1,4 @@
 chip northbridge/intel/e7520  # MCH
-	chip drivers/generic/debug  # DEBUGGING
-		device pnp 00.0 on end
-		device pnp 00.1 off end
-		device pnp 00.2 off end
-		device pnp 00.3 off end
-	end
 	device domain 0 on
 		subsystemid 0x15d9 0x6080 inherit
 		chip southbridge/intel/esb6300	# ESB6300
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index 397087cc36..b4630fe108 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_1024
 	select USE_WATCHDOG_ON_BOOT
-	select DRIVERS_GENERIC_DEBUG
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
index c143ced16e..984814efba 100644
--- a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
@@ -1,10 +1,4 @@
 chip northbridge/intel/e7520  # MCH
-	chip drivers/generic/debug  # DEBUGGING
-		device pnp 00.0 off end
-		device pnp 00.1 off end
-		device pnp 00.2 off end
-		device pnp 00.3 off end
-	end
 	device domain 0 on
 		subsystemid 0x15d9 0x6080 inherit
 		chip southbridge/intel/i82801ex	# ICH5R