| Message ID | 1386105419-20358-1-git-send-email-yorksun@freescale.com |
|---|---|
| State | Accepted |
| Delegated to: | York Sun |
| Headers | show |
Hello York. On Tue, 3 Dec 2013 13:16:59 -0800 York Sun <yorksun@freescale.com> wrote: > MPC8349 has been using mpc85xx DDR driver through a symbolic link to > mpc85xx_ddr_gen2.c. After consolidating the drivers to a single set > under driver/ddr/fsl/, the link is replaced by referring driver > directly. We now can simply enable the macro and use the driver. > Other mpc83xx SoCs still use their own driver. > > Signed-off-by: York Sun <yorksun@freescale.com> > --- > This patch also fixes the issue addressed by this > http://patchwork.ozlabs.org/patch/296086/ I'm happy with your patch. Thanks! Please take it and discard my patch. Best Regards Masahiro Yamada
On 12/03/2013 05:28 PM, Masahiro Yamada wrote: > Hello York. > > > On Tue, 3 Dec 2013 13:16:59 -0800 > York Sun <yorksun@freescale.com> wrote: > >> MPC8349 has been using mpc85xx DDR driver through a symbolic link to >> mpc85xx_ddr_gen2.c. After consolidating the drivers to a single set >> under driver/ddr/fsl/, the link is replaced by referring driver >> directly. We now can simply enable the macro and use the driver. >> Other mpc83xx SoCs still use their own driver. >> >> Signed-off-by: York Sun <yorksun@freescale.com> >> --- >> This patch also fixes the issue addressed by this >> http://patchwork.ozlabs.org/patch/296086/ > > > I'm happy with your patch. Thanks! > > Please take it and discard my patch. > > Thanks. Applied to u-boot-mpc85xx/master. York
diff --git a/arch/powerpc/cpu/mpc83xx/Makefile b/arch/powerpc/cpu/mpc83xx/Makefile index c345dd6..cf91162 100644 --- a/arch/powerpc/cpu/mpc83xx/Makefile +++ b/arch/powerpc/cpu/mpc83xx/Makefile @@ -38,9 +38,7 @@ obj-$(CONFIG_OF_LIBFDT) += fdt.o # Stub implementations of cache management functions for USB obj-y += cache.o -ifdef CONFIG_SYS_FSL_DDR2 -obj-$(CONFIG_MPC8349) += $(SRCTREE)/drivers/ddr/fsl/mpc85xx_ddr_gen2.o -else +ifndef CONFIG_SYS_FSL_DDRC_GEN2 obj-y += spd_sdram.o endif obj-$(CONFIG_SYS_FSL_DDR2) += law.o diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index a80a696..0374841 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -67,6 +67,7 @@ */ #define CONFIG_SYS_FSL_DDR2 #ifdef CONFIG_SYS_FSL_DDR2 +#define CONFIG_SYS_FSL_DDRC_GEN2 #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS1 0x52 #define SPD_EEPROM_ADDRESS2 0x51
MPC8349 has been using mpc85xx DDR driver through a symbolic link to mpc85xx_ddr_gen2.c. After consolidating the drivers to a single set under driver/ddr/fsl/, the link is replaced by referring driver directly. We now can simply enable the macro and use the driver. Other mpc83xx SoCs still use their own driver. Signed-off-by: York Sun <yorksun@freescale.com> --- This patch also fixes the issue addressed by this http://patchwork.ozlabs.org/patch/296086/ arch/powerpc/cpu/mpc83xx/Makefile | 4 +--- include/configs/MPC8349EMDS.h | 1 + 2 files changed, 2 insertions(+), 3 deletions(-)