On Wed, Dec 19, 2007 at 08:55:47AM +0100, ext arnaud.patard@xxxxxxxxxxx wrote: > > This reverts commit 84a0cb7da8c222b3bf1beac6adea6708d4b8143a. > > ... > > arch/arm/plat-omap/sram.c: In function `is_sram_locked': > > arch/arm/plat-omap/sram.c:95: error: implicit declaration of function > > `ctrl_read_reg' > > arch/arm/plat-omap/sram.c:95: error: `OMAP24XX_CONTROL_STATUS' undeclared > > (first > > use in this function) > > arch/arm/plat-omap/sram.c:95: error: (Each undeclared identifier is > > reported > > only once > > arch/arm/plat-omap/sram.c:95: error: for each function it appears in.) > > arch/arm/plat-omap/sram.c:96: error: `OMAP2_DEVICETYPE_MASK' undeclared > > (first > > use in this function) > > ... > > Comment from Alecrim. > > It causes a compile error with OMAP1, the header ../mach-omap2/control.h > > is not included and the variables OMAP24XX_CONTROL_STATUS and > > OMAP2_DEVICETYPE_MASK are not find. #if defined(CONFIG_ARCH_OMAP242X) > > should not > > be needed here during execute, but it's necessary to remove code related > > to > > OMAP2/3. > > > > Signed-off-by: Francisco Alecrim <francisco.alecrim@xxxxxxxxxxx> > > Signed-off-by: Felipe Balbi <felipe.lima@xxxxxxxxxxx> > > --- > > arch/arm/plat-omap/sram.c | 2 ++ > > 1 files changed, 2 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c > > index c377cb0..afe8181 100644 > > --- a/arch/arm/plat-omap/sram.c > > +++ b/arch/arm/plat-omap/sram.c > > @@ -91,9 +91,11 @@ static int is_sram_locked(void) > > { > > int type = 0; > > > > +#if defined(CONFIG_ARCH_OMAP242X) > > I got the same bug yesterday but I don't have the same fix. > CONFIG_ARCH_OMAP242X doesn't exist at all. imho the right fix is to use > CONFIG_ARCH_OMAP24XX or including asm/arch/control.h directly. > > > if (cpu_is_omap242x()) > > type = (ctrl_read_reg(OMAP24XX_CONTROL_STATUS) & > > OMAP2_DEVICETYPE_MASK); > > +#endif > > > > if (type == GP_DEVICE) { > > /* RAMFW: R/W access to all initiators for all qualifier sets */ > > -- > > 1.5.3.7 > > > > - > > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > > the body of a message to majordomo@xxxxxxxxxxxxxxx > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > -- Best Regards, Felipe Balbi felipe.lima@xxxxxxxxxxx +55 92 2126-1003 INdT - OSMRC - Manaus Core Team - To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html