diff options
| author | Qianyu Gong <qianyu.gong@nxp.com> | 2016-06-13 11:20:30 +0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-06-24 08:33:34 -0700 |
| commit | a2fd238e4923d0b0e10d4ca24ad6410244d8ea6c (patch) | |
| tree | a0dd2f61e327f90f75a3774eb67c8ba34b7ad58f | |
| parent | f3acaf438de74a0b278abc71fb2aca7e7aa86ffa (diff) | |
| download | blackbird-obmc-uboot-a2fd238e4923d0b0e10d4ca24ad6410244d8ea6c.tar.gz blackbird-obmc-uboot-a2fd238e4923d0b0e10d4ca24ad6410244d8ea6c.zip | |
armv8: ls1043aqds: fix to get boot device info from FPGA
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>
| -rw-r--r-- | board/freescale/ls1043aqds/ls1043aqds.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 7e47ef0d82..9447c93319 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -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 |
