summaryrefslogtreecommitdiffstats
path: root/bsp/meta-freescale/wic
diff options
context:
space:
mode:
Diffstat (limited to 'bsp/meta-freescale/wic')
-rw-r--r--bsp/meta-freescale/wic/imx-imx-boot-bootpart.wks.in13
-rw-r--r--bsp/meta-freescale/wic/imx-uboot-bootpart.wks.in (renamed from bsp/meta-freescale/wic/imx-uboot-bootpart.wks)2
-rw-r--r--bsp/meta-freescale/wic/imx-uboot-spl-bootpart.wks.in (renamed from bsp/meta-freescale/wic/imx-uboot-spl-bootpart.wks)2
-rw-r--r--bsp/meta-freescale/wic/imx-uboot-spl.wks.in (renamed from bsp/meta-freescale/wic/imx-uboot-spl.wks)2
4 files changed, 9 insertions, 10 deletions
diff --git a/bsp/meta-freescale/wic/imx-imx-boot-bootpart.wks.in b/bsp/meta-freescale/wic/imx-imx-boot-bootpart.wks.in
index 601b9340..b50364d1 100644
--- a/bsp/meta-freescale/wic/imx-imx-boot-bootpart.wks.in
+++ b/bsp/meta-freescale/wic/imx-imx-boot-bootpart.wks.in
@@ -6,16 +6,15 @@
#
# The disk layout used is:
# - ---------- -------------- --------------
-# | | imx-boot | boot | rootfs |
+# | | imx-boot | boot | rootfs |
# - ---------- -------------- --------------
-# ^ ^ ^ ^
-# | | | |
-# 0 | 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
+# ^ ^ ^ ^ ^
+# | | | | |
+# 0 | 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
# ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual
#
part u-boot --source rawcopy --sourceparams="file=imx-boot" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16
-part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192
bootloader --ptable msdos
-
diff --git a/bsp/meta-freescale/wic/imx-uboot-bootpart.wks b/bsp/meta-freescale/wic/imx-uboot-bootpart.wks.in
index a5e0137b..8fe019c0 100644
--- a/bsp/meta-freescale/wic/imx-uboot-bootpart.wks
+++ b/bsp/meta-freescale/wic/imx-uboot-bootpart.wks.in
@@ -12,7 +12,7 @@
# | | | |
# 0 1kiB 4MiB 16MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
#
-part u-boot --source rawcopy --sourceparams="file=u-boot.imx" --ondisk mmcblk --no-table --align 1
+part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 1
part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/bsp/meta-freescale/wic/imx-uboot-spl-bootpart.wks b/bsp/meta-freescale/wic/imx-uboot-spl-bootpart.wks.in
index 4e16ec35..8062c51e 100644
--- a/bsp/meta-freescale/wic/imx-uboot-spl-bootpart.wks
+++ b/bsp/meta-freescale/wic/imx-uboot-spl-bootpart.wks.in
@@ -13,7 +13,7 @@
# 0 1kiB 69kiB 4MiB 16MiB + 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.img" --ondisk mmcblk --no-table --align 69
+part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 69
part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 16
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/bsp/meta-freescale/wic/imx-uboot-spl.wks b/bsp/meta-freescale/wic/imx-uboot-spl.wks.in
index e7b3beed..db2f89dd 100644
--- a/bsp/meta-freescale/wic/imx-uboot-spl.wks
+++ b/bsp/meta-freescale/wic/imx-uboot-spl.wks.in
@@ -13,7 +13,7 @@
# 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.img" --ondisk mmcblk --no-table --align 69
+part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --ondisk mmcblk --no-table --align 69
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
bootloader --ptable msdos