board: freescale: p1_p2_rdb_pc: Detect both P2020 SD switch configurations

As written in comment, P2020 has two possible SD switch configurations.
Extend code to detect both of them.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index 1e6dfe87d8b0722b04b04b8011c04696ef241a3c..dde0c1dcd2dfbaa6f35b97a84389d29d4ee5df8d 100644 (file)
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
@@ -216,6 +216,10 @@ int checkboard(void)
        puts("rom_loc: ");
        if ((val & (~__SW_BOOT_MASK)) == __SW_BOOT_SD) {
                puts("sd");
+#ifdef __SW_BOOT_SD2
+       } else if ((val & (~__SW_BOOT_MASK)) == __SW_BOOT_SD2) {
+               puts("sd");
+#endif
 #ifdef __SW_BOOT_SPI
        } else if ((val & (~__SW_BOOT_MASK)) == __SW_BOOT_SPI) {
                puts("spi");

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 81dc0177c0ceb812b6a42e801abdc5748f4a1275..cc703309e3e27499456bae93dda52075c8f3e92b 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -57,7 +57,8 @@
 #define __SW_BOOT_MASK         0x03
 #define __SW_BOOT_NOR          0xc8
 #define __SW_BOOT_SPI          0x28
-#define __SW_BOOT_SD           0x68 /* or 0x18 */
+#define __SW_BOOT_SD           0x68
+#define __SW_BOOT_SD2          0x18
 #define __SW_BOOT_NAND         0xe8
 #define __SW_BOOT_PCIE         0xa8
 #define CONFIG_SYS_L2_SIZE     (512 << 10)