Skip to contentSkip to conversation

Pull request: u-boot-video/master

U-Boot Applied Anatolij Gustschin 2 participants 2 messages Nov 15, 2011 – Nov 16, 2011

lore
Share & tools
lore
#0 lore raw

Hello Wolfgang,

The following changes since commit 5721385b187b3154c7768e6c182501022f4e2e45:

Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx (2011-11-08 07:44:52 +0100)

are available in the git repository at:

git://git.denx.de/u-boot-video.git master

Che-Liang Chiou (4):
lcd: add clear and draw bitmap declaration
tools: logo: split bmp arrays from bmp_logo.h
font: split font data from video_font.h
api: export LCD device to external apps

Jerry Huang (1):

      Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug

Stefano Babic (1):
VIDEO: mx3fb: GCC4.6 fix build warnings

 Makefile                        |    1 +
 api/Makefile                    |    3 +-
 api/api.c                       |   47 +
 api/api_display.c               |   74 +
 api/api_private.h               |    4 +
 arch/powerpc/cpu/mpc8xx/video.c |    1 +
 board/mcc200/lcd.c              |    4 +-
 common/cmd_bmp.c                |    4 +-
 common/lcd.c                    |   18 +-
 drivers/video/cfb_console.c     |    2 +
 drivers/video/fsl_diu_fb.c      |    2 +
 drivers/video/mx3fb.c           |    3 +-
 drivers/video/sed156x.c         |    1 +
 examples/api/demo.c             |   31 +
 examples/api/glue.c             |   31 +
 examples/api/glue.h             |    5 +
 include/.gitignore              |    1 +
 include/api_public.h            |   16 +
 include/lcd.h                   |    2 +
 include/video_font.h            | 4614 +--------------------------------------
 include/video_font_data.h       | 4639 +++++++++++++++++++++++++++++++++++++++
 tools/Makefile                  |    8 +-
 tools/bmp_logo.c                |   80 +-
 23 files changed, 4944 insertions(+), 4647 deletions(-)
 create mode 100644 api/api_display.c
 create mode 100644 include/video_font_data.h

Please pull. Thanks!

Anatolij

#1 lore raw

Dear Anatolij Gustschin,

Quoted 40 lines · In message <20111116000607.43a91f9b@wker> you wrote:

Hello Wolfgang,

The following changes since commit 5721385b187b3154c7768e6c182501022f4e2e45:

Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx (2011-11-08 07:44:52 +0100)

are available in the git repository at:

git://git.denx.de/u-boot-video.git master

Che-Liang Chiou (4):
lcd: add clear and draw bitmap declaration
tools: logo: split bmp arrays from bmp_logo.h
font: split font data from video_font.h
api: export LCD device to external apps

Jerry Huang (1):

      Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug

Stefano Babic (1):
VIDEO: mx3fb: GCC4.6 fix build warnings

 Makefile                        |    1 +
 api/Makefile                    |    3 +-
 api/api.c                       |   47 +
 api/api_display.c               |   74 +
 api/api_private.h               |    4 +
 arch/powerpc/cpu/mpc8xx/video.c |    1 +
 board/mcc200/lcd.c              |    4 +-
 common/cmd_bmp.c                |    4 +-
 common/lcd.c                    |   18 +-
 drivers/video/cfb_console.c     |    2 +
 drivers/video/fsl_diu_fb.c      |    2 +
 drivers/video/mx3fb.c           |    3 +-
 drivers/video/sed156x.c         |    1 +
 examples/api/demo.c             |   31 +
 examples/api/glue.c             |   31 +
 examples/api/glue.h             |    5 +
 include/.gitignore              |    1 +
 include/api_public.h            |   16 +
Quoted 8 lines
 include/lcd.h                   |    2 +
 include/video_font.h            | 4614 +--------------------------------------
 include/video_font_data.h       | 4639 +++++++++++++++++++++++++++++++++++++++
 tools/Makefile                  |    8 +-
 tools/bmp_logo.c                |   80 +-
 23 files changed, 4944 insertions(+), 4647 deletions(-)
 create mode 100644 api/api_display.c
 create mode 100644 include/video_font_data.h

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Never underestimate the power of human stupidity  when  it  comes  to
using technology they don't understand.