summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut+renesas@gmail.com>2018-05-02 11:51:46 +0200
committerMarek Vasut <marek.vasut+renesas@gmail.com>2018-05-02 11:51:56 +0200
commit699e831e158a5846778d8bd6af054d4276277cb6 (patch)
tree35ead80d7e0d5f69c9b1d46ae7342771a2fd0961 /arch
parent83a64bebe4204d57f6f024f9a31f364c13f4b93e (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-rmobile/board.c5
-rw-r--r--arch/arm/mach-rmobile/include/mach/sys_proto.h5
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c
index bdb353062f..b07dbfabc4 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 326f6b1481..448a0f6d52 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