[U-Boot-Users] [PATCH] Fix duplicated flash state

[Fathi Boudra]

>
> It's not this patch contents.
>
I'ts related with the previous patch "JFFS2 support on OneNAND"
> Anyway, it should be below.
>
>  static inline void put_fl_mem(void *buf)
>  {
> -#if defined(CONFIG_JFFS2_NAND) && \
> -    defined(CONFIG_CMD_NAND)
> +#if (defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)) || \
> +    defined(CONFIG_CMD_ONENAND)
>        struct mtdids *id = current_part->dev->id;
> +#endif
>
> +#if defined(CONFIG_JFFS2_NAND) && \
> +    defined(CONFIG_CMD_NAND)
>         if (id->type == MTD_DEV_TYPE_NAND)
>                return put_fl_mem_nand(buf);
>  #endif
> +
> +#if defined(CONFIG_CMD_ONENAND)
> +       if (id->type == MTD_DEV_TYPE_ONENAND)
> +               return put_fl_mem_onenand(buf);
> +#endif
>
> Next time it will be clean-uped with next patches.
>

nand_bbt_descr is duplicated:
In file included from /u-boot-1.3.3/include/linux/mtd/onenand.h:21,
                 from jffs2_1pass.c:279:
/u-boot-1.3.3/include/linux/mtd/bbm.h:49: error: redefinition of 'struct
nand_bbt_descr'
make[1]: *** [jffs2_1pass.o] Error 1

It is defined in iinclude/linux/mtd/bbm.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.denx.de/pipermail/u-boot/attachments/20080725/ebc3d331/attachment.htm