aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-rmobile/Kconfig.324
-rw-r--r--arch/arm/mach-rmobile/board.c5
-rw-r--r--arch/arm/mach-rmobile/include/mach/sys_proto.h5
-rw-r--r--board/atmark-techno/armadillo-800eva/armadillo-800eva.c4
-rw-r--r--board/kmc/kzm9g/kzm9g.c4
-rw-r--r--board/renesas/alt/alt.c4
-rw-r--r--board/renesas/blanche/blanche.c4
-rw-r--r--board/renesas/gose/gose.c4
-rw-r--r--board/renesas/koelsch/koelsch.c4
-rw-r--r--board/renesas/lager/lager.c4
-rw-r--r--board/renesas/porter/porter.c4
-rw-r--r--board/renesas/silk/silk.c4
-rw-r--r--board/renesas/stout/stout.c4
-rw-r--r--configs/alt_defconfig1
-rw-r--r--configs/armadillo-800eva_defconfig1
-rw-r--r--configs/blanche_defconfig1
-rw-r--r--configs/gose_defconfig1
-rw-r--r--configs/koelsch_defconfig1
-rw-r--r--configs/kzm9g_defconfig1
-rw-r--r--configs/lager_defconfig1
-rw-r--r--configs/porter_defconfig1
-rw-r--r--configs/silk_defconfig1
-rw-r--r--configs/stout_defconfig1
-rw-r--r--doc/README.rmobile76
-rw-r--r--drivers/clk/renesas/r8a7792-cpg-mssr.c2
-rw-r--r--include/configs/alt.h3
-rw-r--r--include/configs/armadillo-800eva.h2
-rw-r--r--include/configs/blanche.h3
-rw-r--r--include/configs/draak.h2
-rw-r--r--include/configs/eagle.h2
-rw-r--r--include/configs/gose.h3
-rw-r--r--include/configs/koelsch.h3
-rw-r--r--include/configs/kzm9g.h3
-rw-r--r--include/configs/lager.h3
-rw-r--r--include/configs/porter.h3
-rw-r--r--include/configs/salvator-x.h2
-rw-r--r--include/configs/silk.h3
-rw-r--r--include/configs/stout.h3
-rw-r--r--include/configs/ulcb.h2
-rw-r--r--scripts/config_whitelist.txt2
40 files changed, 48 insertions, 133 deletions
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32
index 84c1a6d..1ceb329 100644
--- a/arch/arm/mach-rmobile/Kconfig.32
+++ b/arch/arm/mach-rmobile/Kconfig.32
@@ -1,5 +1,9 @@
if RCAR_32
+config ARCH_RMOBILE_BOARD_STRING
+ string "Renesas RCar Gen2 board name"
+ default "Board"
+
config RCAR_GEN2
bool "Renesas RCar Gen2"
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c
index bdb3530..b07dbfa 100644
--- a/arch/arm/mach-rmobile/board.c
+++ b/arch/arm/mach-rmobile/board.c
@@ -6,12 +6,11 @@
*/
#include <common.h>
#include <asm/io.h>
-#include <asm/arch/sys_proto.h>
-#ifndef CONFIG_RCAR_GEN3
+#ifdef CONFIG_ARCH_RMOBILE_BOARD_STRING
int checkboard(void)
{
- printf("Board: %s\n", sysinfo.board_string);
+ printf("Board: %s\n", CONFIG_ARCH_RMOBILE_BOARD_STRING);
return 0;
}
#endif
diff --git a/arch/arm/mach-rmobile/include/mach/sys_proto.h b/arch/arm/mach-rmobile/include/mach/sys_proto.h
index 326f6b1..448a0f6 100644
--- a/arch/arm/mach-rmobile/include/mach/sys_proto.h
+++ b/arch/arm/mach-rmobile/include/mach/sys_proto.h
@@ -8,9 +8,4 @@
#ifndef _SYS_PROTO_H_
#define _SYS_PROTO_H_
-struct rmobile_sysinfo {
- char *board_string;
-};
-extern const struct rmobile_sysinfo sysinfo;
-
#endif
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index abe69ab..d95ba7b 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -314,10 +314,6 @@ int dram_init(void)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
int board_late_init(void)
{
return 0;
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index a284721..4a791a3 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -348,10 +348,6 @@ int board_init(void)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
int dram_init(void)
{
gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 7598b1a..4b783b0 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -106,10 +106,6 @@ int board_phy_config(struct phy_device *phydev)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
void reset_cpu(ulong addr)
{
struct udevice *dev;
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 5dc3073..5edcdac 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -468,10 +468,6 @@ int dram_init(void)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_RMOBILE_BOARD_STRING
-};
-
void reset_cpu(ulong addr)
{
}
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index c920970..e8d39a2 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -111,10 +111,6 @@ int board_phy_config(struct phy_device *phydev)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
void reset_cpu(ulong addr)
{
struct udevice *dev;
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index 4a4007b..cd07f50 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -113,10 +113,6 @@ int board_phy_config(struct phy_device *phydev)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
void reset_cpu(ulong addr)
{
struct udevice *dev;
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 505efb5..586c6c3 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -122,10 +122,6 @@ int board_phy_config(struct phy_device *phydev)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
void reset_cpu(ulong addr)
{
struct udevice *dev;
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index eb66bc9..fcf4ff9 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -111,10 +111,6 @@ int board_phy_config(struct phy_device *phydev)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
void reset_cpu(ulong addr)
{
struct udevice *dev;
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index c932c25..a50a4ed 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -106,10 +106,6 @@ int board_phy_config(struct phy_device *phydev)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
void reset_cpu(ulong addr)
{
struct udevice *dev;
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 192ee66..c40daf5 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -125,10 +125,6 @@ int board_phy_config(struct phy_device *phydev)
return 0;
}
-const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
enum env_location env_get_location(enum env_operation op, int prio)
{
const u32 load_magic = 0xb33fc0de;
diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 8249961..b0b864c 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Alt"
CONFIG_R8A7794=y
CONFIG_TARGET_ALT=y
CONFIG_SPL_SERIAL_SUPPORT=y
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 2c212e2..753077b 100644
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
# CONFIG_SYS_THUMB_BUILD is not set
CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_TEXT_BASE=0xE80C0000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Armadillo-800EVA Board"
CONFIG_R8A7740=y
CONFIG_TARGET_ARMADILLO_800EVA=y
CONFIG_BOOTDELAY=3
diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index d9c08e1..bd5fcca 100644
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_TEXT_BASE=0x00000000
CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Blanche"
CONFIG_R8A7792=y
CONFIG_TARGET_BLANCHE=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot"
diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index 3c6a4bd..8479887 100644
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Gose"
CONFIG_R8A7793=y
CONFIG_TARGET_GOSE=y
CONFIG_SPL_SERIAL_SUPPORT=y
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index f182666..faca596 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Koelsch"
CONFIG_R8A7791=y
CONFIG_TARGET_KOELSCH=y
CONFIG_SPL_SERIAL_SUPPORT=y
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index f34fe9b..af93185 100644
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
# CONFIG_SYS_THUMB_BUILD is not set
CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="KMC KZM-A9-GT"
CONFIG_TARGET_KZM9G=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index 1071da2..901b34e 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Lager"
CONFIG_R8A7790=y
CONFIG_TARGET_LAGER=y
CONFIG_SPL_SERIAL_SUPPORT=y
diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index 64b064d..b04627e 100644
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Porter"
CONFIG_R8A7791=y
CONFIG_TARGET_PORTER=y
CONFIG_SPL_SERIAL_SUPPORT=y
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 4cb1179..c163e82 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Silk"
CONFIG_R8A7794=y
CONFIG_TARGET_SILK=y
CONFIG_SPL_SERIAL_SUPPORT=y
diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 4f5ebfa..d940932 100644
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_ARCH_RMOBILE_BOARD_STRING="Stout"
CONFIG_R8A7790=y
CONFIG_TARGET_STOUT=y
CONFIG_SPL_SERIAL_SUPPORT=y
diff --git a/doc/README.rmobile b/doc/README.rmobile
index c65cbab..f1bca54 100644
--- a/doc/README.rmobile
+++ b/doc/README.rmobile
@@ -7,13 +7,36 @@ family contains an ARM Cortex-A9/A53/A57.
Currently the following boards are supported:
-* KMC KZM-A9-GT [3]
-* Atmark-Techno Armadillo-800-EVA [4]
-* Renesas Electronics Lager
-* Renesas Electronics Koelsch
-* Renesas Electronics Salvator-X M3
-* Renesas Electronics Salvator-XS H3 ES2.0+
-* Renesas Electronics ULCB M3 / H3 ES2.0+
+| SoC | Board | defconfig
+|===============+========================================+===================
+| R8A73A0 | KMC KZM-A9-GT [3] | kzm9g_config
+| R8A7734 | Atmark-Techno Armadillo-800-EVA [4] | armadillo-800eva_config
+|===============+========================================+===================
+| R8A7790 H2 | Renesas Electronics Lager | lager_defconfig
+| | Renesas Electronics Stout | stout_defconfig
+|---------------+----------------------------------------+-------------------
+| R8A7791 M2-W | Renesas Electronics Koelsch | koelsch_defconfig
+| | Renesas Electronics Porter | porter_defconfig
+|---------------+----------------------------------------+-------------------
+| R8A7792 V2H | Renesas Electronics Blanche | blanche_defconfig
+|---------------+----------------------------------------+-------------------
+| R8A7793 M2-N | Renesas Electronics Gose | gose_defconfig
+|---------------+----------------------------------------+-------------------
+| R8A7794 E2 | Renesas Electronics Alt | alt_defconfig
+| | Renesas Electronics Silk | silk_defconfig
+|===============+========================================+===================
+| R8A7795 H3 | Renesas Electronics Salvator-XS ES2.0+ | r8a7795_salvator-x_defconfig
+| R8A7795 H3 | Renesas Electronics ULCB ES2.0+ | r8a7795_ulcb
+|---------------+----------------------------------------+-------------------
+| R8A7796 M3-W | Renesas Electronics Salvator-X | r8a7796_salvator-x_defconfig
+| R8A7796 M3-W | Renesas Electronics ULCB | r8a7796_ulcb
+|---------------+----------------------------------------+-------------------
+| R8A77965 M3-N | Renesas Electronics Salvator-XS | r8a77965_salvator-x_defconfig
+|---------------+----------------------------------------+-------------------
+| R8A77970 V3M | Renesas Electronics Eagle | r8a77970_eagle_defconfig
+|---------------+----------------------------------------+-------------------
+| R8A77995 D3 | Renesas Electronics Draak | r8a77995_draak_defconfig
+'===============+========================================+===================
Toolchain
=========
@@ -30,49 +53,14 @@ in their package feeds.
Build
=====
-* KZM-A9-GT
+Locate defconfig in the table above. Then apply standard build procedure:
- make kzm9g_config
- make
-
-* Armadillo-800-EVA
-
- make armadillo-800eva_config
+ make <board>_defconfig
make
Note: Armadillo-800-EVA's U-Boot supports booting from SDcard only.
Please see "B.2 Appendix B Boot Specifications" in hardware manual.
-* Lager
-
- make lager_config
- make
-
-* Koelsch
-
- make koelsch_config
- make
-
-* Salvator-X M3
-
- make r8a7796_salvator-x_defconfig
- make
-
-* Salvator-XS H3 ES2.0
-
- make r8a7795_salvator-x_defconfig
- make
-
-* ULCB M3
-
- make r8a7796_ulcb_defconfig
- make
-
-* ULCB H3 ES2.0
-
- make r8a7795_ulcb_defconfig
- make
-
Links
=====
diff --git a/drivers/clk/renesas/r8a7792-cpg-mssr.c b/drivers/clk/renesas/r8a7792-cpg-mssr.c
index 4ba18b1..46dd3c9 100644
--- a/drivers/clk/renesas/r8a7792-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7792-cpg-mssr.c
@@ -214,10 +214,8 @@ static const struct cpg_mssr_info r8a7792_cpg_mssr_info = {
.mstp_table = r8a7792_mstp_table,
.mstp_table_size = ARRAY_SIZE(r8a7792_mstp_table),
.reset_node = "renesas,r8a7792-rst",
- .extal_usb_node = "usb_extal",
.mod_clk_base = MOD_CLK_BASE,
.clk_extal_id = CLK_EXTAL,
- .clk_extal_usb_id = CLK_USB_EXTAL,
.pll0_div = 2,
.get_pll_config = r8a7792_get_pll_config,
};
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 46d7ba9..ba0b2fd 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 6e7ac0a..b49407a 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 ae3213f..a978f72 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 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 1f814bf..3c5c00a 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 ec2162c..41cab6d 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 179c760..dc05db1 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 0d9272c..d5d76c2 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 ba44476..491adcd 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 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 465291f..8eac7b8 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 22e23eb..ceed06f 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 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 */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bbc44e3..bdbfcbe 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -43,7 +43,6 @@ CONFIG_ARCH_KIRKWOOD
CONFIG_ARCH_MAP_SYSMEM
CONFIG_ARCH_OMAP4
CONFIG_ARCH_ORION5X
-CONFIG_ARCH_RMOBILE_BOARD_STRING
CONFIG_ARCH_RMOBILE_EXTRAM_BOOT
CONFIG_ARCH_TEGRA
CONFIG_ARCH_USE_BUILTIN_BSWAP
@@ -1674,7 +1673,6 @@ CONFIG_REVISION_TAG
CONFIG_RFSPART
CONFIG_RIO
CONFIG_RMII
-CONFIG_RMOBILE_BOARD_STRING
CONFIG_RMSTP0_ENA
CONFIG_RMSTP10_ENA
CONFIG_RMSTP11_ENA