diff options
author | Denys Dmytriyenko <denys@ti.com> | 2020-05-09 01:56:05 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2020-05-09 01:56:05 +0000 |
commit | f6e024415b42adaa0d6ca04da83c86dcf92dfd87 (patch) | |
tree | 66d177678ddf2358de5b1874992fdc496cfa8030 | |
parent | 1dd455890e8c1b29b79f46a5ce3153acd9a7ea5a (diff) | |
download | meta-ti-zeus.tar.gz |
This reverts commit 6bca11098ba58960e20fc2fcb26ed56b3d68dbc2.
-rw-r--r-- | conf/machine/include/k3.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/omap-a15.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/ti33x.inc | 2 | ||||
-rw-r--r-- | conf/machine/include/ti43x.inc | 2 | ||||
-rw-r--r-- | wic/sdimage-3part.wks | 8 |
5 files changed, 4 insertions, 12 deletions
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index 5e67f5f3..3416be9e 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc | |||
@@ -38,5 +38,5 @@ IMAGE_FSTYPES += "tar.xz wic.xz" | |||
38 | # tiboot3.bin and sysfw.itb, which are provided by meta-arago | 38 | # tiboot3.bin and sysfw.itb, which are provided by meta-arago |
39 | # u-boot-k3-r5 and ti-sci-fw recipes | 39 | # u-boot-k3-r5 and ti-sci-fw recipes |
40 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | 40 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" |
41 | WKS_FILE ?= "sdimage-3part.wks" | 41 | WKS_FILE ?= "sdimage-bootpart.wks" |
42 | do_image_wic[depends] += "u-boot:do_deploy" | 42 | 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 7600126d..62551915 100644 --- a/conf/machine/include/omap-a15.inc +++ b/conf/machine/include/omap-a15.inc | |||
@@ -39,6 +39,6 @@ UBI_VOLNAME = "rootfs" | |||
39 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" | 39 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" |
40 | 40 | ||
41 | IMAGE_FSTYPES += "tar.xz wic.xz" | 41 | IMAGE_FSTYPES += "tar.xz wic.xz" |
42 | WKS_FILE ?= "sdimage-3part.wks" | 42 | WKS_FILE ?= "sdimage-bootpart.wks" |
43 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | 43 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" |
44 | do_image_wic[depends] += "u-boot:do_deploy" | 44 | do_image_wic[depends] += "u-boot:do_deploy" |
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc index db1df043..3c752d54 100644 --- a/conf/machine/include/ti33x.inc +++ b/conf/machine/include/ti33x.inc | |||
@@ -61,6 +61,6 @@ TI_PDK_LIMIT_SOCS = "am335x" | |||
61 | TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" | 61 | TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" |
62 | 62 | ||
63 | IMAGE_FSTYPES += "tar.xz wic.xz" | 63 | IMAGE_FSTYPES += "tar.xz wic.xz" |
64 | WKS_FILE ?= "sdimage-3part.wks" | 64 | WKS_FILE ?= "sdimage-bootpart.wks" |
65 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | 65 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" |
66 | do_image_wic[depends] += "u-boot:do_deploy" | 66 | do_image_wic[depends] += "u-boot:do_deploy" |
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index e2aaf38c..d1fc0b50 100644 --- a/conf/machine/include/ti43x.inc +++ b/conf/machine/include/ti43x.inc | |||
@@ -57,6 +57,6 @@ TI_PDK_LIMIT_SOCS = "am437x" | |||
57 | TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" | 57 | TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" |
58 | 58 | ||
59 | IMAGE_FSTYPES += "tar.xz wic.xz" | 59 | IMAGE_FSTYPES += "tar.xz wic.xz" |
60 | WKS_FILE ?= "sdimage-3part.wks" | 60 | WKS_FILE ?= "sdimage-bootpart.wks" |
61 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" | 61 | IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" |
62 | do_image_wic[depends] += "u-boot:do_deploy" | 62 | 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 86aeb1cc..00000000 --- a/wic/sdimage-3part.wks +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # short-description: Create SD card image with 3 partitions | ||
2 | # long-description: Creates a partitioned SD card image for testing TI platforms. | ||
3 | # Boot files are located in the first vfat partition. | ||
4 | # Second ext4 partition is empty and is used for testing. | ||
5 | |||
6 | part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --size 100M --use-uuid | ||
7 | part test --ondisk mmcblk0 --fstype=ext4 --label test --align 1024 --size 1G --use-uuid | ||
8 | part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 1024 --extra-space 500M --use-uuid | ||