| Message ID | 1338399488-2095-2-git-send-email-steve@sakoman.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Steve, [snip] > --- > arch/arm/cpu/armv7/omap4/sdram_elpida.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/cpu/armv7/omap4/sdram_elpida.c > b/arch/arm/cpu/armv7/omap4/sdram_elpida.c > index b538960..0599aaa 100644 > --- a/arch/arm/cpu/armv7/omap4/sdram_elpida.c > +++ b/arch/arm/cpu/armv7/omap4/sdram_elpida.c > @@ -46,6 +46,9 @@ > * - emif_get_device_timings() > */ > > +/* Dummy registers for OMAP44xx */ > +const u32 ext_phy_ctrl_const_base[EMIF_EXT_PHY_CTRL_CONST_REG]; > + > #ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS > > static const struct emif_regs emif_regs_elpida_200_mhz_2cs = { > @@ -90,9 +93,6 @@ const struct emif_regs emif_regs_elpida_400_mhz_2cs = { > .emif_ddr_phy_ctlr_1 = 0x049ff418 > }; > > -/* Dummy registers for OMAP44xx */ > -const u32 ext_phy_ctrl_const_base[EMIF_EXT_PHY_CTRL_CONST_REG]; > - > const struct dmm_lisa_map_regs lisa_map_2G_x_1_x_2 = { > .dmm_lisa_map_0 = 0xFF020100, > .dmm_lisa_map_1 = 0, In fact ext phy registers are not required for OMAP4 at all. Just posted a patch to fix this. http://marc.info/?l=u-boot&m=133881742422888&w=2 Thanks, Sricharan
diff --git a/arch/arm/cpu/armv7/omap4/sdram_elpida.c b/arch/arm/cpu/armv7/omap4/sdram_elpida.c index b538960..0599aaa 100644 --- a/arch/arm/cpu/armv7/omap4/sdram_elpida.c +++ b/arch/arm/cpu/armv7/omap4/sdram_elpida.c @@ -46,6 +46,9 @@ * - emif_get_device_timings() */ +/* Dummy registers for OMAP44xx */ +const u32 ext_phy_ctrl_const_base[EMIF_EXT_PHY_CTRL_CONST_REG]; + #ifdef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS static const struct emif_regs emif_regs_elpida_200_mhz_2cs = { @@ -90,9 +93,6 @@ const struct emif_regs emif_regs_elpida_400_mhz_2cs = { .emif_ddr_phy_ctlr_1 = 0x049ff418 }; -/* Dummy registers for OMAP44xx */ -const u32 ext_phy_ctrl_const_base[EMIF_EXT_PHY_CTRL_CONST_REG]; - const struct dmm_lisa_map_regs lisa_map_2G_x_1_x_2 = { .dmm_lisa_map_0 = 0xFF020100, .dmm_lisa_map_1 = 0,
ext_phy_ctrl_const_base is currently only defined if CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS is set. If not set, the following error occurs: In function `do_sdram_init': | arch/arm/cpu/armv7/omap-common/emif-common.c:985: undefined reference to `ext_phy_ctrl_const_base' Signed-off-by: Steve Sakoman <steve@sakoman.com> --- arch/arm/cpu/armv7/omap4/sdram_elpida.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)