From 7a3ccf9518f3fdbca9c7e412425c135e6b972628 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 7 Mar 2019 09:05:59 -0600 Subject: [PATCH 1/4] Test for sector information --- tools/test/targets/target_test.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/test/targets/target_test.py b/tools/test/targets/target_test.py index eff7b3f305..da9ba91fa8 100644 --- a/tools/test/targets/target_test.py +++ b/tools/test/targets/target_test.py @@ -37,6 +37,21 @@ def test_device_name(): ("Target %s contains invalid device_name %s" % (target.name, target.device_name)) +def test_bl_has_sectors(): + """Assert a bootloader supporting pack has sector information""" + cache = Cache(True, True) + named_targets = ( + target for target in TARGETS if + (hasattr(target, "device_name") and getattr(target, "bootloader_supported", False)) + ) + for target in named_targets: + assert target.device_name in cache.index,\ + ("Target %s contains invalid device_name %s" % + (target.name, target.device_name)) + assert cache.index[target.device_name]["sectors"],\ + ("Device name %s is misssing sector information" % + (target.device_name)) + @contextmanager def temp_target_file(extra_target, json_filename='custom_targets.json'): """Create an extra targets temp file in a context manager From efbcbc7e075b493aa2076bd0e3293e7abbb0470a Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 7 Mar 2019 09:22:33 -0600 Subject: [PATCH 2/4] Recompute sector information for STM32xxxxx --- tools/arm_pack_manager/index.json | 522 ++++++++++++++++++++++++++++-- 1 file changed, 497 insertions(+), 25 deletions(-) diff --git a/tools/arm_pack_manager/index.json b/tools/arm_pack_manager/index.json index e0863bf6e7..bf0c2b70af 100644 --- a/tools/arm_pack_manager/index.json +++ b/tools/arm_pack_manager/index.json @@ -342848,7 +342848,28 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 16384 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 536836096, + 528 + ], + [ + 536854528, + 16 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F215RETx": { @@ -354909,7 +354930,28 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 16384 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 536836096, + 528 + ], + [ + 536854528, + 4 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F411VCHx": { @@ -356295,7 +356337,28 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 16384 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 536836096, + 528 + ], + [ + 536854528, + 4 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F413CGUx": { @@ -357261,7 +357324,24 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 16384 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 536854528, + 4 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F415OGYx": { @@ -362405,7 +362485,52 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 16384 + ], + [ + 134217728, + 16384 + ], + [ + 134283264, + 65536 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 134348800, + 131072 + ], + [ + 134742016, + 16384 + ], + [ + 134807552, + 65536 + ], + [ + 134873088, + 131072 + ], + [ + 536836096, + 528 + ], + [ + 536854528, + 8 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F437VITx": { @@ -363741,7 +363866,40 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 16384 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 135266304, + 16384 + ], + [ + 135331840, + 65536 + ], + [ + 135397376, + 131072 + ], + [ + 536836096, + 528 + ], + [ + 536854528, + 8 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F439ZGTx": { @@ -364366,7 +364524,28 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 16384 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 536836096, + 528 + ], + [ + 536854528, + 4 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F446VCTx": { @@ -366339,7 +366518,40 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 16384 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 135266304, + 16384 + ], + [ + 135331840, + 65536 + ], + [ + 135397376, + 131072 + ], + [ + 536854528, + 8 + ], + [ + 2415919104, + 65536 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F469VETx": { @@ -376589,7 +376801,32 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 2097152, + 32768 + ], + [ + 2228224, + 131072 + ], + [ + 2359296, + 262144 + ], + [ + 134217728, + 32768 + ], + [ + 134348800, + 131072 + ], + [ + 134479872, + 262144 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F746VEHx": { @@ -377730,7 +377967,32 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 2097152, + 32768 + ], + [ + 2228224, + 131072 + ], + [ + 2359296, + 262144 + ], + [ + 134217728, + 32768 + ], + [ + 134348800, + 131072 + ], + [ + 134479872, + 262144 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F746ZGYx": { @@ -383982,7 +384244,80 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 2097152, + 16384 + ], + [ + 2097152, + 32768 + ], + [ + 2162688, + 65536 + ], + [ + 2228224, + 131072 + ], + [ + 2228224, + 131072 + ], + [ + 2359296, + 262144 + ], + [ + 3145728, + 16384 + ], + [ + 3211264, + 65536 + ], + [ + 3276800, + 131072 + ], + [ + 134217728, + 16384 + ], + [ + 134217728, + 32768 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 134348800, + 131072 + ], + [ + 134479872, + 262144 + ], + [ + 135266304, + 16384 + ], + [ + 135331840, + 65536 + ], + [ + 135397376, + 131072 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F768AIYx": { @@ -385593,7 +385928,80 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 2097152, + 16384 + ], + [ + 2097152, + 32768 + ], + [ + 2162688, + 65536 + ], + [ + 2228224, + 131072 + ], + [ + 2228224, + 131072 + ], + [ + 2359296, + 262144 + ], + [ + 3145728, + 16384 + ], + [ + 3211264, + 65536 + ], + [ + 3276800, + 131072 + ], + [ + 134217728, + 16384 + ], + [ + 134217728, + 32768 + ], + [ + 134283264, + 65536 + ], + [ + 134348800, + 131072 + ], + [ + 134348800, + 131072 + ], + [ + 134479872, + 262144 + ], + [ + 135266304, + 16384 + ], + [ + 135331840, + 65536 + ], + [ + 135397376, + 131072 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32F777BITx": { @@ -390536,7 +390944,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 131072 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32H750IBKx": { @@ -414309,7 +414722,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L433CBTx": { @@ -415321,7 +415739,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L433RCYx": { @@ -416149,7 +416572,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L443RCYx": { @@ -419553,7 +419981,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L471RCTx": { @@ -421393,7 +421826,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L475ZETx": { @@ -422405,7 +422843,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L476VCTx": { @@ -422681,7 +423124,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L476ZETx": { @@ -423233,7 +423681,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L486VGTx": { @@ -423509,7 +423962,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L496QGIx": { @@ -423969,7 +424427,12 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 2048 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L496ZGYx": { @@ -425077,7 +425540,16 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 134217728, + 8192 + ], + [ + 134217728, + 4096 + ] + ], "vendor": "STMicroelectronics:13" }, "STM32L4R5ZIYx": { @@ -462159,4 +462631,4 @@ "vendor": "Nordic Semiconductor:54" }, "version": "0.2.0" -} +} \ No newline at end of file From 4295891dd340c3f3b5ae148d7352f2429d2f3d59 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 7 Mar 2019 10:05:21 -0600 Subject: [PATCH 3/4] Add dummy sector information for R7S72100 --- tools/arm_pack_manager/index.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/arm_pack_manager/index.json b/tools/arm_pack_manager/index.json index bf0c2b70af..b9deb621e0 100644 --- a/tools/arm_pack_manager/index.json +++ b/tools/arm_pack_manager/index.json @@ -294811,7 +294811,12 @@ "units": 1 } }, - "sectors": [], + "sectors": [ + [ + 0, + 2 + ] + ], "vendor": "Renesas:117" }, "RC10001": { From f4d4d8be77ada769cee5dacb5acccf308e0c7e6f Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 7 Mar 2019 10:06:28 -0600 Subject: [PATCH 4/4] Recompute sector information for Nuvoton --- tools/arm_pack_manager/index.json | 45 ++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/tools/arm_pack_manager/index.json b/tools/arm_pack_manager/index.json index b9deb621e0..5a502bbb4e 100644 --- a/tools/arm_pack_manager/index.json +++ b/tools/arm_pack_manager/index.json @@ -170717,7 +170717,20 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 0, + 2048 + ], + [ + 1048576, + 2048 + ], + [ + 3145728, + 16 + ] + ], "vendor": "Nuvoton:18" }, "M453YC3AE": { @@ -172950,7 +172963,20 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 0, + 4096 + ], + [ + 1048576, + 4096 + ], + [ + 3145728, + 16 + ] + ], "vendor": "Nuvoton:18" }, "M487KIDAE": { @@ -293077,7 +293103,20 @@ "units": 1 } }, - "sectors": null, + "sectors": [ + [ + 0, + 2048 + ], + [ + 1048576, + 2048 + ], + [ + 3145728, + 16 + ] + ], "vendor": "Nuvoton:18" }, "NUC472JG8AE": {