| Message ID | 1457949427-6173-1-git-send-email-Qianyu.Gong@nxp.com |
|---|---|
| State | Accepted |
| Commit | a2fd238e4923d0b0e10d4ca24ad6410244d8ea6c |
| Headers | show |
Please ignore this patch.. sent out for mistake:( > -----Original Message----- > From: Gong Qianyu [mailto:Qianyu.Gong@nxp.com] > Sent: Monday, March 14, 2016 5:57 PM > To: u-boot@lists.denx.de; york sun <york.sun@nxp.com>; Mingkai Hu > <mingkai.hu@nxp.com> > Cc: oss@buserror.net; Qianyu Gong <qianyu.gong@nxp.com> > Subject: [PATCH 1/2] armv8/ls1043aqds: fix print info for QSPI boot > > according to the Reference manual. > > Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> > --- > board/freescale/ls1043aqds/ls1043aqds.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/board/freescale/ls1043aqds/ls1043aqds.c > b/board/freescale/ls1043aqds/ls1043aqds.c > index a72fe52..bd73e4f 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 > -- > 2.1.0.27.g96db324
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index a72fe52..bd73e4f 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
according to the Reference manual. Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> --- board/freescale/ls1043aqds/ls1043aqds.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)