Ondrej Kubik

Merge ~ondrak/+git/sa8155p-gadget:remove-dtbo-partitions into ~ubuntu-cervinia/+git/sa8155p-gadget:uc20

  1. Git
  2. lp:~ondrak/+git/sa8155p-gadget
  3. remove-dtbo-partitions
  4. Merge into uc20
Proposed by Ondrej Kubik
Status: Needs review
Proposed branch: ~ondrak/+git/sa8155p-gadget:remove-dtbo-partitions
Merge into: ~ubuntu-cervinia/+git/sa8155p-gadget:uc20
Diff against target: 52 lines (+0/-16)
2 files modified
gadget.yaml (+0/-12)
qdl/partition.xml (+0/-4)
Reviewer Review Type Date Requested Status
Robert Liu Approve
Review via email: mp+422974@code.launchpad.net

Commit message

remove dtbo* related partitions

To post a comment you must log in.
Revision history for this message
Robert Liu (robertliu) wrote :

LGTM

review: Approve
Reply

Unmerged commits

5bf0d96... by Ondrej Kubik

gadget: remove dtbo* related partitions

Signed-off-by: Ondrej Kubik <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/gadget.yaml b/gadget.yaml
2index e357059..79b0cb4 100644
3--- a/gadget.yaml
4+++ b/gadget.yaml
5@@ -142,12 +142,6 @@ volumes:
6 - name: vendor_a
7 size: 100M
8 type: 97D7B011-54DA-4835-B3C4-917AD6E73D74
9- - name: dtbo-ra
10- size: 24M
11- type: 24d0d418-d31d-4d8d-ac2c-4d4305188450
12- - name: dtbo-a
13- size: 24M
14- type: 24d0d418-d31d-4d8d-ac2c-4d4305188450
15 - name: uefisecapp_a
16 size: 2M
17 type: BE8A7E08-1B7A-4CAE-993A-D5B7FB55B3C2
18@@ -212,12 +206,6 @@ volumes:
19 - name: vendor_b
20 size: 100M
21 type: 77036CD4-03D5-42BB-8ED1-37E5A88BAA34
22- - name: dtbo-rb
23- size: 24M
24- type: 77036CD4-03D5-42BB-8ED1-37E5A88BAA34
25- - name: dtbo-b
26- size: 24M
27- type: 77036CD4-03D5-42BB-8ED1-37E5A88BAA34
28 - name: uefisecapp_b
29 size: 2M
30 type: 77036CD4-03D5-42BB-8ED1-37E5A88BAA34
31diff --git a/qdl/partition.xml b/qdl/partition.xml
32index 460d3a8..59bef2f 100644
33--- a/qdl/partition.xml
34+++ b/qdl/partition.xml
35@@ -66,8 +66,6 @@
36 <partition label="devcfg_a" size_in_kb="devcfg_a-size" type="F65D4B16-343D-4E25-AAFC-BE99B6556A6D" bootable="false" readonly="false" filename="devcfg_auto.mbn"/>
37 <partition label="qupfw_a" size_in_kb="qupfw_a-size" type="21d1219f-2ed1-4ab4-930a-41a16ae75f7f" bootable="false" readonly="false" filename="qupv3fw.elf"/>
38 <partition label="vendor_a" size_in_kb="vendor_a-size" type="97D7B011-54DA-4835-B3C4-917AD6E73D74" bootable="false" readonly="false" filename="" sparse="true"/>
39- <partition label="dtbo-ra" size_in_kb="dtbo-ra-size" type="24d0d418-d31d-4d8d-ac2c-4d4305188450" bootable="false" readonly="false" filename=""/>
40- <partition label="dtbo-a" size_in_kb="dtbo-a-size" type="24d0d418-d31d-4d8d-ac2c-4d4305188450" bootable="false" readonly="false" filename=""/>
41 <partition label="uefisecapp_a" size_in_kb="uefisecapp_a-size" type="BE8A7E08-1B7A-4CAE-993A-D5B7FB55B3C2" bootable="false" readonly="false" filename="uefi_sec.mbn"/>
42 <partition label="snaprecoverysel" size_in_kb="snapbootsel-size" type="B214D5E4-D442-45E6-B8C6-01BDCD82D396" bootable="false" readonly="false" filename="snaprecoverysel.bin"/>
43 <partition label="snapbootsel" size_in_kb="snapbootsel-size" type="B214D5E4-D442-45E6-B8C6-01BDCD82D396" bootable="false" readonly="false" filename="snapbootsel.bin"/>
44@@ -87,8 +85,6 @@
45 <partition label="devcfg_b" size_in_kb="devcfg_b-size" type="77036CD4-03D5-42BB-8ED1-37E5A88BAA34" bootable="false" readonly="false" filename=""/>
46 <partition label="qupfw_b" size_in_kb="qupfw_b-size" type="77036CD4-03D5-42BB-8ED1-37E5A88BAA34" bootable="false" readonly="false" filename=""/>
47 <partition label="vendor_b" size_in_kb="vendor_b-size" type="77036CD4-03D5-42BB-8ED1-37E5A88BAA34" bootable="false" readonly="false" filename="" sparse="true"/>
48- <partition label="dtbo-rb" size_in_kb="dtbo-rb-size" type="77036CD4-03D5-42BB-8ED1-37E5A88BAA34" bootable="false" readonly="false" filename=""/>
49- <partition label="dtbo-b" size_in_kb="dtbo-b-size" type="77036CD4-03D5-42BB-8ED1-37E5A88BAA34" bootable="false" readonly="false" filename=""/>
50 <partition label="uefisecapp_b" size_in_kb="uefisecapp_b-size" type="77036CD4-03D5-42BB-8ED1-37E5A88BAA34" bootable="false" readonly="false" filename=""/>
51 <partition label="snaprecoveryselbak" size_in_kb="snapbootselbak-size" type="77036CD4-03D5-42BB-8ED1-37E5A88BAA34" bootable="false" readonly="false" filename="snaprecoverysel.bin"/>
52 <partition label="snapbootselbak" size_in_kb="snapbootselbak-size" type="77036CD4-03D5-42BB-8ED1-37E5A88BAA34" bootable="false" readonly="false" filename="snapbootsel.bin"/>

Subscribers

People subscribed via source and target branches

to all changes: