From 699e831e158a5846778d8bd6af054d4276277cb6 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 2 May 2018 11:51:46 +0200 Subject: [PATCH] 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 Cc: Nobuhiro Iwamatsu --- arch/arm/mach-rmobile/board.c | 5 ++--- arch/arm/mach-rmobile/include/mach/sys_proto.h | 5 ----- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 4 ---- board/kmc/kzm9g/kzm9g.c | 4 ---- board/renesas/alt/alt.c | 4 ---- board/renesas/blanche/blanche.c | 4 ---- board/renesas/gose/gose.c | 4 ---- board/renesas/koelsch/koelsch.c | 4 ---- board/renesas/lager/lager.c | 4 ---- board/renesas/porter/porter.c | 4 ---- board/renesas/silk/silk.c | 4 ---- board/renesas/stout/stout.c | 4 ---- 12 files changed, 2 insertions(+), 48 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 #include -#include -#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 diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index abe69abcc8..d95ba7b8bf 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 a284721cfd..4a791a3c57 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 7598b1a4b9..4b783b0616 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 3ce633c8a2..5edcdac13e 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_ARCH_RMOBILE_BOARD_STRING -}; - void reset_cpu(ulong addr) { } diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index c9209701dd..e8d39a293a 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 4a4007b7a3..cd07f50e5b 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 505efb5bc4..586c6c3842 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 eb66bc903e..fcf4ff90f0 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 c932c255a0..a50a4ed3a1 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 192ee66a38..c40daf5623 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; -- 2.25.1