armv8/ls2085a: Avoid hard-coding for board name print

LS2085A supports 6 personalities i.e. LS2045AE, LS2045A, LS2080AE,
LS2080A, LS2085AE and LS2085A personlities.

Instead of hard-coding, board name should change as per selected
personality.

Signed-off-by: Prabhakar Kushwaha <prabhakar at freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>

diff --git a/board/freescale/ls2085aqds/ls2085aqds.c b/board/freescale/ls2085aqds/ls2085aqds.c
index 6a22122ca02d0cd13cae4f91b7b84015b45eb243..27a23ec75180166eba7f4d8626455f7e0dfd155a 100644 (file)
--- a/board/freescale/ls2085aqds/ls2085aqds.c
+++ b/board/freescale/ls2085aqds/ls2085aqds.c
@@ -49,11 +49,15 @@ int checkboard(void)
                                            "100 separate SSCG"};
        int clock;
 
+       cpu_name(buf);
+       printf("Board: %s-QDS, ", buf);
+
        sw = QIXIS_READ(arch);
-       printf("Board: %s, ", CONFIG_IDENT_STRING);
        printf("Board Arch: V%d, ", sw >> 4);
        printf("Board version: %c, boot from ", (sw & 0xf) + 'A' - 1);
 
+       memset((u8 *)buf, 0x00, ARRAY_SIZE(buf));
+
        sw = QIXIS_READ(brdcfg[0]);
        sw = (sw & QIXIS_LBMAP_MASK) >> QIXIS_LBMAP_SHIFT;
 

diff --git a/board/freescale/ls2085ardb/ls2085ardb.c b/board/freescale/ls2085ardb/ls2085ardb.c
index ff4b6a04015eeaca1b6a17cfb719505545391b2c..5f2532802119973db7b78082465be8c6b36e533f 100644 (file)
--- a/board/freescale/ls2085ardb/ls2085ardb.c
+++ b/board/freescale/ls2085ardb/ls2085ardb.c
@@ -52,9 +52,12 @@ unsigned long long get_qixis_addr(void)
 int checkboard(void)
 {
        u8 sw;
+       char buf[15];
+
+       cpu_name(buf);
+       printf("Board: %s-RDB, ", buf);
 
        sw = QIXIS_READ(arch);
-       printf("Board: %s, ", CONFIG_IDENT_STRING);
        printf("Board Arch: V%d, ", sw >> 4);
        printf("Board version: %c, boot from ", (sw & 0xf) + 'A');
 

diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h
index c9f323639a0a3764830091554331e91fbd5f282a..da730671a0c1fc3b8ffd6ca4d39e8db6a8b2a1a7 100644 (file)
--- a/include/configs/ls2085aqds.h
+++ b/include/configs/ls2085aqds.h
@@ -9,9 +9,6 @@
 
 #include "ls2085a_common.h"
 
-#define CONFIG_IDENT_STRING            " LS2085A-QDS"
-#define CONFIG_BOOTP_VCI_STRING                "U-boot.LS2085A-QDS"
-
 #define CONFIG_DISPLAY_BOARDINFO
 
 #ifndef __ASSEMBLY__

diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h
index dd5505b5eb650276433e407d1f4c3dcace7d87c4..ccb85d0179dcafd485dfa546ca60f79025783697 100644 (file)
--- a/include/configs/ls2085ardb.h
+++ b/include/configs/ls2085ardb.h
@@ -8,8 +8,6 @@
 #define __LS2_RDB_H
 
 #include "ls2085a_common.h"
-#define CONFIG_IDENT_STRING            " LS2085A-RDB"
-#define CONFIG_BOOTP_VCI_STRING                "U-boot.LS2085A-RDB"
 
 #undef CONFIG_CONS_INDEX
 #define CONFIG_CONS_INDEX       2