From db452d7a13eae4e9d8b492679e69223847e09054 Mon Sep 17 00:00:00 2001 From: Mikael Larsson Date: Tue, 26 Oct 2010 13:01:49 +0200 Subject: Fix restart of u-boot After introduction of modem loading, restart from kernel hangs in itp_load_modem_and_itp. This adds a check so that itp, modem and splash is not run after restart of u-boot. ST-Ericsson ID: ER277386 Change-Id: Ibfd12d9efa43549c652d3726904e4cefb59e6979 Signed-off-by: Mikael Larsson Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/7192 Reviewed-by: Per FRANSSON Reviewed-by: Michael BRANDT --- board/st/u8500/u8500.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'board') diff --git a/board/st/u8500/u8500.c b/board/st/u8500/u8500.c index 93cd79d39..37f81211d 100644 --- a/board/st/u8500/u8500.c +++ b/board/st/u8500/u8500.c @@ -310,25 +310,29 @@ mcde_error: int board_early_access(block_dev_desc_t *block_dev) { + /* + * Don't load itp, modem and splash if restarted (eg crashdump). + */ + if (!(data_init_flag > 0)) { #ifdef CONFIG_ITP_LOAD - itp_read_config(block_dev); + itp_read_config(block_dev); #endif #ifdef CONFIG_VIDEO_LOGO - /* only load splash if not itp */ + /* only load splash if not itp */ #ifdef CONFIG_ITP_LOAD - if (!itp_is_itp_in_config()) - mcde_error = dss_init(); + if (!itp_is_itp_in_config()) + mcde_error = dss_init(); #else - mcde_error = dss_init(); + mcde_error = dss_init(); #endif #endif #ifdef CONFIG_ITP_LOAD - if (itp_load_itp_and_modem(block_dev)) - return 1; + if (itp_load_itp_and_modem(block_dev)) + return 1; #endif - + } return 0; } -- cgit v1.2.3