diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index bb127852ad119c23336673497a1c2a3f58c5295d..e1338cdf41319e87790d8c3a82547f37a2f26fdb 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -9,7 +9,6 @@
 #ifndef __MIGO_R_H
 #define __MIGO_R_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7722	1
 #define CONFIG_MIGO_R		1
 
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 9a4d2c9923c5bb5b32f1b4003cd7a2ccfd063693..6e39868fb5162023920875974eba30bb6945bf26 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -10,7 +10,6 @@
 #ifndef __AP325RXA_H
 #define __AP325RXA_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7723	1
 #define CONFIG_AP325RXA	1
 
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index 93205aa74b527f65f341559b6ebfb756350ce446..d2d9770b05f3228e3f26e9d244c929ac0a028645 100644
--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -9,7 +9,6 @@
 #ifndef __AP_SH4A_4A_H
 #define __AP_SH4A_4A_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7734	1
 #define CONFIG_AP_SH4A_4A	1
 #define CONFIG_400MHZ_MODE	1
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index e1e3c78366b0bd5fc74f1efbdbc5038aacd25680..19514b68ac53bf9f071c75bcac2bf09cca6c97c2 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -22,7 +22,6 @@
  *  0x1800_0000  MFI              16bit
  */
 
-#undef DEBUG
 #define CONFIG_CPU_SH7724	1
 #define CONFIG_BOARD_LATE_INIT		1
 #define CONFIG_ECOVEC		1
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index 055200368328fae65e05cc99c6c007b0428016c6..2ae9e028104383ca10820d5a58c4a61493fe1e70 100644
--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -9,7 +9,6 @@
 #ifndef __R0P7734_H
 #define __R0P7734_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7734	1
 #define CONFIG_R0P7734		1
 #define CONFIG_400MHZ_MODE	1
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 21bfe724ae74cdc409d9fe957fb59f3dc94a9453..a0e0c1cbff922b3968952072e07a0552779b1c34 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -1,8 +1,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef DEBUG
-
 #define CONFIG_CPU_SH7751	1
 #define CONFIG_CPU_SH_TYPE_R	1
 #define CONFIG_R2DPLUS		1
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 42d51354f576e912b56c9df1fa27771ac1ae0e1a..9812bc83393617ae9b0317924e592599b5512966 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -10,7 +10,6 @@
 #ifndef __R7780RP_H
 #define __R7780RP_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7780	1
 #define CONFIG_R7780MP		1
 #define CONFIG_SYS_R7780MP_OLD_FLASH	1
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index 9db73d3249d2eeb0f58a345f40627ba9f8f63a1e..2eb9d31e65417d7d14820b4b44f76b74b50bb414 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -10,7 +10,6 @@
 #ifndef __RSK7203_H
 #define __RSK7203_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7203	1
 #define CONFIG_RSK7203	1
 
diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 3f9fb7bc0280b3a1af432534626cd0b56f5c953b..55dd2c4f3e46b7f3675faef5a877747b586f69eb 100644
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -11,7 +11,6 @@
 #ifndef __RSK7264_H
 #define __RSK7264_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7264	1
 #define CONFIG_RSK7264		1
 
diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index b7f361be2548167413bfb8b6222436ad6f5865b8..ec7a99b004090f2720aeffefe298aa7d7f6afb4c 100644
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -10,7 +10,6 @@
 #ifndef __RSK7269_H
 #define __RSK7269_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7269	1
 #define CONFIG_RSK7269		1
 
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 23c830048306c3735072cf81befc942d2949f4a9..4f99856dbc68c66474664ffd93e3d07bf25788bf 100644
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -9,7 +9,6 @@
 #ifndef __SH7752EVB_H
 #define __SH7752EVB_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7752	1
 #define CONFIG_SH7752EVB	1
 
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 9c601b5a7d0aafdf513ae1f581bdacdb81bd6c0c..e2ef2d59af25243caab5b0afc5cc65a82f74010a 100644
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -9,7 +9,6 @@
 #ifndef __SH7753EVB_H
 #define __SH7753EVB_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7753	1
 #define CONFIG_SH7753EVB	1
 
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 8345e539d15c1b31a9ab180738afd1f51eb11e42..a5a9396293e8c6d7ee07db2c1056c6f1a3dd8fad 100644
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -9,7 +9,6 @@
 #ifndef __SH7757LCR_H
 #define __SH7757LCR_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7757	1
 #define CONFIG_SH7757LCR	1
 #define CONFIG_SH7757LCR_DDR_ECC	1
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index a49e839463b8c9e2751d3cd3a9f83202fde831fb..926efbe6d71d134421cfdcc50bf85bdf72e66d5c 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -9,7 +9,6 @@
 #ifndef __SH7785LCR_H
 #define __SH7785LCR_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7785	1
 #define CONFIG_SH7785LCR	1