summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-01-21 15:34:32 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-01-21 15:34:32 +0000
commitf2f3e4e5f3d5162890d03494f405cff5177aaad8 (patch)
tree2359693a0cac5e6d6476fb4a031ee6797460dbce
parent1cafde326cd1858980a5a13aa685b624792a8514 (diff)
parent65a67ef505c31f7b228376d942d3ed2272c73d68 (diff)
downloadmorph-f2f3e4e5f3d5162890d03494f405cff5177aaad8.tar.gz
Merge branch 'baserock/jmalk/cross-bootstrap-aarch64-v2'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Rob Kendrick <rob.kendrick@codethink.co.uk> Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-By: Zara Zaimeche <zara.zaimeche@codethink.co.uk>
-rw-r--r--morphlib/__init__.py4
-rw-r--r--morphlib/util.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/morphlib/__init__.py b/morphlib/__init__.py
index 0d445304..a10ebe7b 100644
--- a/morphlib/__init__.py
+++ b/morphlib/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2014 Codethink Limited
+# Copyright (C) 2011-2015 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ __version__ = gitversion.version
# List of architectures that Morph supports
valid_archs = ['armv7l', 'armv7lhf', 'armv7b', 'testarch',
- 'x86_32', 'x86_64', 'ppc64']
+ 'x86_32', 'x86_64', 'ppc64', 'armv8l64', 'armv8b64']
class Error(cliapp.AppException):
diff --git a/morphlib/util.py b/morphlib/util.py
index 63e85b6c..ad9d7cd9 100644
--- a/morphlib/util.py
+++ b/morphlib/util.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2014 Codethink Limited
+# Copyright (C) 2011-2015 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -467,8 +467,8 @@ def get_host_architecture(): # pragma: no cover
'armv7b': 'armv7b',
'armv8l': 'armv8l',
'armv8b': 'armv8b',
- 'aarch64': 'aarch64',
- 'aarch64b': 'aarch64b',
+ 'aarch64': 'armv8l64',
+ 'aarch64b': 'armv8b64',
'ppc64': 'ppc64'
}