diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2016-10-18 17:24:14 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-10-19 17:49:58 -0200 |
| commit | 17c06b4676b01ea93d0afc378b6ba7e6efe997ba (patch) | |
| tree | 24cdb355d264e95858e91b01a13267f2610c2646 /scripts | |
| parent | 6d2d1a15fc5b194cf63d03349692b21efef72780 (diff) | |
| download | meta-freescale-17c06b4676b01ea93d0afc378b6ba7e6efe997ba.tar.gz | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/image/canned-wks/imx-barebox.wks | 13 | ||||
| -rw-r--r-- | scripts/lib/image/canned-wks/imx-uboot-spl.wks | 13 | ||||
| -rw-r--r-- | scripts/lib/image/canned-wks/imx-uboot.wks | 13 |
3 files changed, 18 insertions, 21 deletions
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 @@ | |||
| 5 | # It uses barebox | 5 | # It uses barebox |
| 6 | # | 6 | # |
| 7 | # The disk layout used is: | 7 | # The disk layout used is: |
| 8 | # - --------- ------------ --------- -------------- | 8 | # - --------- ------------ -------------- |
| 9 | # | | barebox | bareboxenv | /boot | rootfs | | 9 | # | | barebox | bareboxenv | rootfs | |
| 10 | # - --------- ------------ --------- -------------- | 10 | # - --------- ------------ -------------- |
| 11 | # ^ ^ ^ ^ ^ ^ | 11 | # ^ ^ ^ ^ ^ |
| 12 | # | | | | | | | 12 | # | | | | | |
| 13 | # 0 512B 512kiB 4MiB 4MiB + 8MiB 4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | 13 | # 0 512B 512kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) |
| 14 | # | 14 | # |
| 15 | part barebox --source rawcopy --sourceparams="file=barebox.bin,skip=512" --ondisk mmcblk --no-table | 15 | part barebox --source rawcopy --sourceparams="file=barebox.bin,skip=512" --ondisk mmcblk --no-table |
| 16 | part bareboxenv --source rawcopy --sourceparams="file=bareboxenv.bin" --ondisk mmcblk --no-table --align 512 | 16 | part bareboxenv --source rawcopy --sourceparams="file=bareboxenv.bin" --ondisk mmcblk --no-table --align 512 |
| 17 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0 | ||
| 18 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 | 17 | 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 @@ | |||
| 5 | # It uses SPL and u-boot | 5 | # It uses SPL and u-boot |
| 6 | # | 6 | # |
| 7 | # The disk layout used is: | 7 | # The disk layout used is: |
| 8 | # - ----- --------- --------- -------------- | 8 | # - ----- --------- -------------- |
| 9 | # | | SPL | u-boot | /boot | rootfs | | 9 | # | | SPL | u-boot | rootfs | |
| 10 | # - ----- --------- --------- -------------- | 10 | # - ----- --------- -------------- |
| 11 | # ^ ^ ^ ^ ^ ^ | 11 | # ^ ^ ^ ^ ^ |
| 12 | # | | | | | | | 12 | # | | | | | |
| 13 | # 0 1kiB 69kiB 4MiB 4MiB + 8MiB 4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | 13 | # 0 1kiB 69kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) |
| 14 | # | 14 | # |
| 15 | part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1 | 15 | part SPL --source rawcopy --sourceparams="file=SPL" --ondisk mmcblk --no-table --align 1 |
| 16 | part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 69 | 16 | part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 69 |
| 17 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0 | ||
| 18 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 | 17 | 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 @@ | |||
| 5 | # It uses u-boot | 5 | # It uses u-boot |
| 6 | # | 6 | # |
| 7 | # The disk layout used is: | 7 | # The disk layout used is: |
| 8 | # - --------- --------- -------------- | 8 | # - --------- -------------- |
| 9 | # | | u-boot | /boot | rootfs | | 9 | # | | u-boot | rootfs | |
| 10 | # - --------- --------- -------------- | 10 | # - --------- -------------- |
| 11 | # ^ ^ ^ ^ ^ | 11 | # ^ ^ ^ ^ |
| 12 | # | | | | | | 12 | # | | | | |
| 13 | # 0 1kiB 4MiB 4MiB + 8MiB 4MiB + 8Mib + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | 13 | # 0 1kiB 4MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) |
| 14 | # | 14 | # |
| 15 | part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1 | 15 | part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1 |
| 16 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0 | ||
| 17 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 | 16 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 |