summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-26 13:42:16 +0100
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-26 13:42:16 +0100
commitd1878c3c13bdb82ac04fed434db6ad597f7538a5 (patch)
tree7f06a95b53de81fdd247355f565cc40d0ca5b008
parent1fb16b1999b8cc278a056927bb9648c2b3d9063f (diff)
parentaa85c53644dbd01bf63e346556bdda7b5aa7fc62 (diff)
downloadmorphs-d1878c3c13bdb82ac04fed434db6ad597f7538a5.tar.gz
Merge remote-tracking branch 'origin/baserock/richardmaw/S4750-arm-to-armv7'
-rw-r--r--armv7-versatile-base-system.morph (renamed from arm-versatile-base-system.morph)2
-rw-r--r--armv7-versatile-bsp.morph (renamed from arm-versatile-bsp.morph)0
-rw-r--r--armv7-versatile-devel-system.morph (renamed from arm-versatile-devel-system.morph)2
3 files changed, 2 insertions, 2 deletions
diff --git a/arm-versatile-base-system.morph b/armv7-versatile-base-system.morph
index 881fcdd..d3dbc47 100644
--- a/arm-versatile-base-system.morph
+++ b/armv7-versatile-base-system.morph
@@ -3,7 +3,7 @@
"description": "The set of strata required to have a minimal system for an ARM versatile system.",
"kind": "system",
"system-kind": "rootfs-tarball",
- "arch": "arm",
+ "arch": "armv7",
"disk-size": "2G",
"strata": [
{
diff --git a/arm-versatile-bsp.morph b/armv7-versatile-bsp.morph
index c2031c8..c2031c8 100644
--- a/arm-versatile-bsp.morph
+++ b/armv7-versatile-bsp.morph
diff --git a/arm-versatile-devel-system.morph b/armv7-versatile-devel-system.morph
index ffcdea1..61e33c6 100644
--- a/arm-versatile-devel-system.morph
+++ b/armv7-versatile-devel-system.morph
@@ -3,7 +3,7 @@
"description": "A system that is able to build other systems based on the ARM versatile architecture.",
"kind": "system",
"system-kind": "rootfs-tarball",
- "arch": "arm",
+ "arch": "armv7",
"disk-size": "10G",
"strata": [
{