diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-28 19:59:05 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-28 19:59:05 (GMT) |
| commit | 44faff24f58859bdc1acf28ac739020b5091678a (patch) | |
| tree | 54833aa6404deed2a2f29ba387fa795cd78da118 /board | |
| parent | 6f0aea39aeb093a404a7dc21a0f79fa75ca851db (diff) | |
| parent | dee01e426b39eac974364c0658fca431894987c3 (diff) | |
| download | u-boot-44faff24f58859bdc1acf28ac739020b5091678a.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/ls1043aqds/ls1043aqds.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 7e47ef0..b7e9c21 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 @@ -232,6 +230,10 @@ int board_early_init_f(void) #ifdef CONFIG_LPUART u8 uart; #endif + +#ifdef CONFIG_SYS_I2C_EARLY_INIT + i2c_early_init_f(); +#endif fsl_lsch2_early_init_f(); #ifdef CONFIG_HAS_FSL_XHCI_USB |