Drop drivers/generic/debug

Not very popular nor useful nowadays.

Change-Id: I3dc0f7aaf188950a43f5350d3a95669fbbdcfd94
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4554
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

31 files changed, 0 insertions, 327 deletions

diff --git a/src/mainboard/amd/bimini_fam10/devicetree.cb b/src/mainboard/amd/bimini_fam10/devicetree.cb
index 25676f0d03..0bcc9c16af 100644
--- a/src/mainboard/amd/bimini_fam10/devicetree.cb
+++ b/src/mainboard/amd/bimini_fam10/devicetree.cb
@@ -92,18 +92,4 @@ 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/amd/mahogany_fam10/devicetree.cb b/src/mainboard/amd/mahogany_fam10/devicetree.cb
index 4fd77b7ce3..5000b0c27c 100644
--- a/src/mainboard/amd/mahogany_fam10/devicetree.cb
+++ b/src/mainboard/amd/mahogany_fam10/devicetree.cb
@@ -126,18 +126,4 @@ 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/amd/serengeti_cheetah/devicetree.cb b/src/mainboard/amd/serengeti_cheetah/devicetree.cb
index 1fea190ec6..28b7e01ac6 100644
--- a/src/mainboard/amd/serengeti_cheetah/devicetree.cb
+++ b/src/mainboard/amd/serengeti_cheetah/devicetree.cb
@@ -144,17 +144,6 @@ chip northbridge/amd/amdk8/root_complex
 
 
 	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
-#       end
-
 end
 
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
index 972632be5c..8b5d817708 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb
@@ -134,20 +134,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/amd/tilapia_fam10/devicetree.cb b/src/mainboard/amd/tilapia_fam10/devicetree.cb
index 9315440000..77fd875ada 100644
--- a/src/mainboard/amd/tilapia_fam10/devicetree.cb
+++ b/src/mainboard/amd/tilapia_fam10/devicetree.cb
@@ -127,17 +127,4 @@ 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/broadcom/blast/devicetree.cb b/src/mainboard/broadcom/blast/devicetree.cb
index b1486a6cc1..326071bd98 100644
--- a/src/mainboard/broadcom/blast/devicetree.cb
+++ b/src/mainboard/broadcom/blast/devicetree.cb
@@ -119,16 +119,5 @@ chip northbridge/amd/amdk8/root_complex
 
 
 	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
-#       end
-
 end
 
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
index c2aecadac9..33b85056cc 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
+++ b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
@@ -89,16 +89,4 @@ chip northbridge/amd/amdk8/root_complex
 
 	end # PCI 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 # io
-#               device pnp 0.9 off end # io
-#       end
 end #root_complex
diff --git a/src/mainboard/gigabyte/m57sli/devicetree.cb b/src/mainboard/gigabyte/m57sli/devicetree.cb
index 59029322e5..efbf76e896 100644
--- a/src/mainboard/gigabyte/m57sli/devicetree.cb
+++ b/src/mainboard/gigabyte/m57sli/devicetree.cb
@@ -151,16 +151,4 @@ device domain 0 on				# PCI domain
       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 on 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 off end			# io
-  # end
 end
diff --git a/src/mainboard/iwill/dk8_htx/devicetree.cb b/src/mainboard/iwill/dk8_htx/devicetree.cb
index 544390dcfb..50d214be4d 100644
--- a/src/mainboard/iwill/dk8_htx/devicetree.cb
+++ b/src/mainboard/iwill/dk8_htx/devicetree.cb
@@ -114,17 +114,6 @@ chip northbridge/amd/amdk8/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
-#       end
-
 end
 
 
diff --git a/src/mainboard/msi/ms7260/devicetree.cb b/src/mainboard/msi/ms7260/devicetree.cb
index b35bb5847b..717ad009cf 100644
--- a/src/mainboard/msi/ms7260/devicetree.cb
+++ b/src/mainboard/msi/ms7260/devicetree.cb
@@ -140,17 +140,4 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
       device pci 18.3 on end
     end
   end
-  # TODO
-  # 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 on 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 off end			# io
-  # end
 end
diff --git a/src/mainboard/msi/ms9185/devicetree.cb b/src/mainboard/msi/ms9185/devicetree.cb
index 75822eafaf..ee0d891321 100644
--- a/src/mainboard/msi/ms9185/devicetree.cb
+++ b/src/mainboard/msi/ms9185/devicetree.cb
@@ -82,17 +82,6 @@ chip northbridge/amd/amdk8/root_complex
                        device pci 18.3 on end
                end # amdk8
        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
-#       end
-
 end
 
 
diff --git a/src/mainboard/msi/ms9282/devicetree.cb b/src/mainboard/msi/ms9282/devicetree.cb
index f61d6a3ace..82103229be 100644
--- a/src/mainboard/msi/ms9282/devicetree.cb
+++ b/src/mainboard/msi/ms9282/devicetree.cb
@@ -179,12 +179,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
-  #   device pnp 0.1 off end
-  #   device pnp 0.2 off end
-  #   device pnp 0.3 off end
-  #   device pnp 0.4 off end
-  #   device pnp 0.5 on end
-  # end
 end
diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb
index 89b6a1ee4f..a6d5206fa7 100644
--- a/src/mainboard/msi/ms9652_fam10/devicetree.cb
+++ b/src/mainboard/msi/ms9652_fam10/devicetree.cb
@@ -166,16 +166,4 @@ chip northbridge/amd/amdfam10/root_complex	# Root complex
       device pci 18.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 on 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 off end			# io
-  # end
 end
diff --git a/src/mainboard/nvidia/l1_2pvv/devicetree.cb b/src/mainboard/nvidia/l1_2pvv/devicetree.cb
index 363d1a8cc1..5709db75eb 100644
--- a/src/mainboard/nvidia/l1_2pvv/devicetree.cb
+++ b/src/mainboard/nvidia/l1_2pvv/devicetree.cb
@@ -177,16 +177,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 on 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 off end			# io
-  # end
 end
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
diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb
index acc508599f..7191e5216f 100644
--- a/src/mainboard/tyan/s2885/devicetree.cb
+++ b/src/mainboard/tyan/s2885/devicetree.cb
@@ -119,14 +119,5 @@ chip northbridge/amd/amdk8/root_complex
 		end
 
 	end #domain
-
-#        chip drivers/generic/debug
-#                device pnp 0.0 off end
-#                device pnp 0.1 off end
-#                device pnp 0.2 off end
-#                device pnp 0.3 off end
-#		device pnp 0.4 off end
-#		device pnp 0.5 on end
-#        end
 end
 
diff --git a/src/mainboard/tyan/s2891/devicetree.cb b/src/mainboard/tyan/s2891/devicetree.cb
index 3d8c65e73a..8442ec8c3f 100644
--- a/src/mainboard/tyan/s2891/devicetree.cb
+++ b/src/mainboard/tyan/s2891/devicetree.cb
@@ -134,15 +134,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 off 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 on  end			# hard_reset
-  # end
 end
diff --git a/src/mainboard/tyan/s2892/devicetree.cb b/src/mainboard/tyan/s2892/devicetree.cb
index af29be13dd..3edc156951 100644
--- a/src/mainboard/tyan/s2892/devicetree.cb
+++ b/src/mainboard/tyan/s2892/devicetree.cb
@@ -137,12 +137,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
-  #   device pnp 0.1 off end
-  #   device pnp 0.2 off end
-  #   device pnp 0.3 off end
-  #   device pnp 0.4 off end
-  #   device pnp 0.5 on end
-  # end
 end
diff --git a/src/mainboard/tyan/s2895/devicetree.cb b/src/mainboard/tyan/s2895/devicetree.cb
index f830505958..4250160b15 100644
--- a/src/mainboard/tyan/s2895/devicetree.cb
+++ b/src/mainboard/tyan/s2895/devicetree.cb
@@ -150,14 +150,4 @@ chip northbridge/amd/amdk8/root_complex		# Root complex
       device pci 19.3 on end
     end
   end
-  # chip drivers/generic/debug
-  #   device pnp 0.0 off end			# chip name
-  #   device pnp 0.1 off 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
-  # end
 end
diff --git a/src/mainboard/tyan/s2912/devicetree.cb b/src/mainboard/tyan/s2912/devicetree.cb
index 57815deb93..42f764a35f 100644
--- a/src/mainboard/tyan/s2912/devicetree.cb
+++ b/src/mainboard/tyan/s2912/devicetree.cb
@@ -135,16 +135,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 on 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 off end			# io
-  # end
 end
diff --git a/src/mainboard/tyan/s2912_fam10/devicetree.cb b/src/mainboard/tyan/s2912_fam10/devicetree.cb
index 0a5475fd60..485c7e0ef9 100644
--- a/src/mainboard/tyan/s2912_fam10/devicetree.cb
+++ b/src/mainboard/tyan/s2912_fam10/devicetree.cb
@@ -138,16 +138,4 @@ chip northbridge/amd/amdfam10/root_complex	# Root complex
       device pci 18.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 on 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 off end			# io
-  # end
 end
diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb
index 151fbc43ed..44da2c29a2 100644
--- a/src/mainboard/tyan/s4882/devicetree.cb
+++ b/src/mainboard/tyan/s4882/devicetree.cb
@@ -192,15 +192,5 @@ chip northbridge/amd/amdk8/root_complex
 		end
 
 	end
-#        chip drivers/generic/debug
-#                device pnp 0.0 off end # chip name
-#                device pnp 0.1 off end # pci_regs_all
-#                device pnp 0.2 off end # mem
-#                device pnp 0.3 on end # cpuid
-#                device pnp 0.4 off end # smbus_regs_all
-#		device pnp 0.5 on end # dual core msr
-#		device pnp 0.6 on end # cache size
-#		device pnp 0.7 on end # tsc
-#        end
 end
 
diff --git a/src/mainboard/winent/mb6047/devicetree.cb b/src/mainboard/winent/mb6047/devicetree.cb
index 09a062ec91..81f5aae625 100644
--- a/src/mainboard/winent/mb6047/devicetree.cb
+++ b/src/mainboard/winent/mb6047/devicetree.cb
@@ -117,15 +117,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 off 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 on  end			# hard_reset
-  # end
 end