diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-07 06:17:18 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-02-28 09:28:26 +0000 |
| commit | f89a22693c8b014d1cfff6a5f086385dace002bd (patch) | |
| tree | 9ac19b3ce5eacbe236e1b2a5bf781985e1a8c40d | |
| parent | d296e539348a568ef4562bcbd3be5952b9355b26 (diff) | |
| download | morph-baserock/pedroalvarez/rpi.tar.gz | |
Add support for armv6lhfbaserock/pedroalvarez/rpi
| -rw-r--r-- | morphlib/__init__.py | 2 | ||||
| -rw-r--r-- | morphlib/buildenvironment.py | 2 | ||||
| -rw-r--r-- | morphlib/util.py | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/morphlib/__init__.py b/morphlib/__init__.py index d54340df..bf523f73 100644 --- a/morphlib/__init__.py +++ b/morphlib/__init__.py @@ -38,7 +38,7 @@ __version__ = gitversion.version # List of architectures that Morph supports -valid_archs = ['armv7l', 'armv7lhf', 'armv7b', 'testarch', +valid_archs = ['armv7l', 'armv7lhf', 'armv7b', 'testarch', "armv6lhf", 'x86_32', 'x86_64', 'ppc64', 'armv8l64', 'armv8b64'] class Error(cliapp.AppException): diff --git a/morphlib/buildenvironment.py b/morphlib/buildenvironment.py index ef770f52..e06c78a8 100644 --- a/morphlib/buildenvironment.py +++ b/morphlib/buildenvironment.py @@ -122,7 +122,7 @@ class BuildEnvironment(): else: cpu = arch - if arch.startswith('armv7'): + if arch.startswith('armv7') or arch.startswith("armv6"): abi = 'eabi' else: abi = '' diff --git a/morphlib/util.py b/morphlib/util.py index ad9d7cd9..937a7c80 100644 --- a/morphlib/util.py +++ b/morphlib/util.py @@ -469,6 +469,7 @@ def get_host_architecture(): # pragma: no cover 'armv8b': 'armv8b', 'aarch64': 'armv8l64', 'aarch64b': 'armv8b64', + 'armv6l': 'armv6l', 'ppc64': 'ppc64' } @@ -477,6 +478,8 @@ def get_host_architecture(): # pragma: no cover if machine == 'armv7l' and has_hardware_fp(): return 'armv7lhf' + if machine == 'armv6l' and has_hardware_fp(): + return 'armv6lhf' return table[machine] |