| Message ID | 1457074469-9999-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 51244a60805fb91112f61ef268f58fc6d47a3d0a |
| Headers | show |
2016-03-04 15:54 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > The build fails if compiled with CONFIG_CMD_DDRMPHY_DUMP=y since commit > 46abfcc99e04 ("ARM: uniphier: rework struct uniphier_board_data"). > > Fixes: 46abfcc99e04 ("ARM: uniphier: rework struct uniphier_board_data") > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied to u-boot-uniphier/master. -- Best Regards Masahiro Yamada _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c index c18f099..7ac9378 100644 --- a/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c +++ b/arch/arm/mach-uniphier/dram/cmd_ddrmphy.c @@ -28,28 +28,14 @@ static int get_nr_ch(void) { const struct uniphier_board_data *bd = uniphier_get_board_param(); - return bd->dram_ch2_width ? 3 : 2; + return bd->dram_ch[2].size ? 3 : 2; } static int get_nr_datx8(int ch) { - unsigned int width; - const struct uniphier_board_data *bd = uniphier_get_board_param(); - switch (ch) { - case 0: - width = bd->dram_ch0_width; - break; - case 1: - width = bd->dram_ch1_width; - break; - default: - width = bd->dram_ch2_width; - break; - } - - return width / 8; + return bd->dram_ch[ch].width / 8; } static void print_bdl(void __iomem *reg, int n)
The build fails if compiled with CONFIG_CMD_DDRMPHY_DUMP=y since commit 46abfcc99e04 ("ARM: uniphier: rework struct uniphier_board_data"). Fixes: 46abfcc99e04 ("ARM: uniphier: rework struct uniphier_board_data") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/mach-uniphier/dram/cmd_ddrmphy.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot