diff --git a/include/configs/alt.h b/include/configs/alt.h
index 51799bf..ba0b2fd 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -10,8 +10,6 @@
 #ifndef __ALT_H
 #define __ALT_H
 
-#undef DEBUG
-
 #include "rcar-gen2-common.h"
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x4f000000
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 826211a..b49407a 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -9,7 +9,6 @@
 #ifndef __ARMADILLO_800EVA_H
 #define __ARMADILLO_800EVA_H
 
-#undef DEBUG
 #define CONFIG_SH_GPIO_PFC
 
 #include <asm/arch/rmobile.h>
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index e4e61ec..a978f72 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -10,8 +10,6 @@
 #ifndef __BLANCHE_H
 #define __BLANCHE_H
 
-#undef DEBUG
-
 #include "rcar-gen2-common.h"
 
 /* STACK */
diff --git a/include/configs/draak.h b/include/configs/draak.h
index fef5e2e..a5c2210 100644
--- a/include/configs/draak.h
+++ b/include/configs/draak.h
@@ -10,8 +10,6 @@
 #ifndef __DRAAK_H
 #define __DRAAK_H
 
-#undef DEBUG
-
 #include "rcar-gen3-common.h"
 
 /* Ethernet RAVB */
diff --git a/include/configs/eagle.h b/include/configs/eagle.h
index d2d46f0..b570ef9 100644
--- a/include/configs/eagle.h
+++ b/include/configs/eagle.h
@@ -10,8 +10,6 @@
 #ifndef __EAGLE_H
 #define __EAGLE_H
 
-#undef DEBUG
-
 #include "rcar-gen3-common.h"
 
 /* Ethernet RAVB */
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 5b3dce8..3c5c00a 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -9,8 +9,6 @@
 #ifndef __GOSE_H
 #define __GOSE_H
 
-#undef DEBUG
-
 #include "rcar-gen2-common.h"
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x4f000000
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 2571aec..41cab6d 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -9,8 +9,6 @@
 #ifndef __KOELSCH_H
 #define __KOELSCH_H
 
-#undef DEBUG
-
 #include "rcar-gen2-common.h"
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x4f000000
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 4781da7..dc05db1 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -8,8 +8,6 @@
 #ifndef __KZM9G_H
 #define __KZM9G_H
 
-#undef DEBUG
-
 #define CONFIG_SH73A0
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
 
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 4d45d50..d5d76c2 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -10,8 +10,6 @@
 #ifndef __LAGER_H
 #define __LAGER_H
 
-#undef DEBUG
-
 #include "rcar-gen2-common.h"
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x4f000000
diff --git a/include/configs/porter.h b/include/configs/porter.h
index b4aeb54..491adcd 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -11,8 +11,6 @@
 #ifndef __PORTER_H
 #define __PORTER_H
 
-#undef DEBUG
-
 #include "rcar-gen2-common.h"
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x4f000000
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 33624e6..89e1b20 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -10,8 +10,6 @@
 #ifndef __SALVATOR_X_H
 #define __SALVATOR_X_H
 
-#undef DEBUG
-
 #include "rcar-gen3-common.h"
 
 /* Ethernet RAVB */
diff --git a/include/configs/silk.h b/include/configs/silk.h
index afc7faf..8eac7b8 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -11,8 +11,6 @@
 #ifndef __SILK_H
 #define __SILK_H
 
-#undef DEBUG
-
 #include "rcar-gen2-common.h"
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x4f000000
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 1a1a3eb..ceed06f 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -12,8 +12,6 @@
 #ifndef __STOUT_H
 #define __STOUT_H
 
-#undef DEBUG
-
 #include "rcar-gen2-common.h"
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x4f000000
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index dfd6436..4d76fd6 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -10,8 +10,6 @@
 #ifndef __ULCB_H
 #define __ULCB_H
 
-#undef DEBUG
-
 #include "rcar-gen3-common.h"
 
 /* Ethernet RAVB */