summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislaw Wadas <s.wadas@samsung.com>2016-03-15 14:18:35 +0100
committerPawel Wieczorek <p.wieczorek2@samsung.com>2016-03-16 12:09:02 +0100
commit84538650fa962066dda55528fa726b6c687d15e2 (patch)
tree32c1e296643c2896bc8eec67664c8801633fb466
parent0898414ff76d53887dad05878f9fb5683287c3aa (diff)
downloadmeta-84538650fa962066dda55528fa726b6c687d15e2.tar.gz
meta-84538650fa962066dda55528fa726b6c687d15e2.tar.bz2
meta-84538650fa962066dda55528fa726b6c687d15e2.zip
Fix: boot image build for artk 5 & 10
Change-Id: I08dc7b0d425eb76e81b4053d0fa62620c59d7923 Signed-off-by: Stanislaw Wadas <s.wadas@samsung.com>
-rw-r--r--common-targets.yaml3
-rw-r--r--common.yaml3
-rw-r--r--ks/common-boot-armv7l-artik10.yaml15
-rw-r--r--ks/common-boot-armv7l-artik5.yaml (renamed from ks/common-boot-armv7l-artik.yaml)6
-rw-r--r--patterns/common-boot-artik.yaml7
-rw-r--r--patterns/common-boot-artik10.yaml7
-rw-r--r--patterns/common-boot-artik5.yaml7
7 files changed, 36 insertions, 12 deletions
diff --git a/common-targets.yaml b/common-targets.yaml
index 5a841ab..bb0564f 100644
--- a/common-targets.yaml
+++ b/common-targets.yaml
@@ -21,7 +21,8 @@ Targets:
- Name: arm-wayland
Images:
- common-boot-armv7l-odroidu3.yaml
- - common-boot-armv7l-artik.yaml
+ - common-boot-armv7l-artik5.yaml
+ - common-boot-armv7l-artik10.yaml
- common-wayland-2parts-armv7l.yaml
- common-wayland-3parts-armv7l-odroidu3.yaml
- common-wayland-3parts-armv7l-artik5.yaml
diff --git a/common.yaml b/common.yaml
index 7c98484..89875f6 100644
--- a/common.yaml
+++ b/common.yaml
@@ -88,7 +88,8 @@ Boot-Artik:
SaveRepos: False
UserGroups: "audio,video"
Groups:
- - Common Boot Artik
+ - Common Boot Artik 5
+ - Common Boot Artik 10
Repos: []
Wayland:
diff --git a/ks/common-boot-armv7l-artik10.yaml b/ks/common-boot-armv7l-artik10.yaml
new file mode 100644
index 0000000..47ef7d5
--- /dev/null
+++ b/ks/common-boot-armv7l-artik10.yaml
@@ -0,0 +1,15 @@
+Name: common-boot-armv7l-artik10
+Architecture: armv7l
+Schedule: "*"
+Active: True
+Platform: Boot-Artik
+Part: common-mbr-boot
+Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+FileName: common-boot-armv7l-artik10
+Group: Common Boot Artik 10
+Attachment:
+ - /var/tmp/u-boot/u-boot-mmc.bin
+ - /var/tmp/u-boot/params.bin
+Repos:
+ - common-wayland_armv7l
+ - base_arm
diff --git a/ks/common-boot-armv7l-artik.yaml b/ks/common-boot-armv7l-artik5.yaml
index 947c615..2821813 100644
--- a/ks/common-boot-armv7l-artik.yaml
+++ b/ks/common-boot-armv7l-artik5.yaml
@@ -1,12 +1,12 @@
-Name: common-boot-armv7l-artik
+Name: common-boot-armv7l-artik5
Architecture: armv7l
Schedule: "*"
Active: True
Platform: Boot-Artik
Part: common-mbr-boot
Mic2Options: -f loop --pack-to=@NAME@.tar.gz
-FileName: common-boot-armv7l-artik
-Group: Common Boot Artik
+FileName: common-boot-armv7l-artik5
+Group: Common Boot Artik 5
Attachment:
- /var/tmp/u-boot/u-boot-mmc.bin
- /var/tmp/u-boot/params.bin
diff --git a/patterns/common-boot-artik.yaml b/patterns/common-boot-artik.yaml
deleted file mode 100644
index 5ce4977..0000000
--- a/patterns/common-boot-artik.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Common Boot Artik
-Description: Common Boot Artik
-Name: common-boot-artik
-Packages:
-- arm-artik-linux-kernel
-- arm-artik-linux-kernel-module
-- u-boot
diff --git a/patterns/common-boot-artik10.yaml b/patterns/common-boot-artik10.yaml
new file mode 100644
index 0000000..2d2395a
--- /dev/null
+++ b/patterns/common-boot-artik10.yaml
@@ -0,0 +1,7 @@
+Summary: Common Boot Artik 10
+Description: Common Boot Artik 10
+Name: common-boot-artik10
+Packages:
+- arm-artik10-linux-kernel
+- arm-artik10-linux-kernel-modules
+- u-boot
diff --git a/patterns/common-boot-artik5.yaml b/patterns/common-boot-artik5.yaml
new file mode 100644
index 0000000..83a7394
--- /dev/null
+++ b/patterns/common-boot-artik5.yaml
@@ -0,0 +1,7 @@
+Summary: Common Boot Artik 5
+Description: Common Boot Artik 5
+Name: common-boot-artik5
+Packages:
+- arm-artik5-linux-kernel
+- arm-artik5-linux-kernel-modules
+- u-boot