u-boot.git/drivers, branch v2014.01-rc2 Unnamed repository; edit this file 'description' to name the repository. Merge branch 'master' of git://git.denx.de/u-boot-video 2013-12-16T14:56:24+00:00 Tom Rini trini@ti.com 2013-12-16T14:30:52+00:00 215ab45a67672a7c1ceb347f7b74c94323415222 






drivers/mtd: descend into sub directories only when it is necessary
2013-12-13T14:18:44+00:00

Masahiro Yamada
yamada.m@jp.panasonic.com

2013-11-28T03:22:17+00:00

392ba5256ab9bf017a9b7320ef0cee98862c908d

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>





Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>







drivers/usb/gadget: select objects by obj-$(CONFIG-...)
2013-12-13T14:18:44+00:00

Masahiro Yamada
yamada.m@jp.panasonic.com

2013-11-28T03:20:14+00:00

4f57a90cfa1872c0142483e426061dca4e3c90c4

Before switching to the real Kbuild, drivers/usb/gadget/Makefile
must be fixed.
If none of CONFIG_USB_GADGET, CONFIG_USB_ETHER, CONFIG_USB_DEVICE
is defined, both obj- and obj-y get empty.

We need non-empty obj- or obj-y on each Makefile
to generate built-in.o on the real Kbuild.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>





Before switching to the real Kbuild, drivers/usb/gadget/Makefile
must be fixed.
If none of CONFIG_USB_GADGET, CONFIG_USB_ETHER, CONFIG_USB_DEVICE
is defined, both obj- and obj-y get empty.

We need non-empty obj- or obj-y on each Makefile
to generate built-in.o on the real Kbuild.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>







serial: lpc32xx: send CR before LF
2013-12-13T14:14:34+00:00

Vladimir Zapolskiy
vz@mleia.com

2013-11-30T14:47:01+00:00

5deccafa1870c4c4eb588ebcc6b4e95c4d7a59f6

For LPC32XX high-speed UART it is required to send a carriage return
symbol along with line feed. The problem was introduced in e503f90a
commit.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Cc: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>





For LPC32XX high-speed UART it is required to send a carriage return
symbol along with line feed. The problem was introduced in e503f90a
commit.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Cc: Marek Vasut <marex@denx.de>
Acked-by: Marek Vasut <marex@denx.de>







net/fman: add ft_fixup_xgec to support 3rd and 4th 10GEC
2013-12-11T19:12:20+00:00

Shengzhou Liu
Shengzhou.Liu@freescale.com

2013-12-02T02:23:11+00:00

732dfe090d50af53bb682d0c8971784f8de1f90f

As mEMAC1 and mEMAC2 are dual-role MACs, which are used as 1G or 10G MAC.
So we update dynamically 'cell-index' to '2' and '3' for 10GEC3 and 10GEC4.
Also change 'fsl,fman-port-1g-rx' to 'fsl,fman-port-10g-rx', ditto for Tx.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>





As mEMAC1 and mEMAC2 are dual-role MACs, which are used as 1G or 10G MAC.
So we update dynamically 'cell-index' to '2' and '3' for 10GEC3 and 10GEC4.
Also change 'fsl,fman-port-1g-rx' to 'fsl,fman-port-10g-rx', ditto for Tx.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>







Merge branch 'master' of git://git.denx.de/u-boot-arm
2013-12-10T22:15:18+00:00

Tom Rini
trini@ti.com

2013-12-10T22:15:18+00:00

4b210ad34282bfd9fc982a8e3c9a9126f4094cdb

Conflicts:
	board/samsung/trats2/trats2.c
	include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>





Conflicts:
	board/samsung/trats2/trats2.c
	include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>







Merge branch 'u-boot/master' into 'u-boot-arm/master'
2013-12-10T21:23:59+00:00

Albert ARIBAUD
albert.u.boot@aribaud.net

2013-12-10T13:31:56+00:00

f15ea6e1d67782a1626d4a4922b6c20e380085e5

Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds





Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds







Merge branch 'spi' of git://git.denx.de/u-boot-x86
2013-12-10T14:36:23+00:00

Tom Rini
trini@ti.com

2013-12-10T14:36:23+00:00

65b7fe28a12bbaccc7a0c076f5f9f213150030e7












Merge branch 'master' of git://git.denx.de/u-boot-mmc
2013-12-10T14:33:13+00:00

Tom Rini
trini@ti.com

2013-12-10T14:33:13+00:00

e1e3de79515b95712a41f52c86a0181530f2fc03












Merge branch 'master' of git://git.denx.de/u-boot-i2c
2013-12-10T14:29:45+00:00

Tom Rini
trini@ti.com

2013-12-10T14:29:45+00:00

76a8265b4f54d1b9cd2b70efb46dcdeaa5d20bfb