aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-03-13 09:31:18 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-03-13 09:31:18 +0000
commitf76255eb84830a981c2539b2706d8c4ec9134939 (patch)
tree286cb3431819aae82f7c840c865c446acad95c16
parent29662624a68a3c82d649cb12b9726877d3e7407f (diff)
parentc3ee35ba9daf8c0f43f787a63cfb10925612842d (diff)
Merge "dra7xx-evm, beaglebone: Switch to sdimage-bootpart-uuid for wic"
-rw-r--r--meta-agl-bsp/conf/include/agl_beaglebone.inc1
-rw-r--r--meta-agl-bsp/conf/include/agl_dra7xx-evm.inc2
-rw-r--r--meta-agl-bsp/wic/sdimage-bootpart-uuid.wks6
3 files changed, 8 insertions, 1 deletions
diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc
index 69e883572..988b3d530 100644
--- a/meta-agl-bsp/conf/include/agl_beaglebone.inc
+++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc
@@ -40,5 +40,6 @@ SECURITY_LDFLAGS_pn-gpm = ""
SECURITY_CFLAGS_pn-libatasmart = ""
SECURITY_LDFLAGS_pn-libatasmart = ""
+WKS_FILE = "sdimage-bootpart-uuid.wks"
AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index 02ddb6c9d..876d6e9a6 100644
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -52,7 +52,7 @@ IMAGE_INSTALL_append = " \
# Include WIC support based on beaglebone
do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-WKS_FILE = "sdimage-bootpart.wks"
+WKS_FILE = "sdimage-bootpart-uuid.wks"
IMAGE_BOOT_FILES = "MLO u-boot.img uEnv.txt"
AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
diff --git a/meta-agl-bsp/wic/sdimage-bootpart-uuid.wks b/meta-agl-bsp/wic/sdimage-bootpart-uuid.wks
new file mode 100644
index 000000000..1f51a0bd4
--- /dev/null
+++ b/meta-agl-bsp/wic/sdimage-bootpart-uuid.wks
@@ -0,0 +1,6 @@
+# short-description: Create SD card image with a boot partition
+# long-description: Creates a partitioned SD card image. Boot files
+# are located in the first vfat partition.
+
+part /boot --source bootimg-partition --fstype=vfat --label boot --use-uuid --active --align 4 --size 16
+part / --source rootfs --fstype=ext4 --label root --align 4 --use-uuid