summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-01-10 19:19:57 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2022-01-19 09:21:51 +0100
commit24979540330bd6d1bdc2dc871778ccc50d4db364 (patch)
treebb90c243030a9f8056674226f3035cd669676a58
parent875c924c4e295bf80b93e502ca83c0273a3f751e (diff)
apalis-tk1: use ext4 rootfs in wic images
The kernel for apalis-tk1 is based on upstream and supports ext4. Older tegra kernels did not support ext4 and thus we created a ext3 rootfs in the wic image. Change to use the openembedded core provided kickstart file `sdimage-bootpart.wks` and delete the no longer needed `sdimage-bootpart-tegra.wks`. Related-to: ELB-4295 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit a03fde04d777cb3f9549d6fbf234924211c867c2)
-rw-r--r--conf/machine/apalis-tk1.conf3
-rw-r--r--wic/sdimage-bootpart-tegra.wks6
2 files changed, 1 insertions, 8 deletions
diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf
index 766eab0..92cb08b 100644
--- a/conf/machine/apalis-tk1.conf
+++ b/conf/machine/apalis-tk1.conf
@@ -32,8 +32,7 @@ WKS_FILE_DEPENDS ?= " \
bmap-tools-native \
"
-WKS_FILE = "sdimage-bootpart-tegra.wks"
-WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
+WKS_FILE = "sdimage-bootpart.wks"
# The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot
RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
diff --git a/wic/sdimage-bootpart-tegra.wks b/wic/sdimage-bootpart-tegra.wks
deleted file mode 100644
index f58856b..0000000
--- a/wic/sdimage-bootpart-tegra.wks
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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 --ondisk mmcblk --fstype=vfat --label boot --active --align 4 --size 16
-part / --source rootfs --ondisk mmcblk --fstype=ext3 --label root --align 4