From 42bfa06b48561bcd3d2a1ccd97ad841dd164e597 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Wed, 7 Jun 2017 15:00:53 -0500 Subject: [PATCH] Use absolute paths for bootloader binaries --- tools/config/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/config/__init__.py b/tools/config/__init__.py index db5ea68e1f..469a91fdd8 100644 --- a/tools/config/__init__.py +++ b/tools/config/__init__.py @@ -17,7 +17,7 @@ limitations under the License. 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 @@ -526,11 +526,11 @@ class Config(object): 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)