Parcourir la source

partition table: Set partition table offset via variable

Angus Gratton il y a 7 ans
Parent
commit
cfa8ed15c0

+ 2 - 2
components/esptool_py/flasher_args.json.in

@@ -4,7 +4,7 @@
                            "--flash_freq", "${ESPFLASHFREQ}" ],
     "flash_files" : {
         "0x1000" : "bootloader/bootloader.bin",
-        "0x8000" : "partition_table/partition-table.bin",
+        "${PARTITION_TABLE_OFFSET}" : "partition_table/partition-table.bin",
         "${CONFIG_APP_OFFSET}" : "${PROJECT_NAME}.bin",
         "${PHY_PARTITION_OFFSET}" : "${PHY_PARTITION_BIN_FILE}"
     },
@@ -12,6 +12,6 @@
                           "file" : "bootloader/bootloader.bin" },
     "app" :             { "offset" : "${CONFIG_APP_OFFSET}",
                           "file" : "${PROJECT_NAME}.bin" },
-    "partition_table" : { "offset" : "0x8000",
+    "partition_table" : { "offset" : "${PARTITION_TABLE_OFFSET}",
                           "file" : "partition_table/partition-table.bin" }
 }

+ 1 - 3
components/partition_table/CMakeLists.txt

@@ -1,5 +1,3 @@
-set(partition_table_offset 0x8000)
-
 register_config_only_component()
 
 # Set partition_csv to the configured partition source file
@@ -56,5 +54,5 @@ add_custom_target(partition_table ALL DEPENDS "${final_partition_bin}")
 # the list of esptool write arguments for flashing
 set_property(GLOBAL APPEND_STRING PROPERTY
     ESPTOOL_WRITE_FLASH_ARGS
-    "${partition_table_offset} ${final_partition_bin} ")
+    "${PARTITION_TABLE_OFFSET} ${final_partition_bin} ")
 

+ 1 - 0
components/partition_table/project_include.cmake

@@ -0,0 +1 @@
+set(PARTITION_TABLE_OFFSET 0x8000)