u-boot.git, branch v2013.01 Unnamed repository; edit this file 'description' to name the repository. Prepare v2013.01 2013-01-15T21:47:42+00:00 Tom Rini trini@ti.com 2013-01-15T21:47:42+00:00 3a9d879f6f64585b819af728b53be0a05037fe0d Signed-off-by: Tom Rini <trini@ti.com> 
Signed-off-by: Tom Rini <trini@ti.com>
pxa: Save lr register in relocate_code function 2013-01-14T23:22:00+00:00 Łukasz Dałek luk0104@gmail.com 2013-01-12T11:39:27+00:00 df3ad6c81d3c0095879359778a7532160a4a0a30 When u-boot is compiled for PXA25x processor, pxa/start.S is calling cpu_init_crit by BL instruction. BL is overwriting lr register so relocate_code is going into infinite loop. This patch preservs lr register in r12 before calling cpu_init_crit and after function returns restores it. Signed-off-by: Lukasz Dalek <luk0104@gmail.com> Acked-by: Marek Vasut <marex@denx.de> 
When u-boot is compiled for PXA25x processor, pxa/start.S is calling
cpu_init_crit by BL instruction. BL is overwriting lr register so
relocate_code is going into infinite loop. This patch preservs lr
register in r12 before calling cpu_init_crit and after function returns
restores it.

Signed-off-by: Lukasz Dalek <luk0104@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>
Merge branch 'master' of git://git.denx.de/u-boot-video 2013-01-14T22:41:38+00:00 Tom Rini trini@ti.com 2013-01-14T22:41:38+00:00 981481958f98f17089bd3d776f71599756d9b9bd 






Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
2013-01-14T22:30:31+00:00

Tom Rini
trini@ti.com

2013-01-14T22:30:31+00:00

f1972e32559e34290f13654859264da331795ea5












twl4030: fix 'could could' in error messages
2013-01-14T22:22:37+00:00

Peter Meerwald
p.meerwald@bct-electronic.com

2012-11-19T23:13:04+00:00

dfe361098df1e5acac30b53b7c5304cc9251013a

Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>





Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>







watchdog.h: Move hw_watchdog_init prototype to end, guard
2013-01-14T20:10:07+00:00

Tom Rini
trini@ti.com

2013-01-14T20:10:07+00:00

a6720762c88b3dac715af96f80f6a749f0c12133

In commit abbab70 we added a prototype for hw_watchdog_init, in a
Freescale i.MX watchdog driver.  We did not however guard it with an
__ASSEMBLY__ check and broke some platforms.  Move this to the end of
the file with other prototypes and guard it.

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





In commit abbab70 we added a prototype for hw_watchdog_init, in a
Freescale i.MX watchdog driver.  We did not however guard it with an
__ASSEMBLY__ check and broke some platforms.  Move this to the end of
the file with other prototypes and guard it.

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







VIDEO: better document the correct use of CONFIG_FB_ADDR
2013-01-14T19:16:51+00:00

Wolfgang Denk
wd@denx.de

2013-01-03T00:43:59+00:00

44a53b57439dc1f117135b4f8c22d25915096164

Signed-off-by: Wolfgang Denk <wd@denx.de>
cc: Anatolij Gustschin <agust@denx.de>





Signed-off-by: Wolfgang Denk <wd@denx.de>
cc: Anatolij Gustschin <agust@denx.de>







lcd: restore ability to display 8 bpp BMPs on 16 bpp LCDs
2013-01-14T19:16:45+00:00

Nikita Kiryanov
nikita@compulab.co.il

2012-12-20T00:52:34+00:00

dad631ccf720b78201e4b026422bb347fec64f5a

Commit fb6a9aab7ae78c (LCD: display 32bpp decompressed bitmap image)
broke the check that allowed U-Boot to display 8 bpp BMPs on a 16
bpp LCD screen, effectively turning this feature off.

Restore this feature by changing the check back to the same meaning
it originally had.
To avoid future confusion, the check has also been rephrased to make
its meaning clear.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>





Commit fb6a9aab7ae78c (LCD: display 32bpp decompressed bitmap image)
broke the check that allowed U-Boot to display 8 bpp BMPs on a 16
bpp LCD screen, effectively turning this feature off.

Restore this feature by changing the check back to the same meaning
it originally had.
To avoid future confusion, the check has also been rephrased to make
its meaning clear.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>







Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
2013-01-14T16:00:02+00:00

Albert ARIBAUD
albert.u.boot@aribaud.net

2013-01-14T16:00:02+00:00

a17617d6553369ba72c080128ed8d0b0c33dfc89












Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
2013-01-14T14:21:00+00:00

Albert ARIBAUD
albert.u.boot@aribaud.net

2013-01-14T14:21:00+00:00

1199c377cf14c240b903e351ab02b3b2cd3800c6