diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-03-21 21:52:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-03-21 21:52:38 -0700 |
| commit | 4b0c49237932a094de3a12d88f8f217e2c71a3c0 (patch) | |
| tree | 4cff472d38d71895824a711c69249144c7d454d7 | |
| parent | 73957dd131322c17b58836a454a9061e000bdeb4 (diff) | |
| parent | 7784b587584c5663684022260ecffbd950ab4246 (diff) | |
| download | lk-caf/master.tar.gz | |
Merge "mdm9x15: Add board detect info for the mdm9310 chip."caf/master
| -rw-r--r-- | target/mdm9615/init.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/target/mdm9615/init.c b/target/mdm9615/init.c index 01e068f9..e7b7961d 100644 --- a/target/mdm9615/init.c +++ b/target/mdm9615/init.c @@ -2,7 +2,7 @@ * Copyright (c) 2009, Google Inc. * All rights reserved. * - * Copyright (c) 2009-2012, The Linux Foundation. All rights reserved. + * Copyright (c) 2009-2013, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -196,6 +196,7 @@ unsigned check_reboot_mode(void) void board_info(void) { struct smem_board_info_v4 board_info_v4; + struct smem_board_info_v7 board_info_v7; unsigned int board_info_len = 0; unsigned smem_status; unsigned format = 0; @@ -221,7 +222,19 @@ void board_info(void) target_msm_id = board_info_v4.board_info_v3.msm_id; } - } + } else if (format == 7) { + board_info_len = sizeof(board_info_v7); + smem_status = + smem_read_alloc_entry(SMEM_BOARD_INFO_LOCATION, + &board_info_v7, + board_info_len); + if (!smem_status) { + id = board_info_v7.board_info_v3.hw_platform; + target_msm_id = + board_info_v7.board_info_v3.msm_id; + } + } else + ASSERT(0); } return; } |