Message ID | 20130329151800.05142e0f@crub |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Fri, Mar 29, 2013 at 03:18:00PM +0100, Anatolij Gustschin wrote: > Hello Tom, > > The following changes since commit 009d75ccc11d27b9a083375a88bb93cb746b4800: > > Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28 18:50:01 +0100) > > are available in the git repository at: > > git://git.denx.de/u-boot-video.git master > > Anatolij Gustschin (2): > Merge branch 'for-v2013.04' > video: bcm2835: fix build issues > > Andre Renaud (1): > Fix bitmap offsets for non 8-bit LCDs > > Jeroen Hofstee (10): > lcd, amba: remove this driver since it is not used > lcd, tegra: remove unused cursor functions > lcd, mpc8xx: move the mpc8xx driver to drivers/video > lcd, pxafb: move the pxafb to drivers/video > common/lcd.c: cleanup use of global variables > common/lcd.c: remove global lcd_base > common/lcd: cosmetic: clean up a bit > lcd, fb: remove duplicated prototypes and unused code > api/api_display: use the getters for console size info > common/lcd.c: move the macro's to the c file > > Matthias Weisser (1): > video: Fix splash screen alignment > > Wolfgang Denk (1): > common/lcd.c: cleanup use of global variables > > api/api_display.c | 4 +- > arch/arm/cpu/pxa/Makefile | 1 - > arch/powerpc/cpu/mpc8xx/Makefile | 1 - > board/cm_t35/display.c | 8 - > board/mcc200/lcd.c | 24 +--- > common/lcd.c | 143 ++++++++++++-------- > drivers/video/Makefile | 3 +- > drivers/video/amba.c | 79 ----------- > drivers/video/atmel_hlcdfb.c | 10 -- > drivers/video/atmel_lcdfb.c | 10 -- > drivers/video/bcm2835.c | 11 -- > drivers/video/cfb_console.c | 14 +- > drivers/video/exynos_fb.c | 16 +-- > .../cpu/mpc8xx/lcd.c => drivers/video/mpc8xx_lcd.c | 61 +-------- > .../arm/cpu/pxa/pxafb.c => drivers/video/pxa_lcd.c | 43 ------ > drivers/video/tegra.c | 66 +--------- > include/configs/R360MPI.h | 1 + > include/configs/RBC823.h | 1 + > include/configs/RPXlite_DW.h | 1 + > include/configs/RRvision.h | 4 +- > include/configs/TQM823L.h | 1 + > include/configs/TQM823M.h | 1 + > include/configs/lubbock.h | 1 + > include/configs/lwmon.h | 1 + > include/configs/palmld.h | 1 + > include/configs/palmtc.h | 1 + > include/configs/pxa255_idp.h | 1 + > include/configs/svm_sc8xx.h | 1 + > include/configs/v37.h | 1 + > include/configs/zipitz2.h | 1 + > include/lcd.h | 74 +++-------- > 31 files changed, 138 insertions(+), 447 deletions(-) > delete mode 100644 drivers/video/amba.c > rename arch/powerpc/cpu/mpc8xx/lcd.c => drivers/video/mpc8xx_lcd.c (92%) > rename arch/arm/cpu/pxa/pxafb.c => drivers/video/pxa_lcd.c (93%) Applied to u-boot/master, thanks!