diff options
| author | Jimmy Rubin <jimmy.rubin@stericsson.com> | 2010-08-26 09:53:49 +0200 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-09-01 14:57:56 +0200 |
| commit | c3f425b85da74247e69c5dd9a0c8ec5fd33a443d (patch) | |
| tree | 44c79f651c4d61a94b6a9a83d0cf17b9d845810e /board/st/u8500/u8500.c | |
| parent | df4963a61499dd34cb9aaf87321b06e3666a323c (diff) | |
MCDE: Update for DB8500 V2
This patch does the following:
* Adds support for DB8500 V2
ST Ericsson ID: AP 270849
Change-Id: Ica648dc1663b58ee3468e1dc8bd831ede56c102a
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/4418
Tested-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com>
Diffstat (limited to 'board/st/u8500/u8500.c')
| -rw-r--r-- | board/st/u8500/u8500.c | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/board/st/u8500/u8500.c b/board/st/u8500/u8500.c index ea6873e61..10b79f08b 100644 --- a/board/st/u8500/u8500.c +++ b/board/st/u8500/u8500.c @@ -271,45 +271,31 @@ int dram_init(void) #ifdef CONFIG_VIDEO_LOGO int dss_init(void) { - int ret = 0; uchar byte; puts("MCDE: "); - if (!cpu_is_u8500v11()) { - printf("Only HREF+ is supported \n"); + if (!cpu_is_u8500v11() && !cpu_is_u8500v2()) { + printf("Only HREF+ or V2 is supported\n"); + goto mcde_error; + } + if (mcde_startup()) { + printf("startup failed\n"); + goto mcde_error; + } + if (mcde_display_image()) { + printf("display_image failed\n"); goto mcde_error; } - (void) i2c_set_bus_num(0); - (void) i2c_read(CONFIG_SYS_I2C_GPIOE_ADDR, 0x80, 1, &byte, 1); - if (byte == 0x01) - board_id = 0; - else - board_id = 1; - if (board_id != 0) { - ret = mcde_startup(); - if (ret) { - printf("startup failed\n"); - goto mcde_error; - } - ret = mcde_display_image(); - if (ret) { - printf("display_image failed\n"); - goto mcde_error; - } + printf("ready\n"); + setenv("startup_graphics", "1"); + setenv("logo", "nologo"); + return 0; - printf("ready \n"); - setenv("startup_graphics", "1"); - setenv("logo", "nologo"); - goto mcde_ok; - } else { - ret = 1; - printf("MOP500 is not supported \n"); - } mcde_error: setenv("startup_graphics", "0"); setenv("logo", "0"); -mcde_ok: - return ret; + + return -EINVAL; } #endif |