diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-20 12:23:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-20 12:23:33 -0500 |
| commit | c7819d409ab7671991bf906482b7adcc21266f75 (patch) | |
| tree | eab7a9eba205f31dd1f4b606ec58d64ec5e933f1 /drivers/ddr | |
| parent | c8a1198665b81113535e89c791a7991abe481d62 (diff) | |
| parent | addc376318d765902027021d88f693e95d1e1bcd (diff) | |
| download | u-boot-c7819d409ab7671991bf906482b7adcc21266f75.tar.gz | |
Merge branch '2020-01-17-reduce-size-of-common-h-even-more'
- Bring in Simon Glass's series that reduces what we have in <common.h>
even more.
Diffstat (limited to 'drivers/ddr')
| -rw-r--r-- | drivers/ddr/altera/sdram_agilex.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/altera/sdram_gen5.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/altera/sdram_s10.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/altera/sdram_soc64.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c | 7 |
5 files changed, 9 insertions, 3 deletions
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c index 0cbcd14056..626fb724d4 100644 --- a/drivers/ddr/altera/sdram_agilex.c +++ b/drivers/ddr/altera/sdram_agilex.c @@ -9,6 +9,7 @@ #include <errno.h> #include <div64.h> #include <fdtdec.h> +#include <hang.h> #include <ram.h> #include <reset.h> #include "sdram_soc64.h" diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 435f42bc0a..a3b914fdfc 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -6,6 +6,7 @@ #include <dm.h> #include <errno.h> #include <div64.h> +#include <init.h> #include <ram.h> #include <reset.h> #include <watchdog.h> diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 93c15dd18b..0b36d6c027 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -10,6 +10,8 @@ #include <errno.h> #include <div64.h> #include <fdtdec.h> +#include <hang.h> +#include <init.h> #include <ram.h> #include <reset.h> #include "sdram_s10.h" diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 985a108b1c..e0d04ccca2 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -10,6 +10,7 @@ #include <errno.h> #include <div64.h> #include <fdtdec.h> +#include <hang.h> #include <ram.h> #include <reset.h> #include "sdram_soc64.h" diff --git a/drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c b/drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c index 74417d61b4..9293d54e5a 100644 --- a/drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c +++ b/drivers/ddr/marvell/a38x/ddr3_training_ip_engine.c @@ -6,6 +6,7 @@ #include "ddr3_init.h" #include "mv_ddr_regs.h" #include "ddr_training_ip_db.h" +#include <image.h> #define PATTERN_1 0x55555555 #define PATTERN_2 0xaaaaaaaa @@ -612,9 +613,9 @@ int ddr3_tip_load_pattern_to_odpg(u32 dev_num, enum hws_access_type access_type, MASK_ALL_BITS)); } - CHECK_STATUS(ddr3_tip_if_write - (dev_num, access_type, if_id, - ODPG_DATA_BUFFER_OFFS_REG, load_addr, MASK_ALL_BITS)); + CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type, if_id, + ODPG_DATA_BUFFER_OFFS_REG, + image_load_addr, MASK_ALL_BITS)); return MV_OK; } |