Skip to content

Use absolute paths for bootloader binaries #4494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2017
Merged

Use absolute paths for bootloader binaries #4494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from copy import deepcopy
import os
from os.path import dirname, abspath, exists
from os.path import dirname, abspath, exists, join
import sys
from collections import namedtuple
from os.path import splitext, relpath
Expand Down Expand Up @@ -526,11 +526,11 @@ def regions(self):
raise ConfigException(
"Bootloader build requested but no bootlader configuration")

@staticmethod
def _generate_booloader_build(target_overrides, rom_start, rom_size):
def _generate_booloader_build(self, target_overrides, rom_start, rom_size):
start = 0
if 'target.bootloader_img' in target_overrides:
filename = target_overrides['target.bootloader_img']
basedir = abspath(dirname(self.app_config_location))
filename = join(basedir, target_overrides['target.bootloader_img'])
if not exists(filename):
raise ConfigException("Bootloader %s not found" % filename)
part = intelhex_offset(filename, offset=rom_start)
Expand Down