Merge git://git.denx.de/u-boot-sh

14 files changed, 0 insertions, 37 deletions

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 46d7ba9a183..ba0b2fd6715 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -10,9 +10,6 @@
 #ifndef __ALT_H
 #define __ALT_H
 
-#undef DEBUG
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt"
-
 #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 6e7ac0a9055..b49407a8b29 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -9,8 +9,6 @@
 #ifndef __ARMADILLO_800EVA_H
 #define __ARMADILLO_800EVA_H
 
-#undef DEBUG
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
 #define CONFIG_SH_GPIO_PFC
 
 #include <asm/arch/rmobile.h>
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index ae3213f959d..a978f728c9d 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -10,9 +10,6 @@
 #ifndef __BLANCHE_H
 #define __BLANCHE_H
 
-#undef DEBUG
-#define CONFIG_RMOBILE_BOARD_STRING "Blanche"
-
 #include "rcar-gen2-common.h"
 
 /* STACK */
diff --git a/include/configs/draak.h b/include/configs/draak.h
index fef5e2e0118..a5c2210cc95 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 d2d46f0425a..b570ef9115e 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 1f814bfe7ab..3c5c00ae6b7 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -9,9 +9,6 @@
 #ifndef __GOSE_H
 #define __GOSE_H
 
-#undef DEBUG
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose"
-
 #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 ec2162cb803..41cab6d0ef5 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -9,9 +9,6 @@
 #ifndef __KOELSCH_H
 #define __KOELSCH_H
 
-#undef DEBUG
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch"
-
 #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 179c7603f26..dc05db1baf3 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -8,10 +8,7 @@
 #ifndef __KZM9G_H
 #define __KZM9G_H
 
-#undef DEBUG
-
 #define CONFIG_SH73A0
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING	"KMC KZM-A9-GT"
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
 
 #include <asm/arch/rmobile.h>
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 0d9272cfa31..d5d76c2404d 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -10,9 +10,6 @@
 #ifndef __LAGER_H
 #define __LAGER_H
 
-#undef DEBUG
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager"
-
 #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 ba444762f15..491adcdde15 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -11,9 +11,6 @@
 #ifndef __PORTER_H
 #define __PORTER_H
 
-#undef DEBUG
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter"
-
 #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 33624e6c4ea..89e1b20c293 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 465291fffdf..8eac7b8c9b7 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -11,9 +11,6 @@
 #ifndef __SILK_H
 #define __SILK_H
 
-#undef DEBUG
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk"
-
 #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 22e23eb1821..ceed06f13ec 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -12,9 +12,6 @@
 #ifndef __STOUT_H
 #define __STOUT_H
 
-#undef DEBUG
-#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout"
-
 #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 dfd6436b3ca..4d76fd69e56 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 */