@@ -549,8 +549,7 @@ def regions(self):
549
549
if ('target.bootloader_img' in target_overrides or
550
550
'target.restrict_size' in target_overrides ):
551
551
return self ._generate_bootloader_build (target_overrides ,
552
- rom_start , rom_size ,
553
- self .sectors )
552
+ rom_start , rom_size )
554
553
elif ('target.mbed_app_start' in target_overrides or
555
554
'target.mbed_app_size' in target_overrides ):
556
555
return self ._generate_linker_overrides (target_overrides ,
@@ -559,7 +558,7 @@ def regions(self):
559
558
raise ConfigException (
560
559
"Bootloader build requested but no bootlader configuration" )
561
560
562
- def _generate_bootloader_build (self , target_overrides , rom_start , rom_size , sectors ):
561
+ def _generate_bootloader_build (self , target_overrides , rom_start , rom_size ):
563
562
start = 0
564
563
if 'target.bootloader_img' in target_overrides :
565
564
basedir = abspath (dirname (self .app_config_location ))
@@ -571,24 +570,24 @@ def _generate_bootloader_build(self, target_overrides, rom_start, rom_size, sect
571
570
raise ConfigException ("bootloader executable does not "
572
571
"start at 0x%x" % rom_start )
573
572
part_size = (part .maxaddr () - part .minaddr ()) + 1
574
- start = Config ._align_on_sector (rom_start + start , sectors ) - rom_start
573
+ start = Config ._align_on_sector (rom_start + start , self . sectors ) - rom_start
575
574
offset = start + rom_start
576
- part_size = Config ._align_on_sector (offset + part_size , sectors ) - offset
575
+ part_size = Config ._align_on_sector (offset + part_size , self . sectors ) - offset
577
576
yield Region ("bootloader" , offset , part_size , False ,
578
577
filename )
579
578
start += part_size
580
579
if 'target.restrict_size' in target_overrides :
581
580
new_size = int (target_overrides ['target.restrict_size' ], 0 )
582
- start = Config ._align_on_sector (rom_start + start , sectors ) - rom_start
581
+ start = Config ._align_on_sector (rom_start + start , self . sectors ) - rom_start
583
582
offset = rom_start + start
584
- new_size = Config ._align_on_sector (offset + new_size , sectors ) - offset
583
+ new_size = Config ._align_on_sector (offset + new_size , self . sectors ) - offset
585
584
yield Region ("application" , offset , new_size , True , None )
586
585
start += new_size
587
- start = Config ._align_on_sector (rom_start + start , sectors ) - rom_start
586
+ start = Config ._align_on_sector (rom_start + start , self . sectors ) - rom_start
588
587
yield Region ("post_application" , rom_start + start , rom_size - start ,
589
588
False , None )
590
589
else :
591
- start = Config ._align_on_sector (rom_start + start , sectors ) - rom_start
590
+ start = Config ._align_on_sector (rom_start + start , self . sectors ) - rom_start
592
591
yield Region ("application" , rom_start + start , rom_size - start ,
593
592
True , None )
594
593
if start > rom_size :
0 commit comments