partition table: Remove hard-coded offsets from default partition tables

Makes them compatible with moving the partition table offset

diff --git a/components/partition_table/partitions_singleapp.csv b/components/partition_table/partitions_singleapp.csv
index 26b8591aac5716643ceba4eb145e3a0768b27b0a..22cf97bacb1987fd7712b97f486c57357f59fe5c 100644 (file)
--- a/components/partition_table/partitions_singleapp.csv
+++ b/components/partition_table/partitions_singleapp.csv
@@ -1,5 +1,5 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
-nvs,      data, nvs,     0x9000,  0x6000,
-phy_init, data, phy,     0xf000,  0x1000,
-factory,  app,  factory, 0x10000, 1M,
+nvs,      data, nvs,     ,        0x6000,
+phy_init, data, phy,     ,        0x1000,
+factory,  app,  factory, ,        1M,

diff --git a/components/partition_table/partitions_singleapp_coredump.csv b/components/partition_table/partitions_singleapp_coredump.csv
index a9f12c0fd3d044beaec7a5603c5debbd282d37cd..8bcf89c20f5f58f9f1a650636990e33f05d1ac6c 100644 (file)
--- a/components/partition_table/partitions_singleapp_coredump.csv
+++ b/components/partition_table/partitions_singleapp_coredump.csv
@@ -1,6 +1,6 @@
 # Name,   Type, SubType, Offset,  Size
 # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
-nvs,      data, nvs,     0x9000,  0x6000
-phy_init, data, phy,     0xf000,  0x1000
-factory,  app,  factory, 0x10000, 1M
-coredump, data, coredump,,        64K
+nvs,      data, nvs,           ,  0x6000
+phy_init, data, phy,           ,  0x1000
+factory,  app,  factory,       ,  1M
+coredump, data, coredump,      ,  64K

diff --git a/components/partition_table/partitions_two_ota.csv b/components/partition_table/partitions_two_ota.csv
index 0b14fdb4179023161cb56a4c1e9b4eb9d0f932bf..0a325b2f5a697bd2dcf393ec6021052c1dba6f34 100644 (file)
--- a/components/partition_table/partitions_two_ota.csv
+++ b/components/partition_table/partitions_two_ota.csv
@@ -1,8 +1,8 @@
 # Name,   Type, SubType, Offset,   Size, Flags
 # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
-nvs,      data, nvs,     0x9000,  0x4000
-otadata,  data, ota,     0xd000,  0x2000
-phy_init, data, phy,     0xf000,  0x1000
-factory,  app,  factory, 0x10000,  1M
-ota_0,    app,  ota_0,   ,         1M
-ota_1,    app,  ota_1,   ,         1M
+nvs,      data, nvs,     ,        0x4000,
+otadata,  data, ota,     ,        0x2000,
+phy_init, data, phy,     ,        0x1000,
+factory,  app,  factory, ,        1M,
+ota_0,    app,  ota_0,   ,        1M,
+ota_1,    app,  ota_1,   ,        1M,

diff --git a/components/partition_table/partitions_two_ota_coredump.csv b/components/partition_table/partitions_two_ota_coredump.csv
index 64d70b0d8ebf76412daae9a96aa6602a31a423f5..3a2143690b4bc6195cc0cee0ace1055298332b47 100644 (file)
--- a/components/partition_table/partitions_two_ota_coredump.csv
+++ b/components/partition_table/partitions_two_ota_coredump.csv
@@ -1,9 +1,9 @@
 # Name,   Type, SubType, Offset,   Size
 # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild
-nvs,      data, nvs,     0x9000,  0x4000
-otadata,  data, ota,     0xd000,  0x2000
-phy_init, data, phy,     0xf000,  0x1000
-factory,  0,    0,       0x10000,  1M
+nvs,      data, nvs,     ,         0x4000
+otadata,  data, ota,     ,         0x2000
+phy_init, data, phy,     ,         0x1000
+factory,  0,    0,       ,         1M
 coredump, data, coredump,,         64K
 ota_0,    0,    ota_0,   ,         1M
 ota_1,    0,    ota_1,   ,         1M