diff options
| author | Tom Rini <trini@konsulko.com> | 2018-09-29 11:47:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-29 11:47:32 -0400 |
| commit | 27f622d56876f01e11a74b292e52a94451144cff (patch) | |
| tree | 65bc08481bdd26255de948e373e70707dd1e73ab /board/freescale/ls1012afrdm/ls1012afrdm.c | |
| parent | 83f6f608c278d9ac3fda7d0bb05f41c06b397964 (diff) | |
| parent | 26cbc0d663555b8af7d40ecfd0d0fefe960d9686 (diff) | |
| download | u-boot-27f622d56876f01e11a74b292e52a94451144cff.tar.gz | |
Merge tag 'fsl-qoriq-for-v2018.11-rc1' of git://git.denx.de/u-boot-fsl-qoriq
Switch to driver model for eSDHC on Layerscape SoCs including LS1021A,
LS1043A, LS1046A, LS1088A, LS2088A.
Switch to driver model for SATA on LS1021A and LS1043A.
Add support for LS1012AFRWY rev C board.
Enable SMMU for LS1043A.
Diffstat (limited to 'board/freescale/ls1012afrdm/ls1012afrdm.c')
| -rw-r--r-- | board/freescale/ls1012afrdm/ls1012afrdm.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index 315da8b866..5db1027717 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -24,11 +24,15 @@ DECLARE_GLOBAL_DATA_PTR; static inline int get_board_version(void) { - struct ccsr_gpio *pgpio = (void *)(GPIO1_BASE_ADDR); - int val; + uint32_t val; +#ifdef CONFIG_TARGET_LS1012AFRDM + val = 0; +#else + struct ccsr_gpio *pgpio = (void *)(GPIO2_BASE_ADDR); - val = in_be32(&pgpio->gpdat); + val = in_be32(&pgpio->gpdat) & BOARD_REV_MASK;/*Get GPIO2 11,12,14*/ +#endif return val; } @@ -46,11 +50,11 @@ int checkboard(void) puts("Version"); switch (rev) { - case BOARD_REV_A: - puts(": RevA "); + case BOARD_REV_A_B: + puts(": RevA/B "); break; - case BOARD_REV_B: - puts(": RevB "); + case BOARD_REV_C: + puts(": RevC "); break; default: puts(": unknown"); @@ -100,7 +104,7 @@ int dram_init(void) #ifdef CONFIG_TARGET_LS1012AFRWY board_rev = get_board_version(); - if (board_rev & BOARD_REV_B) { + if (board_rev == BOARD_REV_C) { mparam.mdctl = 0x05180000; gd->ram_size = SYS_SDRAM_SIZE_1024; } else { |