aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2020-05-09 01:56:05 +0000
committerDenys Dmytriyenko <denys@ti.com>2020-05-09 01:56:05 +0000
commitf6e024415b42adaa0d6ca04da83c86dcf92dfd87 (patch)
tree66d177678ddf2358de5b1874992fdc496cfa8030
parent1dd455890e8c1b29b79f46a5ce3153acd9a7ea5a (diff)
downloadmeta-ti-zeus-next.tar.gz
meta-ti-zeus-next.tar.bz2
meta-ti-zeus-next.zip
Revert "wic: create SD card with 3 partitions for testing"zeus-nextzeus
This reverts commit 6bca11098ba58960e20fc2fcb26ed56b3d68dbc2.
-rw-r--r--conf/machine/include/k3.inc2
-rw-r--r--conf/machine/include/omap-a15.inc2
-rw-r--r--conf/machine/include/ti33x.inc2
-rw-r--r--conf/machine/include/ti43x.inc2
-rw-r--r--wic/sdimage-3part.wks8
5 files changed, 4 insertions, 12 deletions
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index 5e67f5f30..3416be9e0 100644
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -38,5 +38,5 @@ IMAGE_FSTYPES += "tar.xz wic.xz"
# tiboot3.bin and sysfw.itb, which are provided by meta-arago
# u-boot-k3-r5 and ti-sci-fw recipes
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-WKS_FILE ?= "sdimage-3part.wks"
+WKS_FILE ?= "sdimage-bootpart.wks"
do_image_wic[depends] += "u-boot:do_deploy"
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index 7600126db..625519158 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -39,6 +39,6 @@ UBI_VOLNAME = "rootfs"
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320"
IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-3part.wks"
+WKS_FILE ?= "sdimage-bootpart.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
do_image_wic[depends] += "u-boot:do_deploy"
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
index db1df0437..3c752d54d 100644
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -61,6 +61,6 @@ TI_PDK_LIMIT_SOCS = "am335x"
TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x"
IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-3part.wks"
+WKS_FILE ?= "sdimage-bootpart.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
do_image_wic[depends] += "u-boot:do_deploy"
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
index e2aaf38ce..d1fc0b507 100644
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -57,6 +57,6 @@ TI_PDK_LIMIT_SOCS = "am437x"
TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x"
IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-3part.wks"
+WKS_FILE ?= "sdimage-bootpart.wks"
IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
do_image_wic[depends] += "u-boot:do_deploy"
diff --git a/wic/sdimage-3part.wks b/wic/sdimage-3part.wks
deleted file mode 100644
index 86aeb1cc3..000000000
--- a/wic/sdimage-3part.wks
+++ /dev/null
@@ -1,8 +0,0 @@
-# short-description: Create SD card image with 3 partitions
-# long-description: Creates a partitioned SD card image for testing TI platforms.
-# Boot files are located in the first vfat partition.
-# Second ext4 partition is empty and is used for testing.
-
-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --size 100M --use-uuid
-part test --ondisk mmcblk0 --fstype=ext4 --label test --align 1024 --size 1G --use-uuid
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 1024 --extra-space 500M --use-uuid