On Dec 1, 2010, at 9:50 AM, <haiying.w...@freescale.com> <haiying.w...@freescale.com> wrote:
> From: Haiying Wang <haiying.w...@freescale.com> > > For some board which doesn't have NOR flash and the QE's firmware(ucode) is > saved in its NAND flash, we don't want call qe_init in cpu_init_r, but will > call it later after nand is initialized. > > Signed-off-by: Haiying Wang <haiying.w...@freescale.com> > --- > arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c > b/arch/powerpc/cpu/mpc85xx/cpu_init.c > index 4b8faa5..eb34378 100644 > --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c > +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c > @@ -369,7 +369,7 @@ int cpu_init_r(void) > > enable_cpc(); > > -#ifdef CONFIG_QE > +#if defined(CONFIG_QE) && !defined(CONFIG_SYS_QE_FW_IN_NAND) > uint qe_base = CONFIG_SYS_IMMR + 0x00080000; /* QE immr base */ > qe_init(qe_base); > qe_reset(); > -- > 1.7.3.1.50.g1e633 Any reason to just not move QE init for everyone? - k _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
