| Message ID | 1436585927-18677-3-git-send-email-Peng.Fan@freescale.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On 11/07/2015 05:38, Peng Fan wrote: > From: "Ye.Li" <B37916@freescale.com> > > Since the i.MX6QP has fixed the issue in boot ROM, so remove the workaround > for i.MX6QP. > > Signed-off-by: Ye.Li <B37916@freescale.com> > Signed-off-by: Peng Fan <Peng.Fan@freescale.com> > Acked-by: Stefano Babic <sbabic@denx.de> > --- > > Changes v5: > Add Stefano's Acked-by > Changes v4: > none > Changes v3: > none > Changes v2: > none > > arch/arm/cpu/armv7/mx6/hab.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/cpu/armv7/mx6/hab.c b/arch/arm/cpu/armv7/mx6/hab.c > index 87f422d..27cabe4 100644 > --- a/arch/arm/cpu/armv7/mx6/hab.c > +++ b/arch/arm/cpu/armv7/mx6/hab.c > @@ -423,7 +423,8 @@ uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size) > * do cache flushes. don't think any > * exist, so we ignore them. > */ > - writel(1, MX6DQ_PU_IROM_MMU_EN_VAR); > + if (!is_mx6dqp()) > + writel(1, MX6DQ_PU_IROM_MMU_EN_VAR); > } else if (is_cpu_type(MXC_CPU_MX6DL) || > is_cpu_type(MXC_CPU_MX6SOLO)) { > writel(1, MX6DLS_PU_IROM_MMU_EN_VAR); > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/cpu/armv7/mx6/hab.c b/arch/arm/cpu/armv7/mx6/hab.c index 87f422d..27cabe4 100644 --- a/arch/arm/cpu/armv7/mx6/hab.c +++ b/arch/arm/cpu/armv7/mx6/hab.c @@ -423,7 +423,8 @@ uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size) * do cache flushes. don't think any * exist, so we ignore them. */ - writel(1, MX6DQ_PU_IROM_MMU_EN_VAR); + if (!is_mx6dqp()) + writel(1, MX6DQ_PU_IROM_MMU_EN_VAR); } else if (is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO)) { writel(1, MX6DLS_PU_IROM_MMU_EN_VAR);