From 4bcf2f4bbd3674edeb63b4cbfff27b34dfad1cda Mon Sep 17 00:00:00 2001 From: Rikard Olsson Date: Wed, 3 Nov 2010 14:41:56 +0100 Subject: U8500: Add cspsa fallback and fix toc load Modified itp.c to load the modem when no cspsa flag for booting ITP is set. The loading of modem have been removed from X-Loader. Also correct a bug in itp.c ST-Ericsson ID: ER268766 Change-Id: I29f107c287ae5dbaf7274bc57ef30aaeacf67081 Signed-off-by: Rikard Olsson Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/7787 Reviewed-by: Mikael LARSSON1 Reviewed-by: Michael BRANDT --- board/st/u8500/itp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'board') diff --git a/board/st/u8500/itp.c b/board/st/u8500/itp.c index 7dcca4838..05046dfbd 100644 --- a/board/st/u8500/itp.c +++ b/board/st/u8500/itp.c @@ -148,7 +148,7 @@ static int itp_load_toc_entry(block_dev_desc_t *block_dev, n = block_dev->block_read(block_dev->dev, offset / block_dev->blksz, size, - loadaddress); + *loadaddress); if (n != size) { printf("itp_load_toc_entry: Failed to load %s!\n", partname); @@ -163,9 +163,9 @@ int itp_read_config(block_dev_desc_t *block_dev) if (cspsa_fp_read(block_dev, ITP_CSPSA_KEY, &cspsa_key)) { - printf("itp_read_config: config not present\n"); - cspsa_key = 0; - return 1; + printf("itp_read_config: config not present. " + "Using default values\n"); + cspsa_key = (ITP_LOAD_MODEM | ITP_LOAD_KERNEL); } return 0; } -- cgit v1.2.3