diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-09 09:45:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-09 09:45:32 -0400 |
| commit | 16f416661ec5ffa46b3f879a0b83907bbec13714 (patch) | |
| tree | 4674f10254e3d773b39a21552c108214795dddec /board/compulab | |
| parent | 01c5075506afcb7a74e0db8600af8979f45881b5 (diff) | |
| parent | d4ee5043f36e7a418c3fb5be2e76eb5f6ee2cd9f (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/compulab')
| -rw-r--r-- | board/compulab/cm_fx6/cm_fx6.c | 6 | ||||
| -rw-r--r-- | board/compulab/cm_fx6/spl.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 566c19b4c99..28e9a8f41ff 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -588,7 +588,7 @@ struct node_info nodes[] = { /* * Both entries target the same flash chip. The st,m25p compatible * is used in the vendor device trees, while upstream uses (the - * documented) jedec,spi-nor comptatible. + * documented) jedec,spi-nor compatible. */ { "st,m25p", MTD_DEV_TYPE_NOR, }, { "jedec,spi-nor", MTD_DEV_TYPE_NOR, }, @@ -616,6 +616,8 @@ int ft_board_setup(void *blob, bd_t *bd) enetaddr, 6, 1); } + fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); + baseboard_rev = cl_eeprom_get_board_rev(0); err = cl_eeprom_get_product_name((uchar *)baseboard_name, 0); if (err || baseboard_rev == 0) @@ -630,8 +632,6 @@ int ft_board_setup(void *blob, bd_t *bd) NULL, 0, 1); } - fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); - return 0; } #endif diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c index d8328fdadd3..9442d098201 100644 --- a/board/compulab/cm_fx6/spl.c +++ b/board/compulab/cm_fx6/spl.c @@ -107,6 +107,8 @@ static struct mx6_ddr_sysinfo cm_fx6_sysinfo_s = { .mif3_mode = 3, .rst_to_cke = 0x23, .sde_to_rst = 0x10, + .refsel = 1, /* Refresh cycles at 32KHz */ + .refr = 7, /* 8 refresh commands per refresh cycle */ }; static struct mx6_ddr3_cfg cm_fx6_ddr3_cfg_s = { @@ -174,6 +176,8 @@ static struct mx6_ddr_sysinfo cm_fx6_sysinfo_q = { .mif3_mode = 3, .rst_to_cke = 0x23, .sde_to_rst = 0x10, + .refsel = 1, /* Refresh cycles at 32KHz */ + .refr = 7, /* 8 refresh commands per refresh cycle */ }; static struct mx6_ddr3_cfg cm_fx6_ddr3_cfg_q = { |