diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-24 13:42:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-24 13:42:03 -0400 |
| commit | fc15b9beed05dec6cc092c265042381a0eadb0e9 (patch) | |
| tree | 2b256906815661689177279d7cd23e30827c377b /board/freescale/ls1043aqds | |
| parent | 2ee490a0245b65826a8ce8e42e34c9bf805d3656 (diff) | |
| parent | bc323b3fa7cbf1008f02d342c0505231961b5fa6 (diff) | |
| download | u-boot-imx-fc15b9beed05dec6cc092c265042381a0eadb0e9.zip u-boot-imx-fc15b9beed05dec6cc092c265042381a0eadb0e9.tar.gz u-boot-imx-fc15b9beed05dec6cc092c265042381a0eadb0e9.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'board/freescale/ls1043aqds')
| -rw-r--r-- | board/freescale/ls1043aqds/ddr.c | 1 | ||||
| -rw-r--r-- | board/freescale/ls1043aqds/ddr.h | 2 | ||||
| -rw-r--r-- | board/freescale/ls1043aqds/ls1043aqds.c | 12 |
3 files changed, 3 insertions, 12 deletions
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/freescale/ls1043aqds/ddr.c index 3d3c533..0fd835d 100644 --- a/board/freescale/ls1043aqds/ddr.c +++ b/board/freescale/ls1043aqds/ddr.c @@ -116,6 +116,7 @@ phys_size_t initdram(int board_type) dram_size = fsl_ddr_sdram(); #endif + erratum_a008850_post(); #ifdef CONFIG_FSL_DEEP_SLEEP fsl_dp_ddr_restore(); diff --git a/board/freescale/ls1043aqds/ddr.h b/board/freescale/ls1043aqds/ddr.h index 8adb660..d3f4082 100644 --- a/board/freescale/ls1043aqds/ddr.h +++ b/board/freescale/ls1043aqds/ddr.h @@ -7,6 +7,8 @@ #ifndef __DDR_H__ #define __DDR_H__ +extern void erratum_a008850_post(void); + struct board_specific_parameters { u32 n_ranks; u32 datarate_mhz_high; diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index fba6b88..ca393e8 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -307,14 +307,6 @@ int misc_init_r(void) int board_init(void) { - struct ccsr_cci400 *cci = (struct ccsr_cci400 *) - CONFIG_SYS_CCI400_ADDR; - - /* Set CCI-400 control override register to enable barrier - * transaction */ - out_le32(&cci->ctrl_ord, - CCI400_CTRLORD_EN_BARRIER); - select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); board_retimer_init(); @@ -325,10 +317,6 @@ int board_init(void) #ifdef CONFIG_LAYERSCAPE_NS_ACCESS enable_layerscape_ns_access(); #endif - -#ifdef CONFIG_ENV_IS_NOWHERE - gd->env_addr = (ulong)&default_environment[0]; -#endif return 0; } |