split boot image from snapshot image

This patch intends to change partitions of arm from 4 to 3 partitions
because it is better to split a boot image from the snapshot image. I
think other boards like RD-PQ, Galaxy Gear2 and Renesas board want to
run a test using common arm image. By splitting the boot image from
snapshot image, we can download the snapshot image not only for odroid but
also for other boards.

Change-Id: Ia7aa4968f587b37b23e4a00a13a8889af1c73c70
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Bug-Tizen: TC-1486

diff --git a/common-targets.yaml b/common-targets.yaml
index 23108e9..baa9313 100644 (file)
--- a/common-targets.yaml
+++ b/common-targets.yaml
@@ -26,13 +26,15 @@ Targets:
 
     -   Name: arm-wayland
         Images:
+            - common-boot-armv7l-odroidu3.yaml
             - common-wayland-2parts-armv7l.yaml
-            - common-wayland-4parts-armv7l-odroidu3.yaml
+            - common-wayland-3parts-armv7l-odroidu3.yaml
 
     -   Name: arm-x11
         Images:
+            - common-boot-armv7l-odroidu3.yaml
             - common-x11-2parts-armv7l.yaml
-            - common-x11-4parts-armv7l-odroidu3.yaml
+            - common-x11-3parts-armv7l-odroidu3.yaml
 
     -   Name: arm64-wayland
         Images: []

diff --git a/ks/common-wayland-4parts-armv7l-odroidu3.yaml b/ks/common-boot-armv7l-odroidu3.yaml
similarity index 51%
rename from ks/common-wayland-4parts-armv7l-odroidu3.yaml
rename to ks/common-boot-armv7l-odroidu3.yaml
index 126460e..f3ddb4b 100644 (file)
--- a/ks/common-wayland-4parts-armv7l-odroidu3.yaml
+++ b/ks/common-boot-armv7l-odroidu3.yaml
@@ -1,11 +1,13 @@
-Name: common-wayland-4parts-armv7l-odroidu3
+Name: common-boot-armv7l-odroidu3
 Architecture: armv7l
 Schedule: "*"
 Active: True
 Platform: Wayland
-Part: common-mbr-4parts
+Part: common-mbr-boot
 Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel
-FileName: common-wayland-4parts-armv7l-odroidu3
+FileName: common-boot-armv7l-odroidu3
 Kernel: arm-odroidu3-linux-kernel
+PrePackages: u-boot
+Attachment: /var/tmp/u-boot/u-boot-mmc.bin /var/tmp/u-boot/params.bin
 Repos:
     - common-wayland_armv7l

diff --git a/ks/common-minimal-3parts-armv7l-odroidu3.yaml b/ks/common-minimal-3parts-armv7l-odroidu3.yaml
new file mode 100644 (file)
index 0000000..227c053
--- /dev/null
+++ b/ks/common-minimal-3parts-armv7l-odroidu3.yaml
@@ -0,0 +1,10 @@
+Name: common-minimal-3parts-armv7l-odroidu3
+Architecture: armv7l
+Schedule: "*"
+Active: True
+Platform: Minimal
+Part: common-mbr-3parts
+Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+FileName: common-minimal-3parts-armv7l-odroidu3
+Repos:
+    - common-wayland_armv7l

diff --git a/ks/common-minimal-4parts-armv7l-odroidu3.yaml b/ks/common-minimal-4parts-armv7l-odroidu3.yaml
deleted file mode 100644 (file)
index 0a7296b..0000000
--- a/ks/common-minimal-4parts-armv7l-odroidu3.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-Name: common-minimal-4parts-armv7l-odroidu3
-Architecture: armv7l
-Schedule: "*"
-Active: True
-Platform: Minimal
-Part: common-mbr-4parts
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel
-FileName: common-minimal-4parts-armv7l-odroidu3
-Kernel: arm-odroidu3-linux-kernel
-Repos:
-    - common-wayland_armv7l

diff --git a/ks/common-wayland-3parts-armv7l-odroidu3.yaml b/ks/common-wayland-3parts-armv7l-odroidu3.yaml
new file mode 100644 (file)
index 0000000..a37ef3d
--- /dev/null
+++ b/ks/common-wayland-3parts-armv7l-odroidu3.yaml
@@ -0,0 +1,10 @@
+Name: common-wayland-3parts-armv7l-odroidu3
+Architecture: armv7l
+Schedule: "*"
+Active: True
+Platform: Wayland
+Part: common-mbr-3parts
+Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+FileName: common-wayland-3parts-armv7l-odroidu3
+Repos:
+    - common-wayland_armv7l

diff --git a/ks/common-x11-3parts-armv7l-odroidu3.yaml b/ks/common-x11-3parts-armv7l-odroidu3.yaml
new file mode 100644 (file)
index 0000000..6c0694f
--- /dev/null
+++ b/ks/common-x11-3parts-armv7l-odroidu3.yaml
@@ -0,0 +1,10 @@
+Name: common-x11-3parts-armv7l-odroidu3
+Architecture: armv7l
+Schedule: "*"
+Active: True
+Platform: X11
+Part: common-mbr-3parts
+Mic2Options: -f loop --pack-to=@NAME@.tar.gz
+FileName: common-x11-3parts-armv7l-odroidu3
+Repos:
+    - common-x11_armv7l

diff --git a/ks/common-x11-4parts-armv7l-odroidu3.yaml b/ks/common-x11-4parts-armv7l-odroidu3.yaml
deleted file mode 100644 (file)
index 002377b..0000000
--- a/ks/common-x11-4parts-armv7l-odroidu3.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-Name: common-x11-4parts-armv7l-odroidu3
-Architecture: armv7l
-Schedule: "*"
-Active: True
-Platform: X11
-Part: common-mbr-4parts
-Mic2Options: -f loop --pack-to=@NAME@.tar.gz --copy-kernel
-FileName: common-x11-4parts-armv7l-odroidu3
-Kernel: arm-odroidu3-linux-kernel
-Repos:
-    - common-x11_armv7l

diff --git a/partitions/common-mbr-4parts b/partitions/common-mbr-3parts
similarity index 74%
rename from partitions/common-mbr-4parts
rename to partitions/common-mbr-3parts
index b0f896c..d94a1b3 100644 (file)
--- a/partitions/common-mbr-4parts
+++ b/partitions/common-mbr-3parts
@@ -1,4 +1,3 @@
-part /boot --fstype="vfat" --size=64 --ondisk=mmcblk0 --active --label boot --fsoptions=defaults,noatime
 part / --fstype="ext4" --size=3500 --ondisk=mmcblk0 --label rootfs --fsoptions=defaults,noatime
 part /opt --fstype="ext4" --size=512 --ondisk=mmcblk0 --label system-data --fsoptions=defaults,noatime
 part /opt/usr --fstype="ext4" --size=3500 --ondisk=mmcblk0 --label user --fsoptions=defaults,noatime

diff --git a/partitions/common-mbr-boot b/partitions/common-mbr-boot
new file mode 100644 (file)
index 0000000..1bc451f
--- /dev/null
+++ b/partitions/common-mbr-boot
@@ -0,0 +1 @@
+part /boot --fstype="vfat" --size=64 --ondisk=mmcblk0 --active --label boot --fsoptions=defaults,noatime