Message ID | 52D5049B.7080009@denx.de |
---|---|
State | Accepted |
Delegated to: | Albert ARIBAUD |
Headers | show |
Hi Stefano, On Tue, 14 Jan 2014 10:34:19 +0100, Stefano Babic <sbabic@denx.de> wrote: > Hi Albert, > > please pull from u-boot-imx, thanks. > > The following changes since commit 4b0561d84198f8d696fd51cfc27aeac8c7482a8c: > > Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' > (2014-01-06 09:32:42 +0100) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to a6bbee66197759f790de83181924bf1d2cf482b2: > > mx6slevk: Include "mx6_common.h" (2014-01-13 11:52:28 +0100) > > ---------------------------------------------------------------- > Christian Gmeiner (1): > imx6: make use of lldiv(..) > > Fabio Estevam (7): > wandboard: Return from cpu_eth_init() directly > titanium: Return from cpu_eth_init() directly > mx6qarm2: Remove unneeded error message when cpu_eth_init() fails > mx6qsabreauto: Return from cpu_eth_init() directly > mx6sabresd: Return from cpu_eth_init() directly > mx6slevk: Return from cpu_eth_init() directly > mx6slevk: Include "mx6_common.h" > > John Weber (1): > wandboard: Set default environment to use zImage > > Otavio Salvador (1): > mx6sabresd: Add eMMC specific environment to allow U-Boot update > > arch/arm/cpu/armv7/mx6/clock.c | 3 ++- > board/barco/titanium/titanium.c | 8 +------- > board/freescale/mx6qarm2/mx6qarm2.c | 7 ++----- > board/freescale/mx6qsabreauto/mx6qsabreauto.c | 8 +------- > board/freescale/mx6sabresd/mx6sabresd.c | 8 +------- > board/freescale/mx6slevk/mx6slevk.c | 10 +--------- > board/wandboard/wandboard.c | 8 +------- > include/configs/mx6sabre_common.h | 23 > +++++++++++++++++++++++ > include/configs/mx6sabresd.h | 2 ++ > include/configs/mx6slevk.h | 1 + > include/configs/wandboard.h | 20 ++++++++++---------- > 11 files changed, 45 insertions(+), 53 deletions(-) > > Applied to u-boot-arm/master, thanks! Amicalement,