ls1012afrwy: Add ls1012afrwy revC board support.

LS1012AFRWY supports three board revisions.
Revision A and B board are collectively identified as revA/B,
Revision C board is identifies as revC.

Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com>
[York S: revised commit message]
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 315da8b866d3703025108d58a1a36793344634b3..5db1027717fe14284aff257c89b88ff8cc40d2aa 100644 (file)
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -24,11 +24,15 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static inline int get_board_version(void)
 {
-       struct ccsr_gpio *pgpio = (void *)(GPIO1_BASE_ADDR);
-       int val;
+       uint32_t val;
+#ifdef CONFIG_TARGET_LS1012AFRDM
+       val = 0;
+#else
+       struct ccsr_gpio *pgpio = (void *)(GPIO2_BASE_ADDR);
 
-       val = in_be32(&pgpio->gpdat);
+       val = in_be32(&pgpio->gpdat) & BOARD_REV_MASK;/*Get GPIO2 11,12,14*/
 
+#endif
        return val;
 }
 
@@ -46,11 +50,11 @@ int checkboard(void)
        puts("Version");
 
        switch (rev) {
-       case BOARD_REV_A:
-               puts(": RevA ");
+       case BOARD_REV_A_B:
+               puts(": RevA/B ");
                break;
-       case BOARD_REV_B:
-               puts(": RevB ");
+       case BOARD_REV_C:
+               puts(": RevC ");
                break;
        default:
                puts(": unknown");
@@ -100,7 +104,7 @@ int dram_init(void)
 #ifdef CONFIG_TARGET_LS1012AFRWY
        board_rev = get_board_version();
 
-       if (board_rev & BOARD_REV_B) {
+       if (board_rev == BOARD_REV_C) {
                mparam.mdctl = 0x05180000;
                gd->ram_size = SYS_SDRAM_SIZE_1024;
        } else {

diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h
index 8129595d519c01c8cfb9f86c7fee15d014fb0d04..e450002e835605094d39adea2e1567e8c0ff7b8b 100644 (file)
--- a/include/configs/ls1012afrwy.h
+++ b/include/configs/ls1012afrwy.h
@@ -9,9 +9,9 @@
 #include "ls1012a_common.h"
 
 /* Board Rev*/
-#define BOARD_REV_A                    0x0
-#define BOARD_REV_B                    0x200
-
+#define BOARD_REV_A_B                  0x0
+#define BOARD_REV_C                    0x00080000
+#define BOARD_REV_MASK                 0x001A0000
 /* DDR */
 #define CONFIG_DIMM_SLOTS_PER_CTLR     1
 #define CONFIG_CHIP_SELECTS_PER_CTRL   1