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>
lime2-spi
Marek Vasut 6 years ago
parent 83a64bebe4
commit 699e831e15
  1. 5
      arch/arm/mach-rmobile/board.c
  2. 5
      arch/arm/mach-rmobile/include/mach/sys_proto.h
  3. 4
      board/atmark-techno/armadillo-800eva/armadillo-800eva.c
  4. 4
      board/kmc/kzm9g/kzm9g.c
  5. 4
      board/renesas/alt/alt.c
  6. 4
      board/renesas/blanche/blanche.c
  7. 4
      board/renesas/gose/gose.c
  8. 4
      board/renesas/koelsch/koelsch.c
  9. 4
      board/renesas/lager/lager.c
  10. 4
      board/renesas/porter/porter.c
  11. 4
      board/renesas/silk/silk.c
  12. 4
      board/renesas/stout/stout.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

@ -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

@ -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;

@ -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;

@ -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;

@ -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)
{
}

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

@ -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;

Loading…
Cancel
Save