[U-Boot] [RFC, PATCH v3 0/3] mtd, ubi, ubifs: resync with Linux-3.14

[Tom Rini]

On Wed, Jun 11, 2014 at 09:20:10AM +0200, Heiko Schocher wrote:

> resync mtd, ubi and ubifs subsystem with linux:
> 
> commit 455c6fdbd219161bd09b1165f11699d6d73de11c
> Author: Linus Torvalds <torvalds at linux-foundation.org>
> Date:   Sun Mar 30 20:40:15 2014 -0700
> 
>     Linux 3.14
> 
> Main reason for this sync is, we now have UBI fastmap support
> in U-Boot.
> 
> Tested it on am33xx, imx6 and mpc83xx boards. MAKEALL for arm and powerpc
> compiles clean.

It blows up other arches however:
blackfin/m68k/nds32/sparc/x86 is:
In file included from /home/trini/work/u-boot/u-boot/include/nand.h:37:0,
                 from /home/trini/work/u-boot/u-boot/common/cmd_bootm.c:75:
/home/trini/work/u-boot/u-boot/include/linux/compat.h:77:18: error: redefinition of typedef ‘gfp_t’
/home/trini/work/u-boot/u-boot/include/linux/types.h:142:30: note: previous declaration of ‘gfp_t’ was here
microblaze/mips is:
In file included from /home/trini/work/u-boot/u-boot/arch/microblaze/include/asm
/bitops.h:9:0,
                 from /home/trini/work/u-boot/u-boot/include/linux/bitops.h:110,
                 from /home/trini/work/u-boot/u-boot/include/common.h:20,
                 from /home/trini/work/u-boot/u-boot/include/ubi_uboot.h:17,
                 from /home/trini/work/u-boot/u-boot/drivers/mtd/mtdcore.c:33:
/home/trini/work/u-boot/u-boot/arch/microblaze/include/asm/system.h:126:0: warning: "smp_rmb" redefined [enabled by default]
/home/trini/work/u-boot/u-boot/include/linux/compat.h:157:0: note: this is the location of the previous definition

I can test if you shoot me a private branch or just patches to git am,
but x86 isn't too hard to test (esp if you grab the patches that were posted
so that your 64bit host toolchain can be used) and I know ELDK supports
MIPS :)

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140612/46a85b85/attachment.pgp>