commit 6ddf59cb36d9d35a81e38ee4314f50f3aababaef
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 07 21:20:13 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 07 21:20:13 2014 -0700
tree 9ebb6f9c7cfce1cb914632666c4256384fbd0f65
parent 47f9037a00b33afa17e1b79ca59a609ab3783a66
parent 97850bbeeb66ca15c9699d3ca372c694e1ddf39a

Merge "msm_shared: Add support to match the boot device subtype in the DT."

platform/msm_shared/board.c

diff --git a/platform/msm_shared/board.c b/platform/msm_shared/board.c
index fdc8553..fbbe62b 100644
--- a/platform/msm_shared/board.c
+++ b/platform/msm_shared/board.c
@@ -150,11 +150,11 @@
 		}
 
 		/* HLOS subtype
-		 * bit no                        |31    16 | 15          8 | 7     0|
-		 * board.platform_hlos_subtype = |reserved | DDR detection | subtype|
-		 *                               |  bits   |       bits    |        |
+		 * bit no                        |31    20 | 19        16| 15          8 | 7     0|
+		 * board.platform_hlos_subtype = |reserved | Boot device | DDR detection | subtype|
+		 *                               |  bits   |             |   bits        |
 		 */
-		board.platform_hlos_subtype = board_get_ddr_subtype() << 8;
+		board.platform_hlos_subtype = (board_get_ddr_subtype() << 8) | (platform_get_boot_dev() << 16);
 	}
 	else
 	{