On Sun October 7 2012 13:13:36 Sylwester Nawrocki wrote: > On 10/07/2012 03:19 AM, Michael West wrote: > > This patch changes versions.txt and disables VIDEO_M5MOLS which > > fixed the build for my 3.2 kernel but looking at the logs it looks > > like this is not the way to fix it as it's not just a 3.6+ problem > > as it does not build on 3.6 as well... So probably best to find > > why it doesn't build on the current kernel first. > > To fix the build on kernels 3.6+ <linux/sizes.h> just needs to be > inclcuded in m5mols.h. This is what my patch from previous message > in this thread does. But this will break again on kernel versions > _3.5 and lower_ where <linux/sizes.h> doesn't exist. I thought > originally it could have been simply replaced there with <asm/sizes.h>, > but not all architectures have it > > $ git grep "#define SZ_1M" v2.6.32 > v2.6.32:arch/arm/include/asm/sizes.h:#define SZ_1M 0x00100000 > v2.6.32:arch/sh/include/asm/sizes.h:#define SZ_1M 0x00100000 > > $ git grep "#define SZ_1M" v3.6-rc5 > v3.6-rc5:drivers/base/dma-contiguous.c:#define SZ_1M (1 << 20) > v3.6-rc5:include/linux/sizes.h:#define SZ_1M 0x00100000 > > > Let's just use the below patch to solve this build break, this way > there is no need to touch anything at media_build. > > From 11adc6956f3fe87c897aa6add08f8437422969a8 Mon Sep 17 00:00:00 2001 > From: Sylwester Nawrocki <sylvester.nawrocki@xxxxxxxxx> > Date: Sun, 7 Oct 2012 13:04:37 +0200 > Subject: [PATCH] m5mols: Replace SZ_1M with explicit value > > SZ_1M macro definition was introduced in commit ab7ef22419927 > "[media] m5mols: Implement .get_frame_desc subdev callback" > but required <linux/sizes.h> header was not included. To prevent > build errors with older kernels where <linux/sizes.h> doesn't exist > use explicit value rather than SZ_1M. > > Reported-by: Jan Hoogenraad <jan-conceptronic@xxxxxxxxxxxxxx> > Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@xxxxxxxxx> Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx> Note: until this patch is merged I am disabling this driver in media_build since right now it doesn't compile at all. Please notify me when this is fixed in media_tree.git so that I can enable it again. Regards, Hans > --- > drivers/media/i2c/m5mols/m5mols.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/i2c/m5mols/m5mols.h b/drivers/media/i2c/m5mols/m5mols.h > index 4ab8b37..30654f5 100644 > --- a/drivers/media/i2c/m5mols/m5mols.h > +++ b/drivers/media/i2c/m5mols/m5mols.h > @@ -24,7 +24,7 @@ > * determined by CAPP_JPEG_SIZE_MAX register. > */ > #define M5MOLS_JPEG_TAGS_SIZE 0x20000 > -#define M5MOLS_MAIN_JPEG_SIZE_MAX (5 * SZ_1M) > +#define M5MOLS_MAIN_JPEG_SIZE_MAX (5 * 1024 * 1024) > > extern int m5mols_debug; > > > --- > > v4l/versions.txt | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/v4l/versions.txt b/v4l/versions.txt > > index 328651e..349695c 100644 > > --- a/v4l/versions.txt > > +++ b/v4l/versions.txt > > @@ -4,6 +4,8 @@ > > [3.6.0] > > # needs devm_clk_get, clk_enable, clk_disable > > VIDEO_CODA > > +# broken add reason here > > +VIDEO_M5MOLS > > This was supposed to be under [3.5.0]. > > > > > [3.4.0] > > # needs devm_regulator_bulk_get > > -- 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
