diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
commit | 1c4b5038afcc7cdb1064713f65571da05aa0de0e (patch) | |
tree | bbb554b1128dc15453a91fc50408446da2e0ddd2 /drivers/ddr | |
parent | 7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (diff) | |
parent | 21fc5a16855602b2fd4b39e40679f854101a0fa3 (diff) |
Merge branch '2020-07-17-misc-fixes'
A large number of assorted fixes, including but not limited to:
- Correct fixdep and CONFIG_IS_ENABLED(...)
- lz4 on big endian
- Assorted LMB hardening
- Remove bd_t typedef
Diffstat (limited to 'drivers/ddr')
-rw-r--r-- | drivers/ddr/altera/sdram_agilex.c | 2 | ||||
-rw-r--r-- | drivers/ddr/altera/sdram_s10.c | 2 | ||||
-rw-r--r-- | drivers/ddr/altera/sdram_soc64.c | 4 | ||||
-rw-r--r-- | drivers/ddr/altera/sdram_soc64.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c index a0f25d1179e..d6e7a175d0d 100644 --- a/drivers/ddr/altera/sdram_agilex.c +++ b/drivers/ddr/altera/sdram_agilex.c @@ -30,7 +30,7 @@ int sdram_mmr_init_full(struct udevice *dev) u32 i; int ret; phys_size_t hw_size; - bd_t bd = {0}; + struct bd_info bd = {0}; /* Ensure HMC clock is running */ if (poll_hmc_clock_status()) { diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 91f76e03c2d..2945f1e1df5 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -76,7 +76,7 @@ int sdram_mmr_init_full(struct udevice *dev) u32 i; int ret; phys_size_t hw_size; - bd_t bd = {0}; + struct bd_info bd = {0}; /* Enable access to DDR from CPU master */ clrbits_le32(CCU_REG_ADDR(CCU_CPU0_MPRT_ADBASE_DDRREG), diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 491f689c44d..8cb75fe02a2 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -132,7 +132,7 @@ void sdram_clear_mem(phys_addr_t addr, phys_size_t size) } } -void sdram_init_ecc_bits(bd_t *bd) +void sdram_init_ecc_bits(struct bd_info *bd) { phys_size_t size, size_init; phys_addr_t start_addr; @@ -176,7 +176,7 @@ void sdram_init_ecc_bits(bd_t *bd) (unsigned int)get_timer(start)); } -void sdram_size_check(bd_t *bd) +void sdram_size_check(struct bd_info *bd) { phys_size_t total_ram_check = 0; phys_size_t ram_check = 0; diff --git a/drivers/ddr/altera/sdram_soc64.h b/drivers/ddr/altera/sdram_soc64.h index 7b25a80ae26..4a830e7ec18 100644 --- a/drivers/ddr/altera/sdram_soc64.h +++ b/drivers/ddr/altera/sdram_soc64.h @@ -179,8 +179,8 @@ int emif_clear(struct altera_sdram_platdata *plat); int emif_reset(struct altera_sdram_platdata *plat); int poll_hmc_clock_status(void); void sdram_clear_mem(phys_addr_t addr, phys_size_t size); -void sdram_init_ecc_bits(bd_t *bd); -void sdram_size_check(bd_t *bd); +void sdram_init_ecc_bits(struct bd_info *bd); +void sdram_size_check(struct bd_info *bd); phys_size_t sdram_calculate_size(struct altera_sdram_platdata *plat); int sdram_mmr_init_full(struct udevice *dev); |