ARM: rmobile: Contain CONFIG_ARCH_RMOBILE_BOARD_STRING

Pull the symbol from the boards and zap struct rmobile_sysinfo as they
are rather useless. The entire purpose of that whole machinery was to
print board name in the CONFIG_ARCH_RMOBILE_BOARD_STRING. Do that in a
far simpler and more contained manner.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c
index bdb353062fe02220ba42c7eb4f597ffc71c9a050..b07dbfabc4a92d4021f04ad05780d2415c6faefd 100644 (file)
--- 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 326f6b14815afbfa77c97c0b8ad0b78cdb99c913..448a0f6d522db5a9650d35de72d7579f94d0f71e 100644 (file)
--- 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 abe69abcc8db6aca5eb303eca6b68184f51afcb4..d95ba7b8bfe4ae636b2268c5fa268f41067ba8b5 100644 (file)
--- 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 a284721cfde05dfd9e28b3c48a4485fee980ed8c..4a791a3c57f1928ea6e2eb67e65f8035f682ddeb 100644 (file)
--- 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 7598b1a4b92b698827e790cef44e85b517b8f970..4b783b06166ef3ecbbe0e44e82f6adbd5426e265 100644 (file)
--- 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 3ce633c8a24192c4c046efe6fc5e8cbf429e55c8..5edcdac13e3f07bc501b9024493ca5e919e5a07b 100644 (file)
--- 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_ARCH_RMOBILE_BOARD_STRING
-};
-
 void reset_cpu(ulong addr)
 {
 }

diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index c9209701dd3f251409200d36eaf2d368c7ee363f..e8d39a293abae1b352a033672d70379a53c4d5f4 100644 (file)
--- 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 4a4007b7a364ab4b4e672f708853a08c8e7f0b98..cd07f50e5b925525c640eb517fafb534b67eb7ec 100644 (file)
--- 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 505efb5bc467f55ec627c0b2bfd5ea728c6485d3..586c6c3842edcedebf4b2064fa2cc414a251e66a 100644 (file)
--- 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 eb66bc903e35d0e6e5e559e1e91d79b7d5a25588..fcf4ff90f02c694193b027c7a22e8045021babd5 100644 (file)
--- 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 c932c255a084ba49348121f36cd4dcd31ba76b84..a50a4ed3a1fc36652fe8e0e71f846197b2c73b85 100644 (file)
--- 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 192ee66a382fa5ec2b1d891ba903c8d062f9efe3..c40daf56230599b936842026559134ef461e13d6 100644 (file)
--- 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;