diff options
author | Dirk Eibach <eibach@gdsys.de> | 2012-04-26 03:54:23 +0000 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2012-04-30 15:01:03 +0200 |
commit | b19bf8344f2098bcc7746ef641c4c69f5aa7eb65 (patch) | |
tree | 3130d5892bd0b10bc9e8dbed269fe8de0d79b325 /board/gdsys/405ep/iocon.c | |
parent | 6e9e6c36a6a52562edb3e3b93cbad33f9dfe5585 (diff) | |
download | talos-obmc-uboot-b19bf8344f2098bcc7746ef641c4c69f5aa7eb65.tar.gz talos-obmc-uboot-b19bf8344f2098bcc7746ef641c4c69f5aa7eb65.zip |
powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes
Print fpga info at last_stage_init on gdsys 405ep boards.
Use dtt_init() to startup fans.
Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/gdsys/405ep/iocon.c')
-rw-r--r-- | board/gdsys/405ep/iocon.c | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/board/gdsys/405ep/iocon.c b/board/gdsys/405ep/iocon.c index ed27791c3a..0ffdb381d1 100644 --- a/board/gdsys/405ep/iocon.c +++ b/board/gdsys/405ep/iocon.c @@ -74,8 +74,24 @@ enum { */ int checkboard(void) { - char buf[64]; - int i = getenv_f("serial#", buf, sizeof(buf)); + char *s = getenv("serial#"); + + puts("Board: "); + + puts("IoCon"); + + if (s != NULL) { + puts(", serial# "); + puts(s); + } + + puts("\n"); + + return 0; +} + +static void print_fpga_info(void) +{ ihs_fpga_t *fpga = (ihs_fpga_t *) CONFIG_SYS_FPGA_BASE(0); u16 versions = in_le16(&fpga->versions); u16 fpga_version = in_le16(&fpga->fpga_version); @@ -100,16 +116,6 @@ int checkboard(void) feature_carriers = (fpga_features & 0x000c) >> 2; feature_video_channels = fpga_features & 0x0003; - printf("Board: "); - - printf("IoCon"); - - if (i > 0) { - puts(", serial# "); - puts(buf); - } - puts("\n "); - switch (unit_type) { case UNITTYPE_MAIN_USER: printf("Mainchannel"); @@ -210,12 +216,12 @@ int checkboard(void) printf(", %d carrier(s)", feature_carriers); printf(", %d video channel(s)\n", feature_video_channels); - - return 0; } int last_stage_init(void) { + print_fpga_info(); + return osd_probe(0); } |