diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-04 09:46:57 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-04 14:19:26 +0100 |
| commit | 2f054d3d3bb0e3536bd4c635a65677fa0a3a3c6c (patch) | |
| tree | d3157bd41ae69e64c161358e2d24661a459f4cd1 /arch | |
| parent | 2d13b856604bd9486f5190438e695d0708dc5017 (diff) | |
| download | barebox-2f054d3d3bb0e3536bd4c635a65677fa0a3a3c6c.tar.gz barebox-2f054d3d3bb0e3536bd4c635a65677fa0a3a3c6c.tar.xz | |
ddr_spd: Update from U-Boot
This updates the ddr_spd.h header file from U-Boot-2019.01 with some
small changes:
- typedefs are removed
- "_s" suffix from struct types removed
- remove unnecessary "extern" from function declarations
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/ddr-8xxx/ddr2_dimm_params.c | 6 | ||||
| -rw-r--r-- | arch/ppc/ddr-8xxx/ddr3_dimm_params.c | 10 | ||||
| -rw-r--r-- | arch/ppc/include/asm/fsl_ddr_sdram.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/arch/ppc/ddr-8xxx/ddr2_dimm_params.c b/arch/ppc/ddr-8xxx/ddr2_dimm_params.c index cc7f3fa6ba..22c05ca6da 100644 --- a/arch/ppc/ddr-8xxx/ddr2_dimm_params.c +++ b/arch/ppc/ddr-8xxx/ddr2_dimm_params.c @@ -190,13 +190,13 @@ uint32_t compute_dimm_parameters(const generic_spd_eeprom_t *spdin, struct dimm_params_s *pdimm) { - const struct ddr2_spd_eeprom_s *spd = spdin; - uint32_t retval; + const struct ddr2_spd_eeprom *spd = spdin; + int retval; if (spd->mem_type != SPD_MEMTYPE_DDR2) goto error; - retval = ddr2_spd_checksum_pass(spd); + retval = ddr2_spd_check(spd); if (retval) goto error; diff --git a/arch/ppc/ddr-8xxx/ddr3_dimm_params.c b/arch/ppc/ddr-8xxx/ddr3_dimm_params.c index d510c5b265..4f44925ab9 100644 --- a/arch/ppc/ddr-8xxx/ddr3_dimm_params.c +++ b/arch/ppc/ddr-8xxx/ddr3_dimm_params.c @@ -50,7 +50,7 @@ * 010 16bits * 011 32bits */ -static uint64_t compute_ranksize(const struct ddr3_spd_eeprom_s *spd) +static uint64_t compute_ranksize(const struct ddr3_spd_eeprom *spd) { uint64_t bsize; int sdram_cap_bsize = 0, prim_bus_width = 0, sdram_width = 0; @@ -78,14 +78,14 @@ uint32_t compute_dimm_parameters(const generic_spd_eeprom_t *spdin, struct dimm_params_s *pdimm) { - const struct ddr3_spd_eeprom_s *spd = spdin; - uint32_t retval, mtb_ps; - int ftb_tmp; + const struct ddr3_spd_eeprom *spd = spdin; + uint32_t mtb_ps; + int retval, ftb_tmp; if (spd->mem_type != SPD_MEMTYPE_DDR3) goto error; - retval = ddr3_spd_checksum_pass(spd); + retval = ddr3_spd_check(spd); if (retval) goto error; diff --git a/arch/ppc/include/asm/fsl_ddr_sdram.h b/arch/ppc/include/asm/fsl_ddr_sdram.h index 2c45608e5d..f4732389f6 100644 --- a/arch/ppc/include/asm/fsl_ddr_sdram.h +++ b/arch/ppc/include/asm/fsl_ddr_sdram.h @@ -32,10 +32,10 @@ #define FSL_DDR_MIN_TCKE_PULSE_WIDTH_DDR (3) #if defined(CONFIG_FSL_DDR2) -typedef struct ddr2_spd_eeprom_s generic_spd_eeprom_t; +typedef struct ddr2_spd_eeprom generic_spd_eeprom_t; #define FSL_SDRAM_TYPE SDRAM_TYPE_DDR2 #elif defined(CONFIG_FSL_DDR3) -typedef struct ddr3_spd_eeprom_s generic_spd_eeprom_t; +typedef struct ddr3_spd_eeprom generic_spd_eeprom_t; #define FSL_SDRAM_TYPE SDRAM_TYPE_DDR3 #endif |