Skip to content

Commit 89ac289

Browse files
committed
platforms/qcs615: fix duplicate xbl_b type-guid issue
xbl_a and xbl_b had the same type-guid in both iq-615-evk and qcs615-ride emmc partition configs. The capsule update firmware uses type-guid to locate partition handles. Duplicate GUIDs cause FwUpdateGetPartitionHandle to return Not Found, failing the update. Set xbl_b type-guid to 7A3DF1A3-A31A-454D-BD78-DF259ED486BE, consistent with all other eMMC-based platforms Signed-off-by: Fang Wu <fang.wu@oss.qualcomm.com>
1 parent 0ea6db5 commit 89ac289

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

platforms/iq-615-evk/emmc/partitions.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# This is LUN 0 - HLOS LUN"
2323
--partition --name=xbl_a --size=3584KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98 --filename=xbl.elf
2424
--partition --name=xbl_config_a --size=512KB --type-guid=5A325AE4-4276-B66D-0ADD-3494DF27706A --filename=xbl_config.elf
25-
--partition --name=xbl_b --size=3584KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98 --filename=xbl.elf
25+
--partition --name=xbl_b --size=3584KB --type-guid=7A3DF1A3-A31A-454D-BD78-DF259ED486BE --filename=xbl.elf
2626
--partition --name=xbl_config_b --size=512KB --type-guid=A4CDBB5A-5A73-436E-B129-689EC01DBFE3 --filename=xbl_config.elf
2727
--partition --name=ddr --size=1024KB --type-guid=20A0C19C-286A-42FA-9CE7-F64C3226A794
2828
--partition --name=aop_a --size=512KB --type-guid=D69E90A5-4CAB-0071-F6DF-AB977F141A7F --filename=aop.mbn

platforms/qcs615-ride/emmc/partitions.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# This is LUN 0 - HLOS LUN"
2323
--partition --name=xbl_a --size=3584KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98 --filename=xbl.elf
2424
--partition --name=xbl_config_a --size=512KB --type-guid=5A325AE4-4276-B66D-0ADD-3494DF27706A --filename=xbl_config.elf
25-
--partition --name=xbl_b --size=3584KB --type-guid=DEA0BA2C-CBDD-4805-B4F9-F428251C3E98 --filename=xbl.elf
25+
--partition --name=xbl_b --size=3584KB --type-guid=7A3DF1A3-A31A-454D-BD78-DF259ED486BE --filename=xbl.elf
2626
--partition --name=xbl_config_b --size=512KB --type-guid=A4CDBB5A-5A73-436E-B129-689EC01DBFE3 --filename=xbl_config.elf
2727
--partition --name=ddr --size=1024KB --type-guid=20A0C19C-286A-42FA-9CE7-F64C3226A794
2828
--partition --name=aop_a --size=512KB --type-guid=D69E90A5-4CAB-0071-F6DF-AB977F141A7F --filename=aop.mbn

tests/integration/checksums.sha256

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ ad7facb2586fc6e966c004d7d1d16b024f5805ff7cb47c7a85dabd8b48892ca7 platforms/glym
114114
74518f204d46de660dff3ed003e92476bad8c691ba392453fc1c7532cc856018 platforms/glymur-crd/spinor/zeros_33sectors.bin
115115
cc61635da46b2c9974335ea37e0b5fd660a5c8a42a89b271fa7ec2ac4b8b26f6 platforms/glymur-crd/spinor/zeros_5sectors.bin
116116
71eaccc4411179448319f1393afc09db0b964029ae01491bee1020bbfec4a0e0 platforms/iq-615-evk/emmc/contents.xml
117-
72d6845d27707ba0bc7d795ceb714052dabbee5d542e6c084b5d99ae3f85c624 platforms/iq-615-evk/emmc/gpt_backup0.bin
117+
082d6961481463e3d01faf06e86ef1340b910ff403d90cb54474d799869c98ad platforms/iq-615-evk/emmc/gpt_backup0.bin
118118
818beedcff7fe4ceedf9d9d5fc84b299107b175681300a206b05bd077e22c223 platforms/iq-615-evk/emmc/gpt_backup1.bin
119-
e7a9ccb517426c9ea75d8f2daab90733aff224304d1c9805bb9fe9b6054c129d platforms/iq-615-evk/emmc/gpt_both0.bin
119+
2b96707367f624ac645af05f2458707b5cef2811d6f5050bbfa067221f92c28f platforms/iq-615-evk/emmc/gpt_both0.bin
120120
0bf722f5c042cf2391830ca289d2f39e7fc3147566e8dcd8079444bfd5dc5941 platforms/iq-615-evk/emmc/gpt_both1.bin
121121
65b63c1bae6e614a126713b3635886c64e6c61c5b5fd907caca2ab88e55723b4 platforms/iq-615-evk/emmc/gpt_empty0.bin
122122
65b63c1bae6e614a126713b3635886c64e6c61c5b5fd907caca2ab88e55723b4 platforms/iq-615-evk/emmc/gpt_empty1.bin
123-
17cdc0ea1fd050ca8ab9b62cca6cb7cd6d49532587c819869cf1c513f7cfe650 platforms/iq-615-evk/emmc/gpt_main0.bin
123+
8b686c2459635e6358acd34c4dcd5208663955a3a86cd9388d23e0056d0e2508 platforms/iq-615-evk/emmc/gpt_main0.bin
124124
fd1b067d65f52c9da790b73dc284262f0fb05d3e8bd8e3d93bc490b22d9dfe08 platforms/iq-615-evk/emmc/gpt_main1.bin
125-
000bdcf88b6a7d8239bbf4c248f7e8b4f8fef251421c10f6a62402cfbd5c9cbb platforms/iq-615-evk/emmc/partitions.xml
125+
2161f063358b02827d8388917ed0a4357d64f2324ef7a41c5a93ad00f8ad2cd6 platforms/iq-615-evk/emmc/partitions.xml
126126
6b8b577c4b25179f0bd3473582e52833891bd71b3711a773d9912b7d62a6f40c platforms/iq-615-evk/emmc/patch0.xml
127127
7b885a56c95bd1497d2153c5d637ad874747f73251ab59c53df2b1367db21234 platforms/iq-615-evk/emmc/patch1.xml
128128
0bb511c39df8edf44110586ef144dc4114d8a496627e75707f9b6b8cf4f11d09 platforms/iq-615-evk/emmc/rawprogram0.xml
@@ -588,11 +588,11 @@ ad7facb2586fc6e966c004d7d1d16b024f5805ff7cb47c7a85dabd8b48892ca7 platforms/qcm6
588588
74518f204d46de660dff3ed003e92476bad8c691ba392453fc1c7532cc856018 platforms/qcm6490-idp/ufs/zeros_33sectors.bin
589589
cc61635da46b2c9974335ea37e0b5fd660a5c8a42a89b271fa7ec2ac4b8b26f6 platforms/qcm6490-idp/ufs/zeros_5sectors.bin
590590
afc5a9882c75b4a4b76a8b4b77ac62128e031b96fbe0c095347cc1e0de88f34c platforms/qcs615-ride/emmc/contents.xml
591-
72d6845d27707ba0bc7d795ceb714052dabbee5d542e6c084b5d99ae3f85c624 platforms/qcs615-ride/emmc/gpt_backup0.bin
592-
e7a9ccb517426c9ea75d8f2daab90733aff224304d1c9805bb9fe9b6054c129d platforms/qcs615-ride/emmc/gpt_both0.bin
591+
082d6961481463e3d01faf06e86ef1340b910ff403d90cb54474d799869c98ad platforms/qcs615-ride/emmc/gpt_backup0.bin
592+
2b96707367f624ac645af05f2458707b5cef2811d6f5050bbfa067221f92c28f platforms/qcs615-ride/emmc/gpt_both0.bin
593593
65b63c1bae6e614a126713b3635886c64e6c61c5b5fd907caca2ab88e55723b4 platforms/qcs615-ride/emmc/gpt_empty0.bin
594-
17cdc0ea1fd050ca8ab9b62cca6cb7cd6d49532587c819869cf1c513f7cfe650 platforms/qcs615-ride/emmc/gpt_main0.bin
595-
b9cad7ac7248a2a73b8f6e9e219a514a93177e42ba8e6963f3f0cb26e175fd84 platforms/qcs615-ride/emmc/partitions.xml
594+
8b686c2459635e6358acd34c4dcd5208663955a3a86cd9388d23e0056d0e2508 platforms/qcs615-ride/emmc/gpt_main0.bin
595+
e71df7ade3199baabc7e0610b3021aac880cb1106ecbb5c52fab68423e4541a7 platforms/qcs615-ride/emmc/partitions.xml
596596
6b8b577c4b25179f0bd3473582e52833891bd71b3711a773d9912b7d62a6f40c platforms/qcs615-ride/emmc/patch0.xml
597597
0bb511c39df8edf44110586ef144dc4114d8a496627e75707f9b6b8cf4f11d09 platforms/qcs615-ride/emmc/rawprogram0.xml
598598
e1087465464de3b9a56d7ae2eaf6a9f45586e2562cb995bff7f640f6cecd501d platforms/qcs615-ride/emmc/rawprogram0_BLANK_GPT.xml

0 commit comments

Comments
 (0)