From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 18 Oct 2016 19:24:14 +0000 (-0200)
Subject: wic: Change reference wks files to avoid /boot partition use
X-Git-Tag: 2.2~184
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=17c06b4676b01ea93d0afc378b6ba7e6efe997ba;p=meta-freescale.git

wic: Change reference wks files to avoid /boot partition use

For the sake of user-friendness we will avoid the use of /boot
partition.

The use of wic images, using this layout, is simpler as it does not
require manual setting of IMAGE_BOOT_FILES and thus allow for generic
use across different machines.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/scripts/lib/image/canned-wks/imx-barebox.wks b/scripts/lib/image/canned-wks/imx-barebox.wks
index 77b55548..0672cbb2 100644
--- a/scripts/lib/image/canned-wks/imx-barebox.wks
+++ b/scripts/lib/image/canned-wks/imx-barebox.wks
@@ -5,14 +5,13 @@
 # It uses barebox
 #
 # The disk layout used is:
-#  - --------- ------------ --------- --------------
-# | | barebox | bareboxenv |  /boot  |    rootfs    |
-#  - --------- ------------ --------- --------------
-# ^ ^         ^            ^         ^              ^
-# | |         |            |         |              |
-# 0 512B      512kiB       4MiB   4MiB + 8MiB    4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#  - --------- ------------ --------------
+# | | barebox | bareboxenv |    rootfs    |
+#  - --------- ------------ --------------
+# ^ ^         ^            ^              ^
+# | |         |            |              |
+# 0 512B      512kiB     4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #
 part barebox --source rawcopy --sourceparams="file=barebox.bin,skip=512" --ondisk mmcblk --no-table
 part bareboxenv --source rawcopy --sourceparams="file=bareboxenv.bin" --ondisk mmcblk --no-table --align 512
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/scripts/lib/image/canned-wks/imx-uboot-spl.wks b/scripts/lib/image/canned-wks/imx-uboot-spl.wks
index e2bdc145..dfe50773 100644
--- a/scripts/lib/image/canned-wks/imx-uboot-spl.wks
+++ b/scripts/lib/image/canned-wks/imx-uboot-spl.wks
@@ -5,14 +5,13 @@
 # It uses SPL and u-boot
 #
 # The disk layout used is:
-#  - ----- --------- --------- --------------
-# | | SPL | u-boot  |  /boot  |    rootfs    |
-#  - ----- --------- --------- --------------
-# ^ ^     ^         ^         ^              ^
-# | |     |         |         |              |
-# 0 1kiB  69kiB     4MiB   4MiB + 8MiB    4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#  - ----- --------- --------------
+# | | SPL | u-boot  |    rootfs    |
+#  - ----- --------- --------------
+# ^ ^     ^         ^              ^
+# | |     |         |              |
+# 0 1kiB  69kiB   4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #
 part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1
 part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 69
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/scripts/lib/image/canned-wks/imx-uboot.wks b/scripts/lib/image/canned-wks/imx-uboot.wks
index 08652103..d3609771 100644
--- a/scripts/lib/image/canned-wks/imx-uboot.wks
+++ b/scripts/lib/image/canned-wks/imx-uboot.wks
@@ -5,13 +5,12 @@
 # It uses u-boot
 #
 # The disk layout used is:
-#  - --------- --------- --------------
-# | | u-boot  |  /boot  |    rootfs    |
-#  - --------- --------- --------------
-# ^ ^         ^         ^              ^
-# | |         |         |              |
-# 0 1kiB    4MiB   4MiB + 8MiB    4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+#  - --------- --------------
+# | | u-boot  |    rootfs    |
+#  - --------- --------------
+# ^ ^         ^              ^
+# | |         |              |
+# 0 1kiB    4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
 #
 part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0
 part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096