]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
armv8: ls1043aqds: fix to get boot device info from FPGA
authorQianyu Gong <qianyu.gong@nxp.com>
Mon, 13 Jun 2016 03:20:30 +0000 (11:20 +0800)
committerYork Sun <york.sun@nxp.com>
Fri, 24 Jun 2016 15:33:34 +0000 (08:33 -0700)
The LBMAP switches on the board will tell which boot device is used.
Only QSPI boot is supported if the boot device is IFCCard.

Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
board/freescale/ls1043aqds/ls1043aqds.c

index 7e47ef0d82bcbb54eb2ac82f09d1f4b97ae32d4b..9447c93319af05757bec962b4606b5d6bfbb7f58 100644 (file)
@@ -47,7 +47,7 @@ enum {
 int checkboard(void)
 {
        char buf[64];
-#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_QSPI_BOOT)
+#ifndef CONFIG_SD_BOOT
        u8 sw;
 #endif
 
@@ -55,8 +55,6 @@ int checkboard(void)
 
 #ifdef CONFIG_SD_BOOT
        puts("SD\n");
-#elif defined(CONFIG_QSPI_BOOT)
-       puts("QSPI\n");
 #else
        sw = QIXIS_READ(brdcfg[0]);
        sw = (sw & QIXIS_LBMAP_MASK) >> QIXIS_LBMAP_SHIFT;
@@ -67,8 +65,8 @@ int checkboard(void)
                puts("PromJet\n");
        else if (sw == 0x9)
                puts("NAND\n");
-       else if (sw == 0x15)
-               printf("IFCCard\n");
+       else if (sw == 0xF)
+               printf("QSPI\n");
        else
                printf("invalid setting of SW%u\n", QIXIS_LBMAP_SWITCH);
 #endif