]> git.baikalelectronics.ru Git - uboot.git/commit
ddr: marvell: axp: fix array types have different bounds warning
authorMarek Behún <marek.behun@nic.cz>
Sat, 6 Mar 2021 23:00:34 +0000 (00:00 +0100)
committerStefan Roese <sr@denx.de>
Fri, 12 Mar 2021 06:44:21 +0000 (07:44 +0100)
commit131d79d07c26b7031fd9b6861f74a90bb7bab1b4
tree0c28958c7a5e4d15f3074dcc809add7b9f18d583
parentece6f9b5711b0fc9b18c1fa45b1c7eee2ebf3bc8
ddr: marvell: axp: fix array types have different bounds warning

The arrays `pbs_dq_mapping`, `div_ratio1to1` and `div_ratio2to1` have
different bounds declared in header files where these variables are also
defined from the ones declared in source files.

This causes the compiler to complain (when building with LTO):
  ddr3_sdram.c:24:12: warning: type of ‘pbs_dq_mapping’ does not match
                               original declaration
       [-Wlto-type-mismatch]
  ddr3_patterns_64bit.h:911:5: note: array types have different bounds
  ddr3_patterns_64bit.h:911:5: note: ‘pbs_dq_mapping’ was previously
                                     declared here

ddr3_dfs.c:45:11: warning: type of ‘div_ratio1to1’ does not match
                           original declaration [-Wlto-type-mismatch]
ddr3_axp_vars.h:167:4: note: array types have different bounds
ddr3_axp_vars.h:167:4: note: ‘div_ratio1to1’ was previously declared
                             here

ddr3_dfs.c:46:11: warning: type of ‘div_ratio2to1’ does not match
                           original declaration [-Wlto-type-mismatch]
ddr3_axp_vars.h:196:4: note: array types have different bounds
ddr3_axp_vars.h:196:4: note: ‘div_ratio2to1’ was previously declared
                             here

CI managed to trigger this as an error when compiling with LTO for AXP.

Fix this by using values from the header files, which seem to be the
correct ones.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
drivers/ddr/marvell/axp/ddr3_dfs.c
drivers/ddr/marvell/axp/ddr3_sdram.c