Woodruff, Richard wrote:
Sorry,
I ran into the build problem long ago and fixed it locally. I was preparing to resubmit a patch with a lot of additions and this one fix....as I was thinking Wolfgang had bypassed it.
I believe the real fix I used was in the driver itself not above. Its much simpler and I think the correct one.
Regards, Richard W.
The File drivers/omap2420_i2c.c needs to look like this:
#include <common.h>
#ifdef CONFIG_DRIVER_OMAP24XX_I2C
#include <asm/arch/i2c.h> #include <asm/io.h>
#define inw(a) __raw_readw(a) #define outw(a,v) __raw_writew(a,v)
previously it WRONGLY looked like:
#include <common.h> #include <asm/arch/i2c.h> #include <asm/io.h>
#define inw(a) __raw_readw(a) #define outw(a,v) __raw_writew(a,v)
#ifdef CONFIG_DRIVER_OMAP24XX_I2C
Agreed. After a bit more testing, I found that there were preprocessor warnings generated due to symbols being defined multiple times between your i2c.h and the omap1510.h (notably inb(), outb() and the like). I came up with pretty much the same solution as you, and am running a MAKEALL test now just to be sure there are no issues this time. Assuming not, I'll re-send just the above changes as a patch to resolve this.
Thanks.
-Cory